Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jetty 12.1.x add Eclipse dash too usagee #12325

Merged
merged 4 commits into from
Sep 29, 2024
Merged

Jetty 12.1.x add Eclipse dash too usagee #12325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1dbb72
Jetty 12.0.x add Eclipse Dash License plugin as part the build proces…
olamy Sep 29, 2024
dfca96f
Merge branch 'jetty-12.0.x' into jetty-12.1.x-merge-dash
olamy Sep 29, 2024
e8ac379
upgrade weld version to 6.0.0.Beta4
olamy Sep 29, 2024
cb42290
weld is only use for testing purpose
olamy Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
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.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
}
Expand Down
54 changes: 52 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading