diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a48db1bac10..02b2e72b5c0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,8 @@ updates: target-branch: "jetty-9.4.x" schedule: interval: "daily" + # Associate with milestone 9.4.x + milestone: 3 ignore: # Restrict updates in this branch to jetty in the 9.4.x space - dependency-name: "javax.servlet:*" @@ -25,6 +27,8 @@ updates: target-branch: "jetty-10.0.x" schedule: interval: "daily" + # Associate with milestone 10.0.x + milestone: 6 ignore: # Restrict updates in this branch to jetty in the 10.x.x space - dependency-name: "jakarta.servlet:*" @@ -39,12 +43,16 @@ updates: versions: [ ">=2.0.0" ] - dependency-name: "jakarta.websocket:*" versions: [ ">=2.0.0" ] + - dependency-name: "jakarta.servlet.jsp.jstl:*" + versions: [ ">=2.0.0" ] - package-ecosystem: "maven" directory: "/" target-branch: "jetty-11.0.x" schedule: interval: "weekly" + # Associate with milestone 11.0.x + milestone: 7 ignore: # Restrict updates in this branch to jetty in the 11.x.x space - dependency-name: "jakarta.servlet:*" @@ -59,3 +67,5 @@ updates: versions: [ ">=3.0.0" ] - dependency-name: "jakarta.websocket:*" versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.servlet.jsp.jstl:*" + versions: [ ">=3.0.0" ] diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 8fac685ac13..bc7e6205841 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -30,7 +30,7 @@ org.apache.httpcomponents httpcore - 4.4.13 + 4.4.14 org.apache.httpcomponents diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index e300a740c79..a29e7f005f2 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -125,11 +125,6 @@ maven-artifact-transfer 0.13.1 - - org.codehaus.plexus - plexus-utils - 3.4.0 - org.apache.maven maven-plugin-api diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 03fab3832ea..ba78c514d2b 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -44,8 +44,7 @@ ${project.build.directory}/classes false true - test - runtime + compile diff --git a/pom.xml b/pom.xml index d300a54c320..32f44e6e687 100644 --- a/pom.xml +++ b/pom.xml @@ -31,19 +31,21 @@ 9.4.8.Final 4.3.4.Final 2.8.8 + 1.40.1 2.0.10 4.2.2 - 2.5.1 + 2.5.2 9.2 1.33 benchmarks 2.1.0 - 5.7.2 + 5.8.0 3.8.2 - 1.7.1 + 1.7.2 3.1.8.Final + 3.4.1 3.4.2.Final - 1.0.6 + 1.0.7 1.10.11 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)" @@ -55,11 +57,11 @@ 3.0.0-M5 3.8.1 - 3.1.2 + 3.2.0 3.2.0 3.2.1 - 3.3.1 - 3.6.0 + 3.3.2 + 3.6.1 3.0.0-M1 3.0.0-M1 3.0.0 @@ -80,7 +82,7 @@ false 0 1.16.0 - 5.8.0 + 5.9.0 2.7.0 @@ -426,7 +428,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 jetty-checkstyle.xml true @@ -593,7 +595,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 true true @@ -615,7 +617,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.0.0 + 3.1.1 org.apache.maven.plugins @@ -720,7 +722,7 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.7 com.agilejava.docbkx @@ -987,6 +989,17 @@ h2spec-maven-plugin 1.0.7 + + org.codehaus.mojo + versions-maven-plugin + 2.8.1 + + true + true + true + true + + @@ -1125,7 +1138,7 @@ org.codehaus.plexus plexus-utils - 3.3.0 + ${plexus-utils.version} org.apache.maven @@ -1142,6 +1155,11 @@ maven-core ${maven.version} + + org.apache.maven + maven-settings + ${maven.version} + org.apache.maven.plugin-tools maven-plugin-tools-api @@ -1304,7 +1322,7 @@ io.grpc grpc-core - 1.33.1 + ${grpc.version} org.apache.ant @@ -1489,7 +1507,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index 070dd1cd4d4..9547527030d 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -13,7 +13,7 @@ ${project.groupId}.cdi.owb - 2.0.20 + 2.0.23