Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <olamy@apache.org>

* upgrade weld version to 6.0.0.Beta4

Signed-off-by: Olivier Lamy <olamy@apache.org>

* weld is only use for testing purpose

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2024-09-30 08:23:37 +10:00 committed by GitHub
parent ce5518e257
commit 7b592aef74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -127,7 +127,7 @@ def mavenBuild(jdk, cmdline, mvnName) {
}
runLaunchable ("verify")
runLaunchable ("record build --name jetty-12.1.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
}

54
pom.xml
View File

@ -235,7 +235,7 @@
<ee11.jersey.version>4.0.0-M1</ee11.jersey.version>
<ee11.jsp.impl.version>11.0.0-M21</ee11.jsp.impl.version>
<ee11.mail.impl.version>2.0.1</ee11.mail.impl.version>
<ee11.weld.version>6.0.0.Beta1</ee11.weld.version>
<ee11.weld.version>6.0.0.Beta4</ee11.weld.version>
<ee8.jakarta.activation.api.version>1.2.2</ee8.jakarta.activation.api.version>
<ee8.jakarta.annotation.api.version>1.3.5</ee8.jakarta.annotation.api.version>
@ -289,7 +289,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>
@ -2499,6 +2499,56 @@
</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
org.jboss.weld only used for testing
-->
<excludeGroupIds>com.hazelcast,org.jboss.weld</excludeGroupIds>
<failWhenReviewNeeded>true</failWhenReviewNeeded>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>update-version</id>
<build>