diff --git a/build/scripts/dependency-update.sh b/build/scripts/dependency-update.sh new file mode 100755 index 00000000000..1882126316f --- /dev/null +++ b/build/scripts/dependency-update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +echo "# This script is meant to be run from the root of the project" +echo "[jetty.project-12.0.x]$ build/scripts/dependency-update.sh" + +PWD=$(pwd) + +mvn -N -B -Pupdate-dependencies validate -Dmaven.build.cache.enabled=false + +pushd jetty-core +mvn -N -B -Pupdate-dependencies-core validate -Dmaven.build.cache.enabled=false +popd + +pushd jetty-ee10 +mvn -N -B -Pupdate-dependencies-ee10 validate -Dmaven.build.cache.enabled=false +popd + +pushd jetty-ee9 +mvn -N -B -Pupdate-dependencies-ee9 validate -Dmaven.build.cache.enabled=false +popd + +pushd jetty-ee8 +mvn -N -B -Pupdate-dependencies-ee8 validate -Dmaven.build.cache.enabled=false +popd diff --git a/javadoc/pom.xml b/javadoc/pom.xml index d32a61677a0..a005f1b8839 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -34,7 +34,6 @@ - jakarta.mail diff --git a/jetty-core/pom.xml b/jetty-core/pom.xml index 54f20d4d498..7e5f61438cd 100644 --- a/jetty-core/pom.xml +++ b/jetty-core/pom.xml @@ -123,6 +123,67 @@ + + + update-dependencies-core + + + + org.codehaus.mojo + versions-maven-plugin + + + core-update + + update-properties + + validate + + true + true + + + + + org.apache.maven + + + regex + .+-(alpha|beta).?[0-9]+ + + + + + + org.eclipse.jetty + + + regex + .+ + + + + + + org.eclipse.jetty.* + + + regex + .+ + + + + + + + + + + + + diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml index 4fddbcf131a..06da661ffab 100644 --- a/jetty-ee10/jetty-ee10-annotations/pom.xml +++ b/jetty-ee10/jetty-ee10-annotations/pom.xml @@ -44,6 +44,16 @@ org.slf4j slf4j-api + + jakarta.enterprise + jakarta.enterprise.cdi-api + test + + + jakarta.interceptor + jakarta.interceptor-api + test + jakarta.transaction jakarta.transaction-api diff --git a/jetty-ee10/jetty-ee10-plus/pom.xml b/jetty-ee10/jetty-ee10-plus/pom.xml index 53f5f01c206..a95c4222086 100644 --- a/jetty-ee10/jetty-ee10-plus/pom.xml +++ b/jetty-ee10/jetty-ee10-plus/pom.xml @@ -17,6 +17,18 @@ + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + jakarta.enterprise + jakarta.enterprise.lang-model + + + jakarta.interceptor + jakarta.interceptor-api + jakarta.transaction jakarta.transaction-api @@ -37,21 +49,6 @@ org.slf4j slf4j-api - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - - - jakarta.enterprise - jakarta.enterprise.lang-model - provided - - - jakarta.interceptor - jakarta.interceptor-api - provided - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml index 7a0e28f6a05..5b6b6dcf5f8 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -39,15 +39,15 @@ - 2.1.2 + 2.1.3 2.1.1 3.0.0 5.0.1 4.0.1 4.0.1 - 2.0.1 + 2.0.1.MR 2.1.0 - 2.1.2 + 2.1.3 6.0.0 3.1.1 3.0.0 @@ -55,10 +55,10 @@ 2.0.1 2.1.1 3.1.0 - 4.0.0 - 4.0.1 - 4.0.0 - 4.0.0 + 4.0.2 + 4.0.5 + 4.0.2 + 4.0.1 3.1.5 10.1.16 @@ -483,5 +483,303 @@ + + + update-dependencies-ee10 + + + + org.codehaus.mojo + versions-maven-plugin + + + ee10-update + + update-properties + + validate + + true + true + + + + + org.apache.maven + + + regex + .+-(alpha|beta).?[0-9]+ + + + + + + org.eclipse.jetty + + + regex + .+ + + + + + + org.eclipse.jetty.* + + + regex + .+ + + + + + + org.apache.mina + + + regex + .+-M[0-9]+$ + + + + + + jakarta.activation + + + regex + ^(?!2.1.).+ + + + + + + jakarta.annotation + + + regex + ^(?!2.1.).+ + + + + + + jakarta.authentication + + + regex + ^(?!3.0.).+ + + + + + + jakarta.el + + + regex + ^(?!5.0.).+ + + + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + regex + ^(?!4.0.).+ + + + + + + jakarta.enterprise + jakarta.enterprise.lang-model + + + regex + ^(?!4.0.).+ + + + + + + jakarta.inject + jakarta.inject-api + + + regex + ^(?!2.0.).+ + + + + + + jakarta.interceptor + jakarta.interceptor-api + + + regex + ^(?!2.1.).+ + + + + + + jakarta.mail + jakarta.mail-api + + + regex + ^(?!2.1.).+ + + + + + + jakarta.servlet + jakarta.servlet-api + + + regex + ^(?!6.0.).+ + + + + + + jakarta.servlet + jakarta.servlet.jsp-api + + + regex + ^(?!3.1.).+ + + + + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + + + regex + ^(?!3.0.).+ + + + + + + org.glassfish.web + jakarta.servlet.jsp.jstl + + + regex + ^(?!3.0.).+ + + + + + + jakarta.transaction + jakarta.transaction-api + + + regex + ^(?!3.0.).+ + + + + + + jakarta.websocket + jakarta.websocket-api + + + regex + ^(?!2.1.).+ + + + + + + jakarta.websocket + jakarta.websocket-client-api + + + regex + ^(?!2.1.).+ + + + + + + jakarta.ws.rs + jakarta.ws.rs-api + + + regex + ^(?!3.1).+ + + + + + + com.sun.xml.ws + jaxws-rt + + + regex + ^(?!4.0).+ + + + + + + org.glassfish.jaxb + jaxb-runtime + + + regex + ^(?!4.0.).+ + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + regex + ^(?!4.0.).+ + + + + + + jakarta.xml.ws + jakarta.xml.ws-api + + + regex + ^(?!4.0.).+ + + + + + + + + + + + + diff --git a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/pom.xml b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/pom.xml index 5b574c7d7d2..124aeab08ef 100644 --- a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/pom.xml +++ b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/pom.xml @@ -47,6 +47,10 @@ org.osgi org.osgi.service.event + + org.osgi + org.osgi.service.http.whiteboard + org.osgi org.osgi.util.tracker diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index b15b3e5a2a2..ed584f2ed1d 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -569,5 +569,145 @@ + + + update-dependencies-ee8 + + + + org.codehaus.mojo + versions-maven-plugin + + + ee8-update + + update-properties + + validate + + true + true + + + + + org.apache.maven + + + regex + .+-(alpha|beta).?[0-9]+ + + + + + + org.eclipse.jetty + + + regex + .+ + + + + + + org.eclipse.jetty.* + + + regex + .+ + + + + + + jakarta.annotation + + + regex + ^(?!1.).+ + + + + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + + + regex + ^(?!2.).+ + + + + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + + + regex + ^(?!1.).+ + + + + + + jakarta.transaction + jakarta.transaction-api + + + regex + ^(?!1.).+ + + + + + + org.apache.directory.api + + + regex + ^(?!2.1.).+ + + + + + + org.mortbay.jasper + apache-jsp + + + regex + ^(?!9.0.).+ + + + + + + org.apache.mina + + + regex + .+-M[0-9]+$ + + + + + + + + + + + + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml index fed0f0b6c98..89fa532afa8 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml @@ -121,5 +121,4 @@ - diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml index ff3004bd4cf..cfed5b2c7ee 100644 --- a/jetty-ee9/jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/pom.xml @@ -67,5 +67,28 @@ + + + org.basepom.maven + duplicate-finder-maven-plugin + + + default + + check + + verify + + + + about.html + .api_description + /?javax/servlet/resources/.*$ + + + + + + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java index 279a22f86ad..19669562c0c 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java @@ -193,6 +193,7 @@ public class TestOSGiUtil res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.tracker").versionAsInProject()); res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.xml").versionAsInProject()); res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.services").versionAsInProject()); + res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.equinox.http.service.api").versionAsInProject()); res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject().start()); res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject().start()); res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").versionAsInProject().start()); diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml index 9a6591e5049..16cb8d63674 100644 --- a/jetty-ee9/pom.xml +++ b/jetty-ee9/pom.xml @@ -47,7 +47,7 @@ 2.0.0 4.0.0 3.0.1 - 2.0.1 + 2.0.1.MR 2.0.1 2.0.1 5.0.0 @@ -668,5 +668,288 @@ + + + update-dependencies-ee9 + + + + org.codehaus.mojo + versions-maven-plugin + + + ee9-update + + update-properties + + validate + + true + true + + + + + org.apache.maven + + + regex + .+-(alpha|beta).?[0-9]+ + + + + + + org.eclipse.jetty + + + regex + .+ + + + + + + org.eclipse.jetty.* + + + regex + .+ + + + + + + jakarta.activation + + + regex + ^(?!2.0.).+ + + + + + + jakarta.annotation + + + regex + ^(?!2.0.).+ + + + + + + jakarta.authentication + + + regex + ^(?!2.).+ + + + + + + jakarta.el + + + regex + ^(?!4.).+ + + + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + regex + ^(?!3.).+ + + + + + + jakarta.interceptor + jakarta.interceptor-api + + + regex + ^(?!2.0.).+ + + + + + + jakarta.inject + jakarta.inject-api + + + regex + ^(?!2.0.).+ + + + + + + jakarta.mail + jakarta.mail-api + + + regex + ^(?!2.0.).+ + + + + + + jakarta.servlet + jakarta.servlet-api + + + regex + ^(?!5.).+ + + + + + + jakarta.servlet + jakarta.servlet.jsp-api + + + regex + ^(?!3.0.).+ + + + + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + + + regex + ^(?!2.).+ + + + + + + jakarta.ws.rs + jakarta.ws.rs-api + + + regex + ^(?!3.0).+ + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + regex + ^(?!3.0.).+ + + + + + + org.glassfish.jaxb + jaxb-runtime + + + regex + ^(?!3.0.).+ + + + + + + com.sun.xml.ws + jaxws-rt + + + regex + ^(?!3.0.).+ + + + + + + jakarta.xml.ws + jakarta.xml.ws-api + + + regex + ^(?!3.0.).+ + + + + + + org.mortbay.jasper + apache-jsp + + + regex + ^(?!10.0.).+ + + + + + + org.mortbay.jasper + apache-el + + + regex + ^(?!10.0.).+ + + + + + + org.apache.mina + + + regex + .+-M[0-9]+$ + + + + + + + + + + + + diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 4f2a0a4b8b9..7c0839090c6 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -13,7 +13,7 @@ ${basedir}/target/jetty-home - 2.0.2 + 2.0.3 ${basedir}/target/jetty-home-sources true @@ -218,6 +218,10 @@ org.ow2.asm asm-tree + + org.slf4j + slf4j-api + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml index 29ae3115fe8..7304dee0ce8 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml @@ -43,11 +43,21 @@ org.infinispan infinispan-query + + + org.slf4j + slf4j-api + + org.infinispan infinispan-remote-query-client + + org.slf4j + slf4j-api + commons-codec commons-codec diff --git a/pom.xml b/pom.xml index dbc804730f8..98a88875989 100644 --- a/pom.xml +++ b/pom.xml @@ -159,32 +159,32 @@ false 2.3.0 2.5.11 - 9.6 - 4.2.0 + 9.7 + 4.2.1 6.4.1 3.5.0 1.5 3.2.0 - 10.14.0 + 10.14.2 1.16.1 3.14.0 - 1.26.0 + 1.26.1 2.15.1 17 17 17 2.5.2 - 2.7.10 + 2.8.0 1.5.0 - 3.33.0 + 3.37.0 7.0.5 3.0.2 1.6.0 - 2.25.0 + 2.26.1 4.0.6 1.62.2 2.10.1 - 33.0.0-jre + 33.1.0-jre 7.0.0 1.0.11 2.2 @@ -195,7 +195,7 @@ 1.2 false false - 2.16.1 + 2.17.0 0.8.11 false 3.0.4.Final @@ -221,7 +221,7 @@ benchmarks 5.14.0 1.1.1 - 2.5.0 + 2.5.1 2 fixed true @@ -233,22 +233,22 @@ 4.3 ${project.build.directory}/local-repo 2.23.0 - 1.5.1 + 1.5.3 10.3.6 3.3.3 0.13.1 1.1.0 3.11.0 3.1.0 - 3.6.0 + 3.7.1 5.1.9 3.3.1 3.3.2 false - 3.12.1 + 3.13.0 3.6.1 3.1.1 - 3.9.4 + 3.9.6 3.4.1 3.2.0 3.1.0 @@ -256,15 +256,15 @@ 3.6.0 3.3.0 3.6.3 - 3.10.2 + 3.11.0 3.0.1 - 3.1.0 + 3.2.0 1.9.18 3.3.1 3.5.2 3.3.0 - 3.1.2 + 3.2.5 3.9.0 3.4.0 2.2.3 @@ -276,33 +276,35 @@ 8.0.0 1.2.0 1.3.0 + 1.2.2 1.6.1 1.5.1 1.4.1 - 3.11.100 + 1.1.1 + 3.12.0 1.2.0 1.0.2 1.0.1 1.5.4 - 3.7.200 + 3.7.300 1.0.2 - 3.18.500 + 3.19.0 org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" 4.13.5 2.6.14 - 2.1.1 + 2.2.0 4.0.0 4.0.3 2023-06-05T23:12:49Z UTF-8 src/it/settings.xml - 2.0.9 - 1.3.6 + 2.0.12 + 1.3.7 4.8.3.1 false 0 1.8.3 - 1.19.6 + 1.19.7 3.0.0 2.16.2 1.7.0.Final @@ -937,6 +939,11 @@ jetty-websocket-jetty-server ${project.version} + + org.eclipse.platform + org.eclipse.equinox.http.service.api + ${osgi-http-service-api} + org.eclipse.platform @@ -1077,6 +1084,11 @@ org.osgi.service.event ${osgi-service-event-version} + + org.osgi + org.osgi.service.http.whiteboard + ${osgi-service-http-whiteboard} + org.osgi org.osgi.util.function @@ -2480,6 +2492,65 @@ + + + update-dependencies + + + + org.codehaus.mojo + versions-maven-plugin + + + root-report + + update-properties + + validate + + + + + + org.apache.maven + + + regex + .+-(alpha|beta).?[0-9]+ + + + + + + org.eclipse.jetty + + + regex + .+ + + + + + + org.eclipse.jetty.* + + + regex + .+ + + + + + + + + + + + +