diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b3b023423b9..692516af255 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,6 +12,9 @@ updates: # Associate with milestone 10.0.x milestone: 6 ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] # Restrict updates in this branch to jetty in the 10.x.x space - dependency-name: "jakarta.servlet:*" versions: [ ">=5.0.0" ] @@ -60,6 +63,9 @@ updates: # Associate with milestone 11.0.x milestone: 7 ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] # Restrict updates in this branch to jetty in the 11.x.x space - dependency-name: "jakarta.activation:*" versions: [ ">=2.1.0" ] diff --git a/build/build-resources/pom.xml b/build/build-resources/pom.xml index c257033a396..629c477b8bf 100644 --- a/build/build-resources/pom.xml +++ b/build/build-resources/pom.xml @@ -13,15 +13,12 @@ Build :: Resources - 3.1.1 true - true 3.4.0 true - true 3.1.0 - 3.2.2 + 3.2.3 UTF-8 true diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 8f9bbdcf85a..997f5d4f143 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -37,7 +37,7 @@ com.google.protobuf protobuf-java - 3.22.2 + ${protobuf.version} org.eclipse.jetty diff --git a/jetty-integrations/jetty-gcloud/pom.xml b/jetty-integrations/jetty-gcloud/pom.xml index 10ba718dac2..201c72c67ad 100644 --- a/jetty-integrations/jetty-gcloud/pom.xml +++ b/jetty-integrations/jetty-gcloud/pom.xml @@ -17,7 +17,8 @@ - 2.11.4 + 2.17.6 + 3.25.1 diff --git a/pom.xml b/pom.xml index b15ea934a7e..8199a3c49cd 100644 --- a/pom.xml +++ b/pom.xml @@ -157,15 +157,15 @@ 4.4.16 2.2.4 false - 2.2.13 - 2.5.10 + 2.2.14 + 2.5.11 9.6 4.2.0 6.4.1 - 3.3.0 + 3.5.0 1.5 3.2.0 - 10.6.0 + 10.12.7 1.16.0 3.14.0 1.25.0 @@ -180,25 +180,24 @@ 1.0.0-v20070606 7.0.5 3.0.2 - 1.3.0 - 2.23.0 + 1.5.0 + 2.24.0 4.0.6 - 4.0.6 - 1.59.0 + 1.60.1 2.10.1 - 32.1.3-jre + 33.0.0-jre 7.0.0 1.0.11 2.2 - 5.3.5 + 5.3.6 11.0.14.Final 4.6.5.Final 11.0.18.Final 1.2 false false - 2.15.3 - 0.8.10 + 2.16.1 + 0.8.11 2.0.1 2.1.1 4.0.0 @@ -221,7 +220,7 @@ 1.1.0.v201105071233 2.0 1.4.1.v201005082020 - 3.0.2.Final + 3.0.4.Final 3.5.1.Final 2.2.1.Final 2.2.1.Final @@ -241,7 +240,7 @@ jetty-home.zip 1.37 benchmarks - 5.13.0 + 5.14.0 1.1.1 2.5.0 2 @@ -252,15 +251,14 @@ true 5.10.0 2.0.3 - 4.1 + 4.3 ${project.build.directory}/local-repo - 2.22.0 + 2.22.1 1.4.14 10.3.6 - 3.2.0 + 3.3.2 0.13.1 1.1.0 - 3.10.1 3.10.2 3.1.0 3.6.0 @@ -268,7 +266,7 @@ 3.3.1 3.3.2 false - 3.11.0 + 3.12.1 3.6.1 3.1.1 3.9.4 @@ -278,7 +276,7 @@ 3.1.1 3.6.0 3.3.0 - 3.6.2 + 3.6.3 3.10.2 3.0.1 3.1.0 @@ -292,7 +290,7 @@ 3.4.0 2.2.3 3.2.20 - 3.12.11 + 3.12.14 4.1.100.Final 0.9.1 8.1.0 @@ -315,13 +313,13 @@ 2.6.14 2.1.1 4.0.0 - 4.0.2 + 4.0.3 2023-06-05T23:12:49Z UTF-8 src/it/settings.xml 2.0.9 1.3.6 - 4.7.3.5 + 4.8.2.0 false 0 1.8.3 @@ -329,7 +327,7 @@ 1.2.5 1.19.3 3.0.0 - 2.14.2 + 2.16.2 1.7.0.Final 2.2.2.Final 2.4.8