Skip to content

Commit a1dbb72

Browse files
authored
Jetty 12.0.x add Eclipse Dash License plugin as part the build process (#12224)
* Issue #12195 add eclipse dash profile to run license-check tool * upgrade hazelcast --------- Signed-off-by: Olivier Lamy <[email protected]>
1 parent 11476a9 commit a1dbb72

File tree

2 files changed

+49
-2
lines changed

2 files changed

+49
-2
lines changed

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def mavenBuild(jdk, cmdline, mvnName) {
127127
}
128128
runLaunchable ("verify")
129129
runLaunchable ("record build --name jetty-12.0.x")
130-
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"
130+
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"
131131
if(saveHome()) {
132132
archiveArtifacts artifacts: ".repository/org/eclipse/jetty/jetty-home/**/jetty-home-*", allowEmptyArchive: true, onlyIfSuccessful: false
133133
}

pom.xml

+48-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
<guava.version>33.2.1-jre</guava.version>
194194
<guice.version>7.0.0</guice.version>
195195
<hamcrest.version>2.2</hamcrest.version>
196-
<hazelcast.version>5.4.0</hazelcast.version>
196+
<hazelcast.version>5.5.0</hazelcast.version>
197197
<hibernate.search.version>7.1.1.Final</hibernate.search.version>
198198
<infinispan.docker.image.name>infinispan/server</infinispan.docker.image.name>
199199
<infinispan.docker.image.version>15.0.5.Final</infinispan.docker.image.version>
@@ -2378,6 +2378,53 @@
23782378
</plugins>
23792379
</build>
23802380
</profile>
2381+
<profile>
2382+
<id>eclipse-dash</id>
2383+
<pluginRepositories>
2384+
<pluginRepository>
2385+
<releases>
2386+
<enabled>true</enabled>
2387+
</releases>
2388+
<snapshots>
2389+
<enabled>false</enabled>
2390+
</snapshots>
2391+
<id>dash-licenses-releases</id>
2392+
<url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
2393+
</pluginRepository>
2394+
<pluginRepository>
2395+
<releases>
2396+
<enabled>false</enabled>
2397+
</releases>
2398+
<snapshots>
2399+
<enabled>true</enabled>
2400+
</snapshots>
2401+
<id>dash-licenses-snapshots</id>
2402+
<url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
2403+
</pluginRepository>
2404+
</pluginRepositories>
2405+
<build>
2406+
<plugins>
2407+
<plugin>
2408+
<groupId>org.eclipse.dash</groupId>
2409+
<artifactId>license-tool-plugin</artifactId>
2410+
<version>1.1.0</version>
2411+
<executions>
2412+
<execution>
2413+
<goals>
2414+
<goal>license-check</goal>
2415+
</goals>
2416+
<phase>verify</phase>
2417+
<configuration>
2418+
<!-- Works with approval for Hazelcast https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15797 -->
2419+
<excludeGroupIds>com.hazelcast</excludeGroupIds>
2420+
<failWhenReviewNeeded>true</failWhenReviewNeeded>
2421+
</configuration>
2422+
</execution>
2423+
</executions>
2424+
</plugin>
2425+
</plugins>
2426+
</build>
2427+
</profile>
23812428
<profile>
23822429
<id>update-version</id>
23832430
<build>

0 commit comments

Comments
 (0)