Commit Graph

2966 Commits

Author SHA1 Message Date
Joakim Erdfelt 3a745c71c2
Updating to version 10.0.20 2024-01-29 14:46:10 -06:00
Ludovic Orban c5a73c52f1 #11349 update to quiche version 0.20.0
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-01-29 21:09:10 +01:00
Joakim Erdfelt 5d9679adf8
Merge pull request #11335 from jetty/dependabot/maven/jetty-10.0.x/dev-dependencies-5e73067334
Bump the dev-dependencies group with 9 updates
2024-01-26 14:11:48 -06:00
Joakim Erdfelt 15195dd5fb
Merge pull request #11332 from jetty/dependabot/maven/jetty-10.0.x/integration-deps-07835ac7dc
Bump the integration-deps group with 1 update
2024-01-26 14:10:17 -06:00
dependabot[bot] a57f86e6c4
Bump the dev-dependencies group with 9 updates
Bumps the dev-dependencies group with 9 updates:

| Package | From | To |
| --- | --- | --- |
| [io.grpc:grpc-core](https://github.com/grpc/grpc-java) | `1.60.1` | `1.61.0` |
| io.hawt:hawtio-default | `3.0.0` | `3.0.1` |
| [org.apache.maven.plugin-tools:maven-plugin-tools-api](https://github.com/apache/maven-plugin-tools) | `3.10.2` | `3.11.0` |
| [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) | `3.10.2` | `3.11.0` |
| [org.asciidoctor:asciidoctor-maven-plugin](https://github.com/asciidoctor/asciidoctor-maven-plugin) | `2.2.4` | `2.2.5` |
| [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | `2.41.1` | `2.43.0` |
| [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) | `4.8.2.0` | `4.8.3.0` |
| [org.codehaus.mojo:flatten-maven-plugin](https://github.com/mojohaus/flatten-maven-plugin) | `1.5.0` | `1.6.0` |
| [com.google.cloud:google-cloud-datastore](https://github.com/googleapis/java-datastore) | `2.17.6` | `2.18.2` |


Updates `io.grpc:grpc-core` from 1.60.1 to 1.61.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.60.1...v1.61.0)

Updates `io.hawt:hawtio-default` from 3.0.0 to 3.0.1

Updates `org.apache.maven.plugin-tools:maven-plugin-tools-api` from 3.10.2 to 3.11.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.10.2 to 3.11.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

Updates `org.asciidoctor:asciidoctor-maven-plugin` from 2.2.4 to 2.2.5
- [Release notes](https://github.com/asciidoctor/asciidoctor-maven-plugin/releases)
- [Changelog](https://github.com/asciidoctor/asciidoctor-maven-plugin/blob/asciidoctor-maven-plugin-2.2.5/CHANGELOG.adoc)
- [Commits](https://github.com/asciidoctor/asciidoctor-maven-plugin/compare/asciidoctor-maven-plugin-2.2.4...asciidoctor-maven-plugin-2.2.5)

Updates `com.diffplug.spotless:spotless-maven-plugin` from 2.41.1 to 2.43.0
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/maven/2.41.1...lib/2.43.0)

Updates `com.github.spotbugs:spotbugs-maven-plugin` from 4.8.2.0 to 4.8.3.0
- [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases)
- [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.8.2.0...spotbugs-maven-plugin-4.8.3.0)

Updates `org.codehaus.mojo:flatten-maven-plugin` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/mojohaus/flatten-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/flatten-maven-plugin/compare/1.5.0...1.6.0)

Updates `com.google.cloud:google-cloud-datastore` from 2.17.6 to 2.18.2
- [Release notes](https://github.com/googleapis/java-datastore/releases)
- [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/java-datastore/compare/v2.17.6...v2.18.2)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: io.hawt:hawtio-default
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-tools-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: org.asciidoctor:asciidoctor-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: com.github.spotbugs:spotbugs-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
- dependency-name: org.codehaus.mojo:flatten-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: com.google.cloud:google-cloud-datastore
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-26 18:44:24 +00:00
dependabot[bot] dcad8b7caa
Bump the integration-deps group with 1 update
Bumps the integration-deps group with 1 update: [org.wildfly.security:wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron).


Updates `org.wildfly.security:wildfly-elytron` from 2.2.2.Final to 2.2.3.Final
- [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/2.2.2.Final...2.2.3.Final)

---
updated-dependencies:
- dependency-name: org.wildfly.security:wildfly-elytron
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: integration-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-26 18:32:58 +00:00
dependabot[bot] ca7f1fca08
Bump the build-deps group with 5 updates
Bumps the build-deps group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) | `1.19.3` | `1.19.4` |
| [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) | `3.2.3` | `3.2.5` |
| [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.2.3` | `3.2.5` |
| org.apache.maven.surefire:surefire-junit47 | `3.2.3` | `3.2.5` |
| [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) | `3.10.2` | `3.11.0` |


Updates `org.testcontainers:testcontainers-bom` from 1.19.3 to 1.19.4
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.3...1.19.4)

Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.2.3 to 3.2.5
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.2.3 to 3.2.5
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)

Updates `org.apache.maven.surefire:surefire-junit47` from 3.2.3 to 3.2.5

Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.10.2 to 3.11.0
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build-deps
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build-deps
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build-deps
- dependency-name: org.apache.maven.surefire:surefire-junit47
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: build-deps
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: build-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-26 18:32:15 +00:00
dependabot[bot] b86957c76e Bump com.diffplug.spotless:spotless-maven-plugin from 2.39.0 to 2.41.1
Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.39.0 to 2.41.1.
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/lib/2.39.0...maven/2.41.1)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-15 03:15:51 +00:00
dependabot[bot] 49c5eb341a
Bump org.eclipse.jetty.toolchain:jetty-test-helper from 6.0 to 6.2 (#11103)
* Bump org.eclipse.jetty.toolchain:jetty-test-helper from 6.0 to 6.2

Bumps [org.eclipse.jetty.toolchain:jetty-test-helper](https://github.com/eclipse/jetty.toolchain) from 6.0 to 6.2.
- [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-test-helper-6.0...jetty-test-helper-6.2)

---
updated-dependencies:
- dependency-name: org.eclipse.jetty.toolchain:jetty-test-helper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-10 08:40:24 -06:00
Joakim Erdfelt a4872492d8
Merge pull request #11234 from jetty/dependabot/maven/jetty-10.0.x/com.hazelcast-hazelcast-5.3.6
Bump com.hazelcast:hazelcast from 5.2.1 to 5.3.6
2024-01-09 11:46:31 -06:00
dependabot[bot] 4de7518baf
Bump google.errorprone.version from 2.24.0 to 2.24.1
Bumps `google.errorprone.version` from 2.24.0 to 2.24.1.

Updates `com.google.errorprone:error_prone_annotations` from 2.24.0 to 2.24.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.24.0...v2.24.1)

Updates `com.google.errorprone:error_prone_core` from 2.24.0 to 2.24.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.24.0...v2.24.1)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.errorprone:error_prone_core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 16:35:13 +00:00
dependabot[bot] 63b5a1200e
Bump com.hazelcast:hazelcast from 5.2.1 to 5.3.6
Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.2.1 to 5.3.6.
- [Release notes](https://github.com/hazelcast/hazelcast/releases)
- [Commits](https://github.com/hazelcast/hazelcast/compare/v5.2.1...v5.3.6)

---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 16:33:33 +00:00
Joakim Erdfelt 36a80b9622
Prevent rogue slf4j-impl coming from wildfly-elytron-2.2.2.Final.jar
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-03 08:06:54 -06:00
Joakim Erdfelt 85bc00725b
Excluding older javax.annotations 2024-01-03 04:59:28 -06:00
Joakim Erdfelt 35daa51ef5
Merge remote-tracking branch 'origin/jetty-10.0.x' into fix/10.0.x/add-spotless-plugin 2024-01-03 03:18:51 -06:00
Joakim Erdfelt 204b293d62
Results of: mvn spotless:apply (for sortModules) 2024-01-03 03:16:02 -06:00
Joakim Erdfelt e9373bf505
Cleanup of top level pom comments 2024-01-03 03:15:42 -06:00
Joakim Erdfelt 9a18dc8722
Results of: mvn spotless:apply 2024-01-03 03:12:56 -06:00
Joakim Erdfelt 7bb8c2c6f9
Adding spotless-maven-plugin config 2024-01-03 03:08:01 -06:00
Joakim Erdfelt c758ecdd2e
Merge pull request #11207 from jetty/dependabot/maven/jetty-10.0.x/biz.aQute.bnd-biz.aQute.bndlib-6.4.1
Bump biz.aQute.bnd:biz.aQute.bndlib from 6.3.1 to 6.4.1
2024-01-02 08:26:16 -06:00
Joakim Erdfelt 727affb9fb
Revert "Bump com.hazelcast:hazelcast from 5.2.1 to 5.3.6"
This reverts commit 85695867

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-01 17:05:36 -06:00
dependabot[bot] 4802604792
Bump biz.aQute.bnd:biz.aQute.bndlib from 6.3.1 to 6.4.1
Bumps [biz.aQute.bnd:biz.aQute.bndlib](https://github.com/bndtools/bnd) from 6.3.1 to 6.4.1.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/6.3.1...6.4.1)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd:biz.aQute.bndlib
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 21:38:39 +00:00
Joakim Erdfelt 467064f385
Revert "Bump biz.aQute.bnd:biz.aQute.bndlib from 6.3.1 to 7.0.0"
This reverts commit dc916c0ec0.
2024-01-01 12:16:10 -06:00
Joakim Erdfelt ddda2e5682
Revert "Bump jakarta.xml.ws:jakarta.xml.ws-api from 2.3.3 to 4.0.1"
This reverts commit edc9e582

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-01 12:11:38 -06:00
Joakim Erdfelt 5f27f4462d
Revert "Bump com.google.inject:guice from 5.1.0 to 7.0.0"
This reverts commit 0d7807f9

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-01 12:00:48 -06:00
Joakim Erdfelt fb36831f71
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.osgi-org.osgi.util.promise-1.3.0' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:33:38 -06:00
Joakim Erdfelt 7a71666482
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.mongodb-mongo-java-driver-3.12.14' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:33:16 -06:00
Joakim Erdfelt 930aa8c577
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.mariadb.jdbc-mariadb-java-client-3.3.2' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:33:13 -06:00
Joakim Erdfelt 5a3a6fed7c
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.junit-junit-bom-5.10.1' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:32:59 -06:00
Joakim Erdfelt 805df6f552
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.jolokia-jolokia-war-1.7.2' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:32:56 -06:00
Joakim Erdfelt c72d73e912
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.jboss.logmanager-jboss-logmanager-3.0.4.Final' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:32:38 -06:00
Joakim Erdfelt bef7ffb12f
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.jacoco-jacoco-maven-plugin-0.8.11' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:32:35 -06:00
Joakim Erdfelt 755b20d198
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.glassfish.jaxb-jaxb-runtime-2.3.9' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:32:31 -06:00
Joakim Erdfelt b1472f1efe
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-xml-4.0.3' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:44 -06:00
Joakim Erdfelt 0edb1ee20d
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-component-annotations-2.2.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:41 -06:00
Joakim Erdfelt 17424acc19
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.mojo-versions-maven-plugin-2.16.2' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:31:37 -06:00
Joakim Erdfelt 6421096884
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.mojo-flatten-maven-plugin-1.5.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:20 -06:00
Joakim Erdfelt 6febfda405
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.mojo-build-helper-maven-plugin-3.5.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:15 -06:00
Joakim Erdfelt 3e18d06ce3
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.asciidoctor-asciidoctorj-diagram-2.2.14' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:31:12 -06:00
Joakim Erdfelt f4fe9717ff
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.asciidoctor-asciidoctorj-2.5.11' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:54 -06:00
Joakim Erdfelt a5dec15b8f
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-javadoc-plugin-3.6.3' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:51 -06:00
Joakim Erdfelt b1dc95f5a9
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-compiler-plugin-3.12.1' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:47 -06:00
Joakim Erdfelt acfa76279a
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.logging.log4j-log4j-api-2.22.1' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:30:43 -06:00
Joakim Erdfelt 6c82297157
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/net.java.dev.jna-jna-jpms-5.14.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:29 -06:00
Joakim Erdfelt b58d3f3a34
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/maven.surefire.plugin.version-3.2.3' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:26 -06:00
Joakim Erdfelt 3356cc56e0
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/jakarta.xml.ws-jakarta.xml.ws-api-4.0.1' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:30:21 -06:00
Joakim Erdfelt e428630654
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/io.hawt-hawtio-default-3.0.0' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:29:46 -06:00
Joakim Erdfelt 6529711a13
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/io.grpc-grpc-core-1.60.1' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:29:11 -06:00
Joakim Erdfelt 241dced626
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/google.errorprone.version-2.24.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:27:41 -06:00
Joakim Erdfelt e934e53b48
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/com.sun.xml.ws-jaxws-rt-2.3.7' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:27:38 -06:00