Skip to content

Commit

Permalink
Jetty 12.0.x add Eclipse Dash License plugin as part the build process (
Browse files Browse the repository at this point in the history
#12224)

* Issue #12195 add eclipse dash profile to run license-check tool
* upgrade hazelcast

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
  • Loading branch information
olamy authored Sep 29, 2024
1 parent 11476a9 commit a1dbb72
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def mavenBuild(jdk, cmdline, mvnName) {
}
runLaunchable ("verify")
runLaunchable ("record build --name jetty-12.0.x")
sh "mvn $extraArgs -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -V -B -e -U $cmdline"
sh "mvn $extraArgs -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -Peclipse-dash -V -B -e -U $cmdline"
if(saveHome()) {
archiveArtifacts artifacts: ".repository/org/eclipse/jetty/jetty-home/**/jetty-home-*", allowEmptyArchive: true, onlyIfSuccessful: false
}
Expand Down
49 changes: 48 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<guava.version>33.2.1-jre</guava.version>
<guice.version>7.0.0</guice.version>
<hamcrest.version>2.2</hamcrest.version>
<hazelcast.version>5.4.0</hazelcast.version>
<hazelcast.version>5.5.0</hazelcast.version>
<hibernate.search.version>7.1.1.Final</hibernate.search.version>
<infinispan.docker.image.name>infinispan/server</infinispan.docker.image.name>
<infinispan.docker.image.version>15.0.5.Final</infinispan.docker.image.version>
Expand Down Expand Up @@ -2378,6 +2378,53 @@
</plugins>
</build>
</profile>
<profile>
<id>eclipse-dash</id>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>dash-licenses-releases</id>
<url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
</pluginRepository>
<pluginRepository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>dash-licenses-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
<version>1.1.0</version>
<executions>
<execution>
<goals>
<goal>license-check</goal>
</goals>
<phase>verify</phase>
<configuration>
<!-- Works with approval for Hazelcast https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15797 -->
<excludeGroupIds>com.hazelcast</excludeGroupIds>
<failWhenReviewNeeded>true</failWhenReviewNeeded>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>update-version</id>
<build>
Expand Down

0 comments on commit a1dbb72

Please sign in to comment.