Skip to content

Commit

Permalink
Resolve issues preventing Hazelcast v5.5.0 build [5.5.0] (#2760)
Browse files Browse the repository at this point in the history 
Backport of https://github.com/hazelcast/hazelcast-mono/pull/2694

_Partially_ backports
https://github.com/hazelcast/hazelcast-mono/pull/2639

Specifically moves attribution-plugin into a release-only profile - the
new Cluster V6 constant and cluster compatibility test ignores are not
required.

[Slack
discussion](https://hazelcast.slack.com/archives/C07066ELRRD/p1721377436601369?thread_ts=1720801493.693079&cid=C07066ELRRD)

Fixes: [DI-181](https://hazelcast.atlassian.net/browse/DI-181)

[DI-181]:
https://hazelcast.atlassian.net/browse/DI-181?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

Co-authored-by: Jack Green <[email protected]>
GitOrigin-RevId: 3e98a8682991332b63318990d81ca3e5c371bb6d
  • Loading branch information
@devOpsHazelcast @JackPGreen @actions-user
2 people authored and actions-user committed Jul 26, 2024
1 parent 34796ee commit 7f1e932
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 54 deletions.
9 changes: 4 additions & 5 deletions distribution/src/assembly/assembly-descriptor-slim.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@
<destName>THIRD-PARTY.txt</destName>
<outputDirectory>licenses</outputDirectory>
</file>
<file>
<source>${basedir}/../target/aggregated-attribution.txt</source>
<destName>attribution.txt</destName>
<outputDirectory>licenses</outputDirectory>
</file>

<!-- Full Example YAML config files -->
<file>
Expand Down Expand Up @@ -166,5 +161,9 @@
<exclude>**/*</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${basedir}/../target/aggregated-attribution</directory>
<outputDirectory>licenses</outputDirectory>
</fileSet>
</fileSets>
</assembly>
9 changes: 4 additions & 5 deletions distribution/src/assembly/assembly-descriptor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
<destName>THIRD-PARTY.txt</destName>
<outputDirectory>licenses</outputDirectory>
</file>
<file>
<source>${basedir}/../target/aggregated-attribution.txt</source>
<destName>attribution.txt</destName>
<outputDirectory>licenses</outputDirectory>
</file>

<!-- Full Example YAML config files -->
<file>
Expand Down Expand Up @@ -191,5 +186,9 @@
<exclude>**/*</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${basedir}/../target/aggregated-attribution</directory>
<outputDirectory>licenses</outputDirectory>
</fileSet>
</fileSets>
</assembly>
61 changes: 45 additions & 16 deletions hazelcast-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1051,21 +1051,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.hazelcast.maven</groupId>
<artifactId>attribution-maven-plugin</artifactId>
<executions>
<execution>
<id>per-jar-attribution</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<outputFile>${project.build.outputDirectory}/META-INF/attribution.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -1188,6 +1173,21 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.hazelcast.maven</groupId>
<artifactId>attribution-maven-plugin</artifactId>
<executions>
<execution>
<id>per-jar-attribution</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<outputFile>${project.build.outputDirectory}/META-INF/attribution.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand All @@ -1213,6 +1213,21 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.hazelcast.maven</groupId>
<artifactId>attribution-maven-plugin</artifactId>
<executions>
<execution>
<id>per-jar-attribution</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<outputFile>${project.build.outputDirectory}/META-INF/attribution.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
Expand Down Expand Up @@ -1266,7 +1281,21 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.hazelcast.maven</groupId>
<artifactId>attribution-maven-plugin</artifactId>
<executions>
<execution>
<id>per-jar-attribution</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<outputFile>${project.build.outputDirectory}/META-INF/attribution.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
66 changes: 38 additions & 28 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,22 +344,6 @@
</executions>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>com.hazelcast.maven</groupId>
<artifactId>attribution-maven-plugin</artifactId>
<executions>
<execution>
<id>aggregated-attribution-oss</id>
<inherited>false</inherited>
<goals>
<goal>aggregate</goal>
</goals>
<configuration>
<outputFile>${project.build.directory}/aggregated-attribution.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -730,22 +714,48 @@
</profile>

<profile>
<!--
Configures release-specific options when doing a final, production release
-->
<id>release-devel</id>
<build>
<plugins>
<plugin>
<groupId>com.hazelcast.maven</groupId>
<artifactId>attribution-maven-plugin</artifactId>
<executions>
<execution>
<id>aggregated-attribution-oss</id>
<inherited>false</inherited>
<goals>
<goal>aggregate</goal>
</goals>
<configuration>
<outputFile>${project.build.directory}/aggregated-attribution.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>release-repository</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
<groupId>com.hazelcast.maven</groupId>
<artifactId>attribution-maven-plugin</artifactId>
<executions>
<execution>
<id>aggregated-attribution-oss</id>
<inherited>false</inherited>
<goals>
<goal>aggregate</goal>
</goals>
<configuration>
<outputFile>${project.build.directory}/aggregated-attribution.txt</outputFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 7f1e932

Please sign in to comment.