From 4dbfa5abc2597576a108005b79f9b710b49ca8e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:03:58 +0000 Subject: [PATCH 1/9] Bump metrics.version from 4.2.36 to 4.2.37 Bumps `metrics.version` from 4.2.36 to 4.2.37. Updates `io.dropwizard.metrics:metrics-core` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-graphite` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-jvm` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-jmx` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-annotation` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-json` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-healthchecks` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-jersey3` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-jetty11` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-logback` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) Updates `io.dropwizard.metrics:metrics-jakarta-servlets` from 4.2.36 to 4.2.37 - [Release notes](https://github.com/dropwizard/metrics/releases) - [Commits](https://github.com/dropwizard/metrics/compare/v4.2.36...v4.2.37) --- updated-dependencies: - dependency-name: io.dropwizard.metrics:metrics-core dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-graphite dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-jvm dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-jmx dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-annotation dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-json dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-healthchecks dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-jersey3 dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-jetty11 dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-logback dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.dropwizard.metrics:metrics-jakarta-servlets dependency-version: 4.2.37 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..73a1ac2cd0e 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 1.0.2 2.25.1 2.0.17 - 4.2.36 + 4.2.37 5.14.2 3.9.4 1.1.10.8 From 0f007d8aca46ac7d9db108e41d0616b47870b9b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:04:11 +0000 Subject: [PATCH 2/9] Bump bouncycastle.version from 1.81 to 1.82 Bumps `bouncycastle.version` from 1.81 to 1.82. Updates `org.bouncycastle:bcpkix-jdk18on` from 1.81 to 1.82 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcprov-jdk18on` from 1.81 to 1.82 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-version: '1.82' dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-version: '1.82' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..25cc4dc5dbb 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 9.8 3.51.0 2.41.0 - 1.81 + 1.82 From b885daaade52a4c31b414dcfae3eb2f5f629fd74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:04:20 +0000 Subject: [PATCH 3/9] Bump dropwizard.version from 4.0.16 to 5.0.0 Bumps `dropwizard.version` from 4.0.16 to 5.0.0. Updates `io.dropwizard:dropwizard-core` from 4.0.16 to 5.0.0 Updates `io.dropwizard:dropwizard-assets` from 4.0.16 to 5.0.0 Updates `io.dropwizard:dropwizard-testing` from 4.0.16 to 5.0.0 --- updated-dependencies: - dependency-name: io.dropwizard:dropwizard-core dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: io.dropwizard:dropwizard-assets dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: io.dropwizard:dropwizard-testing dependency-version: 5.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..997523e8fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 3.9.11 0.13.1 3.1.11 - 4.0.16 + 5.0.0 1.6.0 3.2.2 2.3.2 From 5e00213d1b39cfa504078b4016e2f3dd7af60fe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:05:14 +0000 Subject: [PATCH 4/9] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.14.0...maven-compiler-plugin-3.14.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-version: 3.14.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..f2589437105 100644 --- a/pom.xml +++ b/pom.xml @@ -1290,7 +1290,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 ${maven.compiler.source} ${maven.compiler.target} From 087a0cb7933125e6201f1b95b1205914ee86fe9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:05:19 +0000 Subject: [PATCH 5/9] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.3 to 3.12.0 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.11.3 to 3.12.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.11.3...maven-javadoc-plugin-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-version: 3.12.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..a5b0834c5c0 100644 --- a/pom.xml +++ b/pom.xml @@ -1634,7 +1634,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.3 + 3.12.0 org.apache.maven.plugins From 4577fa23d85114ec05431cd7533a4c7f8cad6cc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:06:39 +0000 Subject: [PATCH 6/9] Bump jakarta.xml.bind:jakarta.xml.bind-api from 2.3.2 to 4.0.4 Bumps [jakarta.xml.bind:jakarta.xml.bind-api](https://github.com/jakartaee/jaxb-api) from 2.3.2 to 4.0.4. - [Release notes](https://github.com/jakartaee/jaxb-api/releases) - [Commits](https://github.com/jakartaee/jaxb-api/compare/2.3.2...4.0.4) --- updated-dependencies: - dependency-name: jakarta.xml.bind:jakarta.xml.bind-api dependency-version: 4.0.4 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..3d21c400976 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 4.0.16 1.6.0 3.2.2 - 2.3.2 + 4.0.4 1.2.1 3.1.0 2.3.1 From 89cd2f4f46f010737c881ad07d49fdddc97c6f13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:06:44 +0000 Subject: [PATCH 7/9] Bump com.google.errorprone:error_prone_annotations from 2.41.0 to 2.42.0 Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.41.0 to 2.42.0. - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.41.0...v2.42.0) --- updated-dependencies: - dependency-name: com.google.errorprone:error_prone_annotations dependency-version: 2.42.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..bbaba06077c 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ 3.0.1-b12 9.8 3.51.0 - 2.41.0 + 2.42.0 1.81 From 2be2e6b4f50bcf169fb3aff3881bfd33b0f7354c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 04:07:11 +0000 Subject: [PATCH 8/9] Bump com.google.guava:guava from 33.4.8-jre to 33.5.0-jre Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.8-jre to 33.5.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.5.0-jre dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cee17bae00..acfbd3109d3 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 4.4.16 4.0.5 0.9.0 - 33.4.8-jre + 33.5.0-jre 1.1.1 2.0.73.Final 4.2.6.Final From e565656ad2b00ced68e92f2ab5410202248096aa Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Mon, 22 Sep 2025 14:50:18 +0200 Subject: [PATCH 9/9] Jetty 12.1.1 --- DEPENDENCY-LICENSES | 105 +++++++++-------- LICENSE-binary | 106 +++++++++--------- dev-tools/validate-license-files.py | 3 +- examples/storm-loadgen/pom.xml | 6 +- .../loadgen/HttpForwardingMetricsServer.java | 4 +- external/storm-hdfs-blobstore/pom.xml | 10 +- external/storm-hdfs/pom.xml | 10 +- pom.xml | 10 +- .../apache/storm/security/auth/AutoSSL.java | 2 +- .../storm/security/auth/kerberos/AutoTGT.java | 2 +- storm-core/pom.xml | 12 +- .../storm/metricstore/rocksdb/RocksDbKey.java | 2 +- storm-webapp/pom.xml | 8 +- .../apache/storm/daemon/drpc/DRPCServer.java | 6 +- .../daemon/logviewer/LogviewerServer.java | 16 +-- .../org/apache/storm/daemon/ui/UIHelpers.java | 10 +- .../org/apache/storm/daemon/ui/UIServer.java | 8 +- 17 files changed, 161 insertions(+), 159 deletions(-) diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES index 5586a7cba46..24ed9a1aeef 100644 --- a/DEPENDENCY-LICENSES +++ b/DEPENDENCY-LICENSES @@ -19,7 +19,7 @@ List of third-party dependencies grouped by their license type. Apache License, Version 2.0 * ActiveMQ :: Client (org.apache.activemq:activemq-client:6.1.7 - http://activemq.apache.org/activemq-client) - * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.36 - https://metrics.dropwizard.io/metrics-annotation) + * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.37 - https://metrics.dropwizard.io/metrics-annotation) * Apache Avro (org.apache.avro:avro:1.12.0 - https://avro.apache.org) * Apache Commons CLI (commons-cli:commons-cli:1.10.0 - https://commons.apache.org/proper/commons-cli/) * Apache Commons Codec (commons-codec:commons-codec:1.19.0 - https://commons.apache.org/proper/commons-codec/) @@ -87,33 +87,33 @@ List of third-party dependencies grouped by their license type. * Curator Client (org.apache.curator:curator-client:5.9.0 - https://curator.apache.org/curator-client) * Curator Framework (org.apache.curator:curator-framework:5.9.0 - https://curator.apache.org/curator-framework) * Curator Recipes (org.apache.curator:curator-recipes:5.9.0 - https://curator.apache.org/curator-recipes) - * Dropwizard (io.dropwizard:dropwizard-core:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-core) - * Dropwizard Asset Bundle (io.dropwizard:dropwizard-assets:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-assets) - * Dropwizard Configuration Support (io.dropwizard:dropwizard-configuration:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-configuration) - * Dropwizard Health Checking Support (io.dropwizard:dropwizard-health:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-health) - * Dropwizard Jackson Support (io.dropwizard:dropwizard-jackson:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jackson) - * Dropwizard Jersey Support (io.dropwizard:dropwizard-jersey:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jersey) - * Dropwizard Jetty Support (io.dropwizard:dropwizard-jetty:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jetty) - * Dropwizard Lifecycle Support (io.dropwizard:dropwizard-lifecycle:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-lifecycle) - * Dropwizard Logging Support (io.dropwizard:dropwizard-logging:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-logging) - * Dropwizard Metrics Support (io.dropwizard:dropwizard-metrics:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-metrics) - * Dropwizard Request Logging Support (io.dropwizard:dropwizard-request-logging:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-request-logging) - * Dropwizard Servlet Support (io.dropwizard:dropwizard-servlets:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-servlets) - * Dropwizard Utility Classes (io.dropwizard:dropwizard-util:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-util) - * Dropwizard Validation Support (io.dropwizard:dropwizard-validation:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-validation) - * error-prone annotations (com.google.errorprone:error_prone_annotations:2.41.0 - https://errorprone.info/error_prone_annotations) + * Dropwizard (io.dropwizard:dropwizard-core:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-core) + * Dropwizard Asset Bundle (io.dropwizard:dropwizard-assets:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-assets) + * Dropwizard Configuration Support (io.dropwizard:dropwizard-configuration:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-configuration) + * Dropwizard Health Checking Support (io.dropwizard:dropwizard-health:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-health) + * Dropwizard Jackson Support (io.dropwizard:dropwizard-jackson:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jackson) + * Dropwizard Jersey Support (io.dropwizard:dropwizard-jersey:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jersey) + * Dropwizard Jetty Support (io.dropwizard:dropwizard-jetty:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jetty) + * Dropwizard Lifecycle Support (io.dropwizard:dropwizard-lifecycle:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-lifecycle) + * Dropwizard Logging Support (io.dropwizard:dropwizard-logging:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-logging) + * Dropwizard Metrics Support (io.dropwizard:dropwizard-metrics:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-metrics) + * Dropwizard Request Logging Support (io.dropwizard:dropwizard-request-logging:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-request-logging) + * Dropwizard Servlet Support (io.dropwizard:dropwizard-servlets:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-servlets) + * Dropwizard Utility Classes (io.dropwizard:dropwizard-util:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-util) + * Dropwizard Validation Support (io.dropwizard:dropwizard-validation:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-validation) + * error-prone annotations (com.google.errorprone:error_prone_annotations:2.42.0 - https://errorprone.info/error_prone_annotations) * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) * Google Guice - Core Library (com.google.inject:guice:4.2.1 - https://github.com/google/guice/guice) - * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.2.36 - https://metrics.dropwizard.io/metrics-graphite) + * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.2.37 - https://metrics.dropwizard.io/metrics-graphite) * Gson (com.google.code.gson:gson:2.13.2 - https://github.com/google/gson) - * Guava: Google Core Libraries for Java (com.google.guava:guava:33.4.8-jre - https://github.com/google/guava) + * Guava: Google Core Libraries for Java (com.google.guava:guava:33.5.0-jre - https://github.com/google/guava) * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.3 - https://github.com/google/guava/failureaccess) * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) * hawtbuf (org.fusesource.hawtbuf:hawtbuf:1.11 - http://hawtbuf.fusesource.org/hawtbuf) - * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:7.0.5.Final - http://hibernate.org/validator/hibernate-validator) + * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:8.0.3.Final - https://hibernate.org/validator) * HikariCP (com.zaxxer:HikariCP:7.0.2 - https://github.com/brettwooldridge/HikariCP) * j2html (com.j2html:j2html:1.6.0 - http://j2html.com) - * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:3.0.0 - https://github.com/google/j2objc/) + * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:3.1 - https://github.com/google/j2objc/) * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.20 - https://github.com/FasterXML/jackson) * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.20.0 - https://github.com/FasterXML/jackson-core) * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.20.0 - https://github.com/FasterXML/jackson) @@ -122,14 +122,14 @@ List of third-party dependencies grouped by their license type. * Jackson datatype: Guava (com.fasterxml.jackson.datatype:jackson-datatype-guava:2.20.0 - https://github.com/FasterXML/jackson-datatypes-collections) * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.20.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8) * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310) - * Jackson Integration for Metrics (io.dropwizard.metrics:metrics-json:4.2.36 - https://metrics.dropwizard.io/metrics-json) + * Jackson Integration for Metrics (io.dropwizard.metrics:metrics-json:4.2.37 - https://metrics.dropwizard.io/metrics-json) * Jackson Jakarta-RS: base (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.20.0 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-base) * Jackson Jakarta-RS: JSON (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.20.0 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-json-provider) * Jackson module: Blackbird (com.fasterxml.jackson.module:jackson-module-blackbird:2.20.0 - https://github.com/FasterXML/jackson-modules-base) * Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) (com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0 - https://github.com/FasterXML/jackson-modules-base) * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.20.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names) * Jakarta Bean Validation API (jakarta.validation:jakarta.validation-api:3.0.2 - https://beanvalidation.org) - * Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api:2.0.1.MR - https://github.com/eclipse-ee4j/injection-api) + * Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api:2.0.1 - https://github.com/eclipse-ee4j/injection-api) * Java Concurrency Tools Core Library (org.jctools:jctools-core:4.0.5 - https://github.com/JCTools) * javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.6.1.Final - http://www.jboss.org) @@ -139,7 +139,7 @@ List of third-party dependencies grouped by their license type. * Jettison (org.codehaus.jettison:jettison:1.5.4 - https://github.com/jettison-json/jettison) * JSON Small and Fast Parser (net.minidev:json-smart:2.6.0 - https://urielch.github.io/) * JSpecify annotations (org.jspecify:jspecify:1.0.0 - http://jspecify.org/) - * JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.2.36 - https://metrics.dropwizard.io/metrics-jvm) + * JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.2.37 - https://metrics.dropwizard.io/metrics-jvm) * Kerby ASN1 Project (org.apache.kerby:kerby-asn1:2.0.3 - https://directory.apache.org/kerby/kerby-common/kerby-asn1) * Kerby Config (org.apache.kerby:kerby-config:2.0.3 - https://directory.apache.org/kerby/kerby-common/kerby-config) * Kerby-kerb core (org.apache.kerby:kerb-core:2.0.3 - https://directory.apache.org/kerby/kerby-kerb/kerb-core) @@ -178,13 +178,14 @@ List of third-party dependencies grouped by their license type. * Maven Repository Metadata Model (org.apache.maven:maven-repository-metadata:3.9.11 - https://maven.apache.org/ref/3.9.11/maven-repository-metadata/) * Maven Settings (org.apache.maven:maven-settings:3.8.1 - https://maven.apache.org/ref/3.8.1/maven-settings/) * Maven Settings Builder (org.apache.maven:maven-settings-builder:3.8.1 - https://maven.apache.org/ref/3.8.1/maven-settings-builder/) - * Metrics Core (io.dropwizard.metrics:metrics-core:4.2.36 - https://metrics.dropwizard.io/metrics-core) - * Metrics Health Checks (io.dropwizard.metrics:metrics-healthchecks:4.2.36 - https://metrics.dropwizard.io/metrics-healthchecks) - * Metrics Integration for Jersey 3.x (io.dropwizard.metrics:metrics-jersey3:4.2.36 - https://metrics.dropwizard.io/metrics-jersey3) - * Metrics Integration for Jetty 11.x and higher (io.dropwizard.metrics:metrics-jetty11:4.2.36 - https://metrics.dropwizard.io/metrics-jetty11) - * Metrics Integration for Logback (io.dropwizard.metrics:metrics-logback:4.2.36 - https://metrics.dropwizard.io/metrics-logback) - * Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.2.36 - https://metrics.dropwizard.io/metrics-jmx) - * Metrics Utility Jakarta Servlets (io.dropwizard.metrics:metrics-jakarta-servlets:4.2.36 - https://metrics.dropwizard.io/metrics-jakarta-servlets) + * Metrics Core (io.dropwizard.metrics:metrics-core:4.2.37 - https://metrics.dropwizard.io/metrics-core) + * Metrics Health Checks (io.dropwizard.metrics:metrics-healthchecks:4.2.37 - https://metrics.dropwizard.io/metrics-healthchecks) + * Metrics Integration for Jersey 3.x (io.dropwizard.metrics:metrics-jersey3:4.2.37 - https://metrics.dropwizard.io/metrics-jersey3) + * Metrics Integration for Jetty 12.x and higher (io.dropwizard.metrics:metrics-jetty12:4.2.37 - https://metrics.dropwizard.io/metrics-jetty12) + * Metrics Integration for Jetty 12.x and higher with Jakarta EE 10 (io.dropwizard.metrics:metrics-jetty12-ee10:4.2.37 - https://metrics.dropwizard.io/metrics-jetty12-ee10) + * Metrics Integration for Logback (io.dropwizard.metrics:metrics-logback:4.2.37 - https://metrics.dropwizard.io/metrics-logback) + * Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.2.37 - https://metrics.dropwizard.io/metrics-jmx) + * Metrics Utility Jakarta Servlets (io.dropwizard.metrics:metrics-jakarta-servlets:4.2.37 - https://metrics.dropwizard.io/metrics-jakarta-servlets) * micrometer-commons (io.micrometer:micrometer-commons:1.14.11 - https://github.com/micrometer-metrics/micrometer) * micrometer-observation (io.micrometer:micrometer-observation:1.14.11 - https://github.com/micrometer-metrics/micrometer) * Netty/All-in-One (io.netty:netty-all:4.2.6.Final - https://netty.io/netty-all/) @@ -268,7 +269,7 @@ List of third-party dependencies grouped by their license type. * Spring JMS (org.springframework:spring-jms:6.2.11 - https://github.com/spring-projects/spring-framework) * Spring Messaging (org.springframework:spring-messaging:6.2.11 - https://github.com/spring-projects/spring-framework) * Spring Transaction (org.springframework:spring-tx:6.2.11 - https://github.com/spring-projects/spring-framework) - * Throttling Appender (io.dropwizard.logback:logback-throttling-appender:1.5.1 - https://github.com/dropwizard/logback-throttling-appender/) + * Throttling Appender (io.dropwizard.logback:logback-throttling-appender:1.5.3 - https://github.com/dropwizard/logback-throttling-appender/) * Woodstox (com.fasterxml.woodstox:woodstox-core:7.1.1 - https://github.com/FasterXML/woodstox) Apache License, Version 2.0, BSD 2-Clause, Eclipse Distribution License, Version 1.0, Eclipse Public License, Version 2.0, jQuery license, MIT License, Modified BSD, Public Domain, The GNU General Public License (GPL), Version 2, With Classpath Exception, W3C license @@ -290,20 +291,17 @@ List of third-party dependencies grouped by their license type. * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.11 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common) - Apache License, Version 2.0, Eclipse Public License - Version 1.0 - - * Jetty :: Jakarta Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 - https://eclipse.org/jetty/jetty-jakarta-servlet-api) - * Jetty :: SetUID Java (org.eclipse.jetty.toolchain.setuid:jetty-setuid-java:1.0.4 - https://eclipse.org/jetty/jetty-setuid-parent/jetty-setuid-java) - Apache License, Version 2.0, Eclipse Public License - Version 2.0 - * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:11.0.26 - https://jetty.org/jetty-http) - * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:11.0.26 - https://jetty.org/jetty-io) - * Jetty :: Security (org.eclipse.jetty:jetty-security:11.0.26 - https://jetty.org/jetty-security) - * Jetty :: Server Core (org.eclipse.jetty:jetty-server:11.0.26 - https://jetty.org/jetty-server) - * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:11.0.26 - https://jetty.org/jetty-servlet) - * Jetty :: Utilities (org.eclipse.jetty:jetty-util:11.0.26 - https://jetty.org/jetty-util) - * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:11.0.26 - https://jetty.org/jetty-servlets) + * Core :: HTTP (org.eclipse.jetty:jetty-http:12.1.1 - https://jetty.org/jetty-core/jetty-http) + * Core :: IO (org.eclipse.jetty:jetty-io:12.1.1 - https://jetty.org/jetty-core/jetty-io) + * Core :: Security (org.eclipse.jetty:jetty-security:12.1.1 - https://jetty.org/jetty-core/jetty-security) + * Core :: Server (org.eclipse.jetty:jetty-server:12.1.1 - https://jetty.org/jetty-core/jetty-server) + * Core :: Sessions (org.eclipse.jetty:jetty-session:12.1.1 - https://jetty.org/jetty-core/jetty-session) + * Core :: Utilities (org.eclipse.jetty:jetty-util:12.1.1 - https://jetty.org/jetty-core/jetty-util) + * EE10 :: Servlet (org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.1 - https://jetty.org/jetty-ee10/jetty-ee10-servlet) + * EE10 :: Utility Servlets and Filters (org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.1 - https://jetty.org/jetty-ee10/jetty-ee10-servlets) + * Jetty :: SetUID JNA (org.eclipse.jetty.toolchain.setuid:jetty-setuid-jna:2.0.3 - https://eclipse.org/jetty/jetty-setuid-jna) Apache License, Version 2.0, GNU General Public License, version 2 @@ -313,11 +311,15 @@ List of third-party dependencies grouped by their license type. * Javassist (org.javassist:javassist:3.30.2-GA - https://www.javassist.org/) + Apache License, Version 2.0, LGPL-2.1-or-later + + * Java Native Access (net.java.dev.jna:jna-jpms:5.14.0 - https://github.com/java-native-access/jna) + Bouncy Castle Licence - * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.81 - https://www.bouncycastle.org/download/bouncy-castle-java/) - * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.81 - https://www.bouncycastle.org/download/bouncy-castle-java/) - * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.81 - https://www.bouncycastle.org/download/bouncy-castle-java/) + * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.82 - https://www.bouncycastle.org/download/bouncy-castle-java/) + * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.82 - https://www.bouncycastle.org/download/bouncy-castle-java/) + * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.82 - https://www.bouncycastle.org/download/bouncy-castle-java/) BSD-2-Clause, Public Domain, per Creative Commons CC0 @@ -362,7 +364,7 @@ List of third-party dependencies grouped by their license type. Eclipse Distribution License, Version 1.0 - * jakarta.xml.bind-api (jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api) + * Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:4.0.4 - https://github.com/jakartaee/jaxb-api/jakarta.xml.bind-api) * JavaBeans Activation Framework (com.sun.activation:jakarta.activation:1.2.1 - https://github.com/eclipse-ee4j/jaf/jakarta.activation) * JavaBeans Activation Framework API jar (jakarta.activation:jakarta.activation-api:1.2.1 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api) @@ -378,7 +380,7 @@ List of third-party dependencies grouped by their license type. Eclipse Public License, Version 1.0, GNU Lesser General Public License * Logback Access Common Module (ch.qos.logback.access:logback-access-common:2.0.6 - http://logback.qos.ch/logback-access-common) - * Logback Access Jetty 11 Module (ch.qos.logback.access:logback-access-jetty11:2.0.6 - http://logback.qos.ch/logback-access-jetty11) + * Logback Access Jetty 12 Module (ch.qos.logback.access:logback-access-jetty12:2.0.6 - http://logback.qos.ch/logback-access-jetty12) Eclipse Public License, Version 2.0 @@ -397,9 +399,8 @@ List of third-party dependencies grouped by their license type. * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged) * HK2 API module (org.glassfish.hk2:hk2-api:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api) * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils) - * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.0.0 - https://projects.eclipse.org/projects/ee4j.ca) * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.1.1 - https://projects.eclipse.org/projects/ee4j.ca) - * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:5.0.0 - https://projects.eclipse.org/projects/ee4j.servlet) + * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:6.1.0 - https://projects.eclipse.org/projects/ee4j.servlet) * OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:1.0.3 - https://projects.eclipse.org/projects/ee4j/osgi-resource-locator) * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator) @@ -414,13 +415,11 @@ List of third-party dependencies grouped by their license type. Eclipse Public License v. 2.0, GNU General Public License, version 2 with the GNU Classpath Exception * Eclipse Expressly (org.glassfish.expressly:expressly:5.0.0 - https://projects.eclipse.org/projects/ee4j.expressly) - * Jakarta Expression Language API (jakarta.el:jakarta.el-api:4.0.0 - https://projects.eclipse.org/projects/ee4j.el) - * Jakarta Expression Language Implementation (org.glassfish:jakarta.el:4.0.2 - https://projects.eclipse.org/projects/ee4j.el) + * Jakarta Expression Language API (jakarta.el:jakarta.el-api:5.0.1 - https://projects.eclipse.org/projects/ee4j.el) MIT License * argparse4j (net.sourceforge.argparse4j:argparse4j:0.9.0 - https://argparse4j.github.io) - * Checker Qual (org.checkerframework:checker-qual:3.51.0 - https://checkerframework.org/) * JCodings (org.jruby.jcodings:jcodings:1.0.58 - http://nexus.sonatype.org/oss-repository-hosting.html/jcodings) * Jedis (redis.clients:jedis:5.2.0 - https://github.com/redis/jedis) * Joni (org.jruby.joni:joni:2.2.1 - http://nexus.sonatype.org/oss-repository-hosting.html/joni) diff --git a/LICENSE-binary b/LICENSE-binary index 5b7bcc6cba5..e8cdf236446 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -668,7 +668,7 @@ The license texts of these dependencies can be found in the licenses directory. Apache License, Version 2.0 - * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.36 - https://metrics.dropwizard.io/metrics-annotation) + * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.37 - https://metrics.dropwizard.io/metrics-annotation) * Apache Commons CLI (commons-cli:commons-cli:1.10.0 - http://commons.apache.org/proper/commons-cli/) * Apache Commons Codec (commons-codec:commons-codec:1.19.0 - http://commons.apache.org/proper/commons-codec/) * Apache Commons Collections (org.apache.commons:commons-collections4:4.5.0 - https://commons.apache.org/proper/commons-collections/) @@ -719,30 +719,30 @@ The license texts of these dependencies can be found in the licenses directory. * Curator Client (org.apache.curator:curator-client:5.9.0 - https://curator.apache.org/curator-client) * Curator Framework (org.apache.curator:curator-framework:5.9.0 - https://curator.apache.org/curator-framework) * Curator Recipes (org.apache.curator:curator-recipes:5.9.0 - https://curator.apache.org/curator-recipes) - * Dropwizard (io.dropwizard:dropwizard-core:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-core) - * Dropwizard Asset Bundle (io.dropwizard:dropwizard-assets:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-assets) - * Dropwizard Configuration Support (io.dropwizard:dropwizard-configuration:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-configuration) - * Dropwizard Health Checking Support (io.dropwizard:dropwizard-health:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-health) - * Dropwizard Jackson Support (io.dropwizard:dropwizard-jackson:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jackson) - * Dropwizard Jersey Support (io.dropwizard:dropwizard-jersey:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jersey) - * Dropwizard Jetty Support (io.dropwizard:dropwizard-jetty:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jetty) - * Dropwizard Lifecycle Support (io.dropwizard:dropwizard-lifecycle:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-lifecycle) - * Dropwizard Logging Support (io.dropwizard:dropwizard-logging:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-logging) - * Dropwizard Metrics Support (io.dropwizard:dropwizard-metrics:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-metrics) - * Dropwizard Request Logging Support (io.dropwizard:dropwizard-request-logging:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-request-logging) - * Dropwizard Servlet Support (io.dropwizard:dropwizard-servlets:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-servlets) - * Dropwizard Utility Classes (io.dropwizard:dropwizard-util:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-util) - * Dropwizard Validation Support (io.dropwizard:dropwizard-validation:4.0.16 - http://www.dropwizard.io/4.0.16/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-validation) - * error-prone annotations (com.google.errorprone:error_prone_annotations:2.41.0 - https://errorprone.info/error_prone_annotations) + * Dropwizard (io.dropwizard:dropwizard-core:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-core) + * Dropwizard Asset Bundle (io.dropwizard:dropwizard-assets:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-assets) + * Dropwizard Configuration Support (io.dropwizard:dropwizard-configuration:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-configuration) + * Dropwizard Health Checking Support (io.dropwizard:dropwizard-health:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-health) + * Dropwizard Jackson Support (io.dropwizard:dropwizard-jackson:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jackson) + * Dropwizard Jersey Support (io.dropwizard:dropwizard-jersey:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jersey) + * Dropwizard Jetty Support (io.dropwizard:dropwizard-jetty:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-jetty) + * Dropwizard Lifecycle Support (io.dropwizard:dropwizard-lifecycle:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-lifecycle) + * Dropwizard Logging Support (io.dropwizard:dropwizard-logging:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-logging) + * Dropwizard Metrics Support (io.dropwizard:dropwizard-metrics:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-metrics) + * Dropwizard Request Logging Support (io.dropwizard:dropwizard-request-logging:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-request-logging) + * Dropwizard Servlet Support (io.dropwizard:dropwizard-servlets:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-servlets) + * Dropwizard Utility Classes (io.dropwizard:dropwizard-util:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-util) + * Dropwizard Validation Support (io.dropwizard:dropwizard-validation:5.0.0 - http://www.dropwizard.io/5.0.0/dropwizard-bom/dropwizard-dependencies/dropwizard-parent/dropwizard-validation) + * error-prone annotations (com.google.errorprone:error_prone_annotations:2.42.0 - https://errorprone.info/error_prone_annotations) * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/) - * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.2.36 - https://metrics.dropwizard.io/metrics-graphite) + * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.2.37 - https://metrics.dropwizard.io/metrics-graphite) * Gson (com.google.code.gson:gson:2.13.2 - https://github.com/google/gson) - * Guava: Google Core Libraries for Java (com.google.guava:guava:33.4.8-jre - https://github.com/google/guava) + * Guava: Google Core Libraries for Java (com.google.guava:guava:33.5.0-jre - https://github.com/google/guava) * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.3 - https://github.com/google/guava/failureaccess) * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) - * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:7.0.5.Final - http://hibernate.org/validator/hibernate-validator) + * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:8.0.3.Final - http://hibernate.org/validator/hibernate-validator) * j2html (com.j2html:j2html:1.6.0 - http://j2html.com) - * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:3.0.0 - https://github.com/google/j2objc/) + * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:3.1 - https://github.com/google/j2objc/) * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.20 - https://github.com/FasterXML/jackson) * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.20.0 - https://github.com/FasterXML/jackson-core) * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.20.0 - https://github.com/FasterXML/jackson) @@ -751,14 +751,14 @@ The license texts of these dependencies can be found in the licenses directory. * Jackson datatype: Guava (com.fasterxml.jackson.datatype:jackson-datatype-guava:2.20.0 - https://github.com/FasterXML/jackson-datatypes-collections) * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.20.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8) * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310) - * Jackson Integration for Metrics (io.dropwizard.metrics:metrics-json:4.2.36 - https://metrics.dropwizard.io/metrics-json) + * Jackson Integration for Metrics (io.dropwizard.metrics:metrics-json:4.2.37 - https://metrics.dropwizard.io/metrics-json) * Jackson Jakarta-RS: base (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.20.0 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-base) * Jackson Jakarta-RS: JSON (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.20.0 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-json-provider) * Jackson module: Blackbird (com.fasterxml.jackson.module:jackson-module-blackbird:2.20.0 - https://github.com/FasterXML/jackson-modules-base) * Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) (com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0 - https://github.com/FasterXML/jackson-modules-base) * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.20.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names) * Jakarta Bean Validation API (jakarta.validation:jakarta.validation-api:3.0.2 - https://beanvalidation.org) - * Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api:2.0.1.MR - https://github.com/eclipse-ee4j/injection-api) + * Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api:2.0.1 - https://github.com/eclipse-ee4j/injection-api) * Java Concurrency Tools Core Library (org.jctools:jctools-core:4.0.5 - https://github.com/JCTools) * javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.6.1.Final - http://www.jboss.org) @@ -767,7 +767,7 @@ The license texts of these dependencies can be found in the licenses directory. * Jettison (org.codehaus.jettison:jettison:1.5.4 - no url defined) * JSON Small and Fast Parser (net.minidev:json-smart:2.6.0 - https://urielch.github.io/) * JSpecify annotations (org.jspecify:jspecify:1.0.0 - http://jspecify.org/) - * JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.2.36 - https://metrics.dropwizard.io/metrics-jvm) + * JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.2.37 - https://metrics.dropwizard.io/metrics-jvm) * Kerby ASN1 Project (org.apache.kerby:kerby-asn1:2.0.3 - http://directory.apache.org/kerby/kerby-common/kerby-asn1) * Kerby Config (org.apache.kerby:kerby-config:2.0.3 - http://directory.apache.org/kerby/kerby-common/kerby-config) * Kerby-kerb core (org.apache.kerby:kerb-core:2.0.3 - http://directory.apache.org/kerby/kerby-kerb/kerb-core) @@ -790,13 +790,14 @@ The license texts of these dependencies can be found in the licenses directory. * Maven Model (org.apache.maven:maven-model:3.9.11 - https://maven.apache.org/ref/3.6.0/maven-model/) * Maven Model Builder (org.apache.maven:maven-model-builder:3.9.11 - https://maven.apache.org/ref/3.9.11/maven-model-builder/) * Maven Repository Metadata Model (org.apache.maven:maven-repository-metadata:3.9.11 - https://maven.apache.org/ref/3.6.0/maven-repository-metadata/) - * Metrics Core (io.dropwizard.metrics:metrics-core:4.2.36 - https://metrics.dropwizard.io/metrics-core) - * Metrics Health Checks (io.dropwizard.metrics:metrics-healthchecks:4.2.36 - https://metrics.dropwizard.io/metrics-healthchecks) - * Metrics Integration for Jersey 3.x (io.dropwizard.metrics:metrics-jersey3:4.2.36 - https://metrics.dropwizard.io/metrics-jersey3) - * Metrics Integration for Jetty 11.x and higher (io.dropwizard.metrics:metrics-jetty11:4.2.36 - https://metrics.dropwizard.io/metrics-jetty11) - * Metrics Integration for Logback (io.dropwizard.metrics:metrics-logback:4.2.36 - https://metrics.dropwizard.io/metrics-logback) - * Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.2.36 - https://metrics.dropwizard.io/metrics-jmx) - * Metrics Utility Jakarta Servlets (io.dropwizard.metrics:metrics-jakarta-servlets:4.2.36 - https://metrics.dropwizard.io/metrics-jakarta-servlets) + * Metrics Core (io.dropwizard.metrics:metrics-core:4.2.37 - https://metrics.dropwizard.io/metrics-core) + * Metrics Health Checks (io.dropwizard.metrics:metrics-healthchecks:4.2.37 - https://metrics.dropwizard.io/metrics-healthchecks) + * Metrics Integration for Jersey 3.x (io.dropwizard.metrics:metrics-jersey3:4.2.37 - https://metrics.dropwizard.io/metrics-jersey3) + * Metrics Integration for Jetty 12.x and higher (io.dropwizard.metrics:metrics-jetty12:4.2.37 - https://metrics.dropwizard.io/metrics-jetty12) + * Metrics Integration for Jetty 12.x and higher with Jakarta EE 10 (io.dropwizard.metrics:metrics-jetty12-ee10:4.2.37 - https://metrics.dropwizard.io/metrics-jetty12-ee10) + * Metrics Integration for Logback (io.dropwizard.metrics:metrics-logback:4.2.37 - https://metrics.dropwizard.io/metrics-logback) + * Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.2.37 - https://metrics.dropwizard.io/metrics-jmx) + * Metrics Utility Jakarta Servlets (io.dropwizard.metrics:metrics-jakarta-servlets:4.2.37 - https://metrics.dropwizard.io/metrics-jakarta-servlets) * Netty/All-in-One (io.netty:netty-all:4.2.6.Final - https://netty.io/netty-all/) * Netty/Buffer (io.netty:netty-buffer:4.2.6.Final - https://netty.io/netty-buffer/) * Netty/Codec/Base (io.netty:netty-codec-base:4.2.6.Final - https://netty.io/netty-codec-base/) @@ -852,7 +853,7 @@ The license texts of these dependencies can be found in the licenses directory. * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:3.6.0 - http://codehaus-plexus.github.io/plexus-utils/) * Plexus Interpolation API (org.codehaus.plexus:plexus-interpolation:1.28 - http://codehaus-plexus.github.io/plexus-interpolation/) * SnakeYAML (org.yaml:snakeyaml:2.2 - https://bitbucket.org/snakeyaml/snakeyaml) - * Throttling Appender (io.dropwizard.logback:logback-throttling-appender:1.5.1 - https://github.com/dropwizard/logback-throttling-appender/) + * Throttling Appender (io.dropwizard.logback:logback-throttling-appender:1.5.3 - https://github.com/dropwizard/logback-throttling-appender/) * Woodstox (com.fasterxml.woodstox:woodstox-core:7.1.1 - https://github.com/FasterXML/woodstox) Apache License, Version 2.0, BSD 2-Clause, Eclipse Distribution License, Version 1.0, Eclipse Public License, Version 2.0, jQuery license, MIT License, Modified BSD, Public Domain, The GNU General Public License (GPL), Version 2, With Classpath Exception, W3C license @@ -874,20 +875,17 @@ The license texts of these dependencies can be found in the licenses directory. * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.11 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common) - Apache License, Version 2.0, Eclipse Public License - Version 1.0 - - * Jetty :: Jakarta Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 - https://eclipse.org/jetty/jetty-jakarta-servlet-api) - * Jetty :: SetUID Java (org.eclipse.jetty.toolchain.setuid:jetty-setuid-java:1.0.4 - https://eclipse.org/jetty/jetty-setuid-parent/jetty-setuid-java) - Apache License, Version 2.0, Eclipse Public License - Version 2.0 - * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:11.0.26 - https://jetty.org/jetty/jetty-http) - * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:11.0.26 - https://jetty.org/jetty/jetty-io) - * Jetty :: Security (org.eclipse.jetty:jetty-security:11.0.26 - https://jetty.org/jetty/jetty-security) - * Jetty :: Server Core (org.eclipse.jetty:jetty-server:11.0.26 - https://jetty.org/jetty/jetty-server) - * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:11.0.26 - https://jetty.org/jetty/jetty-servlet) - * Jetty :: Utilities (org.eclipse.jetty:jetty-util:11.0.26 - https://jetty.org/jetty/jetty-util) - * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:11.0.26 - https://jetty.org/jetty/jetty-servlets) + * Core :: HTTP (org.eclipse.jetty:jetty-http:12.1.1 - https://jetty.org/jetty-core/jetty-http) + * Core :: IO (org.eclipse.jetty:jetty-io:12.1.1 - https://jetty.org/jetty-core/jetty-io) + * Core :: Security (org.eclipse.jetty:jetty-security:12.1.1 - https://jetty.org/jetty-core/jetty-security) + * Core :: Server (org.eclipse.jetty:jetty-server:12.1.1 - https://jetty.org/jetty-core/jetty-server) + * Core :: Sessions (org.eclipse.jetty:jetty-session:12.1.1 - https://jetty.org/jetty-core/jetty-session) + * Core :: Utilities (org.eclipse.jetty:jetty-util:12.1.1 - https://jetty.org/jetty-core/jetty-util) + * EE10 :: Servlet (org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.1 - https://jetty.org/jetty-ee10/jetty-ee10-servlet) + * EE10 :: Utility Servlets and Filters (org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.1 - https://jetty.org/jetty-ee10/jetty-ee10-servlets) + * Jetty :: SetUID JNA (org.eclipse.jetty.toolchain.setuid:jetty-setuid-jna:2.0.3 - https://eclipse.org/jetty/jetty-setuid-jna) Apache License, Version 2.0, GNU General Public License, version 2 @@ -897,11 +895,15 @@ The license texts of these dependencies can be found in the licenses directory. * Javassist (org.javassist:javassist:3.30.2-GA - https://www.javassist.org/) + Apache License, Version 2.0, LGPL-2.1-or-later + + * Java Native Access (net.java.dev.jna:jna-jpms:5.14.0 - https://github.com/java-native-access/jna) + Bouncy Castle Licence - * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.81 - https://www.bouncycastle.org/java.html) - * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.81 - http://www.bouncycastle.org/java.html) - * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.81 - http://www.bouncycastle.org/java.html) + * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.82 - https://www.bouncycastle.org/java.html) + * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.82 - http://www.bouncycastle.org/java.html) + * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.82 - http://www.bouncycastle.org/java.html) BSD 2-Clause license @@ -939,7 +941,7 @@ The license texts of these dependencies can be found in the licenses directory. Eclipse Distribution License, Version 1.0 - * jakarta.xml.bind-api (jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api) + * jakarta.xml.bind-api (jakarta.xml.bind:jakarta.xml.bind-api:4.0.4 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api) * JavaBeans Activation Framework (com.sun.activation:jakarta.activation:1.2.1 - https://github.com/eclipse-ee4j/jaf/jakarta.activation) * JavaBeans Activation Framework API jar (jakarta.activation:jakarta.activation-api:1.2.1 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api) @@ -953,7 +955,7 @@ The license texts of these dependencies can be found in the licenses directory. Eclipse Public License, Version 1.0, GNU Lesser General Public License * Logback Access Common Module (ch.qos.logback.access:logback-access-common:2.0.6 - http://logback.qos.ch/logback-access-common) - * Logback Access Jetty 11 Module (ch.qos.logback.access:logback-access-jetty11:2.0.6 - http://logback.qos.ch/logback-access-jetty11) + * Logback Access Jetty 12 Module (ch.qos.logback.access:logback-access-jetty12:2.0.6 - http://logback.qos.ch/logback-access-jetty12) Eclipse Public License, Version 2.0 @@ -972,8 +974,8 @@ The license texts of these dependencies can be found in the licenses directory. * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged) * HK2 API module (org.glassfish.hk2:hk2-api:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api) * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils) - * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.0.0 - https://projects.eclipse.org/projects/ee4j.ca) - * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:5.0.0 - https://projects.eclipse.org/projects/ee4j.servlet) + * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.1.1 - https://projects.eclipse.org/projects/ee4j.ca) + * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:6.1.0 - https://projects.eclipse.org/projects/ee4j.servlet) * OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:1.0.3 - https://projects.eclipse.org/projects/ee4j/osgi-resource-locator) * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:3.0.6 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator) @@ -984,13 +986,11 @@ The license texts of these dependencies can be found in the licenses directory. Eclipse Public License v. 2.0, GNU General Public License, version 2 with the GNU Classpath Exception * Eclipse Expressly (org.glassfish.expressly:expressly:5.0.0 - https://projects.eclipse.org/projects/ee4j.expressly) - * Jakarta Expression Language API (jakarta.el:jakarta.el-api:4.0.0 - https://projects.eclipse.org/projects/ee4j.el) - * Jakarta Expression Language Implementation (org.glassfish:jakarta.el:4.0.2 - https://projects.eclipse.org/projects/ee4j.el) + * Jakarta Expression Language API (jakarta.el:jakarta.el-api:5.0.1 - https://projects.eclipse.org/projects/ee4j.el) MIT License * argparse4j (net.sourceforge.argparse4j:argparse4j:0.9.0 - https://argparse4j.github.io) - * Checker Qual (org.checkerframework:checker-qual:3.51.0 - https://checkerframework.org/) * JCodings (org.jruby.jcodings:jcodings:1.0.58 - http://nexus.sonatype.org/oss-repository-hosting.html/jcodings) * Joni (org.jruby.joni:joni:2.2.1 - http://nexus.sonatype.org/oss-repository-hosting.html/joni) * JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:2.0.17 - http://www.slf4j.org) diff --git a/dev-tools/validate-license-files.py b/dev-tools/validate-license-files.py index 6f32808f7b3..d10bda620b5 100755 --- a/dev-tools/validate-license-files.py +++ b/dev-tools/validate-license-files.py @@ -28,8 +28,7 @@ import argparse project_root = Path(__file__).resolve().parent.parent -update_dependency_licenses_cmd = ('mvn license:aggregate-add-third-party@generate-and-check-licenses' + - ' -Dlicense.skipAggregateAddThirdParty=false -B') +update_dependency_licenses_cmd = ('mvn license:aggregate-add-third-party@generate-and-check-licenses -Dlicense.skipAggregateAddThirdParty=false -B') @contextmanager diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml index b5b53560740..52f7a96a3bc 100644 --- a/examples/storm-loadgen/pom.xml +++ b/examples/storm-loadgen/pom.xml @@ -47,10 +47,12 @@ org.eclipse.jetty jetty-server + ${jetty.version} - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet + ${jetty.version} org.apache.storm diff --git a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java index 60605cfa369..74317137fe3 100644 --- a/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java +++ b/examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/HttpForwardingMetricsServer.java @@ -33,9 +33,9 @@ import org.apache.storm.metric.api.IMetricsConsumer.TaskInfo; import org.apache.storm.serialization.KryoValuesDeserializer; import org.apache.storm.utils.Utils; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; /** * A server that can listen for metrics from the HttpForwardingMetricsConsumer. diff --git a/external/storm-hdfs-blobstore/pom.xml b/external/storm-hdfs-blobstore/pom.xml index 1a1b4c1c6cc..4ef504e010d 100644 --- a/external/storm-hdfs-blobstore/pom.xml +++ b/external/storm-hdfs-blobstore/pom.xml @@ -82,13 +82,15 @@ test - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet + ${jetty.version} test - org.eclipse.jetty - jetty-webapp + org.eclipse.jetty.ee10 + jetty-ee10-webapp + ${jetty.version} test diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml index 4c5807c94ef..27fab703045 100644 --- a/external/storm-hdfs/pom.xml +++ b/external/storm-hdfs/pom.xml @@ -115,13 +115,15 @@ test - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet + ${jetty.version} test - org.eclipse.jetty - jetty-webapp + org.eclipse.jetty.ee10 + jetty-ee10-webapp + ${jetty.version} test diff --git a/pom.xml b/pom.xml index f0171c21a8a..1b1fd2a9c8c 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 1.14.0 1.10.0 5.9.0 - 11.0.26 + 12.1.1 1.3.0 1.6.0 2.2 @@ -120,7 +120,7 @@ 2.6.3-hadoop3 5.6.2 3.4 - 5.0.0 + 6.1.0 2.14.0 0.22.0 5.13.4 @@ -753,8 +753,8 @@ ${json-smart.version} - org.eclipse.jetty - jetty-bom + org.eclipse.jetty.ee10 + jetty-ee10-bom ${jetty.version} import pom @@ -887,7 +887,7 @@ io.dropwizard.metrics - metrics-jetty11 + metrics-jetty12 ${metrics.version} diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java b/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java index ee90676c27a..6cf1773e91f 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/AutoSSL.java @@ -12,6 +12,7 @@ package org.apache.storm.security.auth; +import jakarta.xml.bind.DatatypeConverter; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -20,7 +21,6 @@ import java.util.Collection; import java.util.Map; import javax.security.auth.Subject; -import javax.xml.bind.DatatypeConverter; import org.apache.storm.shade.com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java index f7f866a1682..c3f181b2709 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/AutoTGT.java @@ -13,6 +13,7 @@ package org.apache.storm.security.auth.kerberos; import com.codahale.metrics.Gauge; +import jakarta.xml.bind.DatatypeConverter; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Iterator; @@ -26,7 +27,6 @@ import javax.security.auth.kerberos.KerberosTicket; import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; -import javax.xml.bind.DatatypeConverter; import org.apache.storm.metric.api.IMetricsRegistrant; import org.apache.storm.security.auth.ClientAuthUtils; import org.apache.storm.security.auth.IAutoCredentials; diff --git a/storm-core/pom.xml b/storm-core/pom.xml index ce828ae9778..895bfc2bab4 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -158,18 +158,22 @@ org.eclipse.jetty jetty-server + ${jetty.version} org.eclipse.jetty jetty-util + ${jetty.version} - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet + ${jetty.version} - org.eclipse.jetty - jetty-servlets + org.eclipse.jetty.ee10 + jetty-ee10-servlets + ${jetty.version} com.fasterxml.jackson.core diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java index 7065d3b5409..5f014f482fd 100644 --- a/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java +++ b/storm-server/src/main/java/org/apache/storm/metricstore/rocksdb/RocksDbKey.java @@ -11,12 +11,12 @@ package org.apache.storm.metricstore.rocksdb; +import jakarta.xml.bind.DatatypeConverter; import java.nio.ByteBuffer; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.DatatypeConverter; import org.apache.storm.metricstore.AggLevel; import org.apache.storm.shade.com.google.common.primitives.UnsignedBytes; import org.slf4j.Logger; diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml index c1dc938386e..5e9c35d83f9 100644 --- a/storm-webapp/pom.xml +++ b/storm-webapp/pom.xml @@ -115,13 +115,13 @@ jakarta.ws.rs-api - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet ${jetty.version} - org.eclipse.jetty - jetty-servlets + org.eclipse.jetty.ee10 + jetty-ee10-servlets ${jetty.version} diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java index 6db7f1aab7d..b643b396e61 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/drpc/DRPCServer.java @@ -41,11 +41,11 @@ import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.ObjectReader; import org.apache.storm.utils.Utils; +import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; import org.glassfish.jersey.servlet.ServletContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java index a1ec30d8c4a..518be3ab93f 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java @@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import java.io.File; -import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -40,11 +39,11 @@ import org.apache.storm.utils.ConfigUtils; import org.apache.storm.utils.ObjectReader; import org.apache.storm.utils.Utils; +import org.eclipse.jetty.ee10.servlet.DefaultServlet; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.util.resource.PathResourceFactory; import org.glassfish.jersey.servlet.ServletContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,12 +94,7 @@ private static Server mkHttpServer(StormMetricsRegistry metricsRegistry, Map