Commit Graph

26998 Commits

Author SHA1 Message Date
Joakim Erdfelt 95d93480a6
Merge pull request #11337 from jetty/dependabot/maven/jetty-11.0.x/dev-dependencies-5e73067334
Bump the dev-dependencies group with 9 updates
2024-01-26 15:36:31 -06:00
Joakim Erdfelt 5b00a98255
Fixing release script 2024-01-26 15:22:12 -06:00
Joakim Erdfelt 6f79c4b3a7
Merge pull request #11333 from jetty/dependabot/maven/jetty-11.0.x/integration-deps-07835ac7dc
Bump the integration-deps group with 1 update
2024-01-26 14:10:38 -06:00
Joakim Erdfelt 22b8e6c8b3
Merge pull request #11331 from jetty/dependabot/maven/jetty-11.0.x/build-deps-338285aa65
Bump the build-deps group with 5 updates
2024-01-26 14:09:21 -06:00
dependabot[bot] 5193728158
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 20:06:23 +00:00
dependabot[bot] 98e63ba029
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] f43c1c8602
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
Joakim Erdfelt 929e656b36
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2024-01-25 11:00:39 -06:00
Joakim Erdfelt 6fec10e51e
Issue #11260 - Allow `QuickStartConfiguration` to be used in mixed contexts environment where some do not have a WEB-INF/quickstart-web.xml (#11261)
* QuickStartConfiguration updated

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-25 11:00:13 -06:00
Joakim Erdfelt 82d4d5fcf1
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2024-01-16 11:10:57 -06:00
Joakim Erdfelt d8c34c4ccd
Merge pull request #11276 from jetty/fix/10.0.x/start-sh-expr-fix
Issue #11273 - Add support for BSD based `expr` utility in `jetty.sh`
2024-01-16 10:46:23 -06:00
Joakim Erdfelt 65132561c6
Issue #11273 - Add support for BSD based `expr` utility in `jetty.sh`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-15 13:36:30 -06:00
Simone Bordet f84410b371
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-01-15 11:07:36 +01:00
Simone Bordet b953871c9a Backport of #11267.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-01-15 11:04:39 +01: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
Joakim Erdfelt dc96d91eef
Revert "Issue #11260 - Allow `QuickStartConfiguration` to be used in mixed contexts environment where some do not have a WEB-INF/quickstart-web.xml"
This reverts commit d6015606ea.
2024-01-11 11:17:06 -06:00
Joakim Erdfelt d6015606ea
Issue #11260 - Allow `QuickStartConfiguration` to be used in mixed contexts environment where some do not have a WEB-INF/quickstart-web.xml
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-11 11:16:30 -06: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
dependabot[bot] 9abb524ce9
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>
2024-01-10 08:38:49 -06:00
Joakim Erdfelt 4272a5d411
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2024-01-09 12:41:29 -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
Joakim Erdfelt 724c29613c
Merge pull request #11247 from jetty/dependabot/maven/jetty-11.0.x/com.diffplug.spotless-spotless-maven-plugin-2.41.1
Bump com.diffplug.spotless:spotless-maven-plugin from 2.39.0 to 2.41.1
2024-01-09 11:45:43 -06:00
Joakim Erdfelt fcf6eb5e77
Merge pull request #11240 from jetty/dependabot/maven/jetty-11.0.x/google.errorprone.version-2.24.1
Bump google.errorprone.version from 2.24.0 to 2.24.1
2024-01-08 13:08:52 -06:00
Joakim Erdfelt c27fcc7c3e
Merge pull request #11239 from jetty/dependabot/maven/jetty-10.0.x/google.errorprone.version-2.24.1
Bump google.errorprone.version from 2.24.0 to 2.24.1
2024-01-08 13:08:49 -06:00
dependabot[bot] a62069da3b
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-08 16:37:11 +00:00
dependabot[bot] 83bf4195f3
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:36 +00: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
Simone Bordet 5d7dc7182d
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-01-08 09:27:31 +01:00
Simone Bordet 9b2cfc4483 Fixes #11223 - WebSocketClient.connect with URI including query parameters don't work for HTTP2 connector
Fixed concatenation of path and query for HTTP/2 and HTTP/3 when creating `MetaData.ConnectRequest` to "tunnel" the WebSocket upgrade.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-01-08 09:26:22 +01:00
Joakim Erdfelt 885ab6f2e0
Restoring dependency to jetty-servlet 2024-01-03 12:11:25 -06:00
Joakim Erdfelt a00d5768bd
Improving exclusions on google-cloud-datastore 2024-01-03 12:11:06 -06:00
Joakim Erdfelt 1f03b3e649
Remove duplicate `<dependency>` declarations 2024-01-03 11:14:47 -06:00
Joakim Erdfelt 71778c25f9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2024-01-03 10:49:54 -06:00
Joakim Erdfelt ee0e1d47fe
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 10:41:38 -06:00
Joakim Erdfelt a84818d398
Ensure test webapps are referenced 2024-01-03 10:41:35 -06:00
Joakim Erdfelt c557c2de70
Excluding older javax.annotations 2024-01-03 10:41:30 -06:00
Joakim Erdfelt af14a65e4c
Results of: mvn spotless:apply (for sortModules) 2024-01-03 10:41:20 -06:00
Joakim Erdfelt 847e1f782d
Cleanup of top level pom comments 2024-01-03 10:40:53 -06:00
Joakim Erdfelt 2f3c9257d1
Results of: mvn spotless:apply 2024-01-03 10:40:38 -06:00
Joakim Erdfelt d414aedd95
Adding spotless-maven-plugin config to build-resources 2024-01-03 10:40:05 -06:00
Joakim Erdfelt d2e4b5d7d9
Adding spotless-maven-plugin config 2024-01-03 10:39:59 -06:00
Joakim Erdfelt 4853da2f07
Merge pull request #11217 from jetty/fix/10.0.x/add-spotless-plugin
Add spotless maven plugin configuration
2024-01-03 10:33:16 -06: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 97ca925620
Ensure test webapps are referenced 2024-01-03 06:39:03 -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