Skip to content

Commit 7b592ae

Browse files
authored
Jetty 12.1.x add Eclipse dash too usagee (#12325)
* 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]> * upgrade weld version to 6.0.0.Beta4 Signed-off-by: Olivier Lamy <[email protected]> * weld is only use for testing purpose Signed-off-by: Olivier Lamy <[email protected]> --------- Signed-off-by: Olivier Lamy <[email protected]>
1 parent ce5518e commit 7b592ae

File tree

2 files changed

+53
-3
lines changed

2 files changed

+53
-3
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.1.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

+52-2
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
<ee11.jersey.version>4.0.0-M1</ee11.jersey.version>
236236
<ee11.jsp.impl.version>11.0.0-M21</ee11.jsp.impl.version>
237237
<ee11.mail.impl.version>2.0.1</ee11.mail.impl.version>
238-
<ee11.weld.version>6.0.0.Beta1</ee11.weld.version>
238+
<ee11.weld.version>6.0.0.Beta4</ee11.weld.version>
239239

240240
<ee8.jakarta.activation.api.version>1.2.2</ee8.jakarta.activation.api.version>
241241
<ee8.jakarta.annotation.api.version>1.3.5</ee8.jakarta.annotation.api.version>
@@ -289,7 +289,7 @@
289289
<guava.version>33.2.1-jre</guava.version>
290290
<guice.version>7.0.0</guice.version>
291291
<hamcrest.version>2.2</hamcrest.version>
292-
<hazelcast.version>5.4.0</hazelcast.version>
292+
<hazelcast.version>5.5.0</hazelcast.version>
293293
<hibernate.search.version>7.1.1.Final</hibernate.search.version>
294294
<infinispan.docker.image.name>infinispan/server</infinispan.docker.image.name>
295295
<infinispan.docker.image.version>15.0.5.Final</infinispan.docker.image.version>
@@ -2499,6 +2499,56 @@
24992499
</plugins>
25002500
</build>
25012501
</profile>
2502+
<profile>
2503+
<id>eclipse-dash</id>
2504+
<pluginRepositories>
2505+
<pluginRepository>
2506+
<releases>
2507+
<enabled>true</enabled>
2508+
</releases>
2509+
<snapshots>
2510+
<enabled>false</enabled>
2511+
</snapshots>
2512+
<id>dash-licenses-releases</id>
2513+
<url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
2514+
</pluginRepository>
2515+
<pluginRepository>
2516+
<releases>
2517+
<enabled>false</enabled>
2518+
</releases>
2519+
<snapshots>
2520+
<enabled>true</enabled>
2521+
</snapshots>
2522+
<id>dash-licenses-snapshots</id>
2523+
<url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
2524+
</pluginRepository>
2525+
</pluginRepositories>
2526+
<build>
2527+
<plugins>
2528+
<plugin>
2529+
<groupId>org.eclipse.dash</groupId>
2530+
<artifactId>license-tool-plugin</artifactId>
2531+
<version>1.1.0</version>
2532+
<executions>
2533+
<execution>
2534+
<goals>
2535+
<goal>license-check</goal>
2536+
</goals>
2537+
<phase>verify</phase>
2538+
<configuration>
2539+
<!--
2540+
Works with approval for Hazelcast https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15797
2541+
org.jboss.weld only used for testing
2542+
-->
2543+
<excludeGroupIds>com.hazelcast,org.jboss.weld</excludeGroupIds>
2544+
<failWhenReviewNeeded>true</failWhenReviewNeeded>
2545+
</configuration>
2546+
</execution>
2547+
</executions>
2548+
</plugin>
2549+
</plugins>
2550+
</build>
2551+
</profile>
25022552
<profile>
25032553
<id>update-version</id>
25042554
<build>

0 commit comments

Comments
 (0)