This is an automated email from the ASF dual-hosted git repository.
abhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 0dc305f9e4 Upgrade hibernate validator version to fix CVE-2019-10219
(#14757)
0dc305f9e4 is described below
commit 0dc305f9e474cf2a95bd27bb4ffd64d6fd528b31
Author: Rishabh Singh <[email protected]>
AuthorDate: Mon Aug 14 11:50:51 2023 +0530
Upgrade hibernate validator version to fix CVE-2019-10219 (#14757)
---
cloud/aws-common/pom.xml | 4 ++--
extensions-contrib/aliyun-oss-extensions/pom.xml | 4 ++--
extensions-contrib/cassandra-storage/pom.xml | 4 ++--
extensions-contrib/cloudfiles-extensions/pom.xml | 4 ++--
extensions-contrib/graphite-emitter/pom.xml | 4 ++--
extensions-contrib/kubernetes-overlord-extensions/pom.xml | 4 ++--
extensions-contrib/redis-cache/pom.xml | 5 ++---
extensions-core/azure-extensions/pom.xml | 4 ++--
extensions-core/druid-catalog/pom.xml | 4 ++--
extensions-core/google-extensions/pom.xml | 4 ++--
extensions-core/hdfs-storage/pom.xml | 4 ++--
extensions-core/kafka-extraction-namespace/pom.xml | 4 ++--
extensions-core/kafka-indexing-service/pom.xml | 4 ++--
extensions-core/lookups-cached-global/pom.xml | 4 ++--
extensions-core/multi-stage-query/pom.xml | 4 ++--
extensions-core/orc-extensions/pom.xml | 4 ++--
extensions-core/s3-extensions/pom.xml | 4 ++--
indexing-hadoop/pom.xml | 4 ++--
indexing-service/pom.xml | 4 ++--
integration-tests/pom.xml | 4 ++--
licenses.yaml | 4 ++--
pom.xml | 9 +++++++--
processing/pom.xml | 4 ++--
server/pom.xml | 4 ++--
.../org/apache/druid/server/log/FilteredRequestLoggerTest.java | 2 +-
services/pom.xml | 4 ++--
sql/pom.xml | 4 ++--
27 files changed, 58 insertions(+), 54 deletions(-)
diff --git a/cloud/aws-common/pom.xml b/cloud/aws-common/pom.xml
index 61bc672001..4bad5332ce 100644
--- a/cloud/aws-common/pom.xml
+++ b/cloud/aws-common/pom.xml
@@ -76,8 +76,8 @@
<artifactId>aws-java-sdk-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<!-- Runtime -->
diff --git a/extensions-contrib/aliyun-oss-extensions/pom.xml
b/extensions-contrib/aliyun-oss-extensions/pom.xml
index d21409d641..34fed68c6c 100644
--- a/extensions-contrib/aliyun-oss-extensions/pom.xml
+++ b/extensions-contrib/aliyun-oss-extensions/pom.xml
@@ -91,8 +91,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-contrib/cassandra-storage/pom.xml
b/extensions-contrib/cassandra-storage/pom.xml
index 1fb31cb20a..4875a0cba7 100644
--- a/extensions-contrib/cassandra-storage/pom.xml
+++ b/extensions-contrib/cassandra-storage/pom.xml
@@ -150,8 +150,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-contrib/cloudfiles-extensions/pom.xml
b/extensions-contrib/cloudfiles-extensions/pom.xml
index fa92f8cbda..14c98f24e0 100644
--- a/extensions-contrib/cloudfiles-extensions/pom.xml
+++ b/extensions-contrib/cloudfiles-extensions/pom.xml
@@ -88,8 +88,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- jclouds dependencies -->
diff --git a/extensions-contrib/graphite-emitter/pom.xml
b/extensions-contrib/graphite-emitter/pom.xml
index 9d989c9dc5..1f4eb14505 100644
--- a/extensions-contrib/graphite-emitter/pom.xml
+++ b/extensions-contrib/graphite-emitter/pom.xml
@@ -87,8 +87,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions-contrib/kubernetes-overlord-extensions/pom.xml
b/extensions-contrib/kubernetes-overlord-extensions/pom.xml
index 925b499505..37c097394e 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/pom.xml
+++ b/extensions-contrib/kubernetes-overlord-extensions/pom.xml
@@ -107,8 +107,8 @@
<version>6.7.2</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-contrib/redis-cache/pom.xml
b/extensions-contrib/redis-cache/pom.xml
index fce5fcbb9e..15cb1532c8 100644
--- a/extensions-contrib/redis-cache/pom.xml
+++ b/extensions-contrib/redis-cache/pom.xml
@@ -92,9 +92,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.1.0.Final</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions-core/azure-extensions/pom.xml
b/extensions-core/azure-extensions/pom.xml
index ca9aa970c8..2e91c4bd93 100644
--- a/extensions-core/azure-extensions/pom.xml
+++ b/extensions-core/azure-extensions/pom.xml
@@ -115,8 +115,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-core/druid-catalog/pom.xml
b/extensions-core/druid-catalog/pom.xml
index e7ec5531c4..eb3fdde41d 100644
--- a/extensions-core/druid-catalog/pom.xml
+++ b/extensions-core/druid-catalog/pom.xml
@@ -102,8 +102,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-core/google-extensions/pom.xml
b/extensions-core/google-extensions/pom.xml
index 570e39f259..26e0369212 100644
--- a/extensions-core/google-extensions/pom.xml
+++ b/extensions-core/google-extensions/pom.xml
@@ -105,8 +105,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-core/hdfs-storage/pom.xml
b/extensions-core/hdfs-storage/pom.xml
index face5fba98..5e0799f118 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -103,8 +103,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions-core/kafka-extraction-namespace/pom.xml
b/extensions-core/kafka-extraction-namespace/pom.xml
index f6ce692ae3..0656bd6c14 100644
--- a/extensions-core/kafka-extraction-namespace/pom.xml
+++ b/extensions-core/kafka-extraction-namespace/pom.xml
@@ -97,8 +97,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-core/kafka-indexing-service/pom.xml
b/extensions-core/kafka-indexing-service/pom.xml
index 66a4cfcc4b..2fe0e4c7e5 100644
--- a/extensions-core/kafka-indexing-service/pom.xml
+++ b/extensions-core/kafka-indexing-service/pom.xml
@@ -124,8 +124,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions-core/lookups-cached-global/pom.xml
b/extensions-core/lookups-cached-global/pom.xml
index fa93a89411..092e8f87d9 100644
--- a/extensions-core/lookups-cached-global/pom.xml
+++ b/extensions-core/lookups-cached-global/pom.xml
@@ -95,8 +95,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-core/multi-stage-query/pom.xml
b/extensions-core/multi-stage-query/pom.xml
index cfc0b2d0cc..886161ebe0 100644
--- a/extensions-core/multi-stage-query/pom.xml
+++ b/extensions-core/multi-stage-query/pom.xml
@@ -102,8 +102,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-core/orc-extensions/pom.xml
b/extensions-core/orc-extensions/pom.xml
index a2710b311e..b92a0123e5 100644
--- a/extensions-core/orc-extensions/pom.xml
+++ b/extensions-core/orc-extensions/pom.xml
@@ -189,8 +189,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/extensions-core/s3-extensions/pom.xml
b/extensions-core/s3-extensions/pom.xml
index d4b4b6e202..579d3ae14a 100644
--- a/extensions-core/s3-extensions/pom.xml
+++ b/extensions-core/s3-extensions/pom.xml
@@ -108,8 +108,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index ac7e62fb8a..95a7f0c052 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -82,8 +82,8 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml
index 480c602a34..067abfdb0f 100644
--- a/indexing-service/pom.xml
+++ b/indexing-service/pom.xml
@@ -133,8 +133,8 @@
<artifactId>curator-recipes</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index afd96b9b1c..738ac391da 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -299,8 +299,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/licenses.yaml b/licenses.yaml
index 388a832bc2..23ff4ee754 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -1569,9 +1569,9 @@ name: Bean Validation API
license_category: binary
module: java-core
license_name: Apache License version 2.0
-version: 1.1.0.Final
+version: 2.0.2
libraries:
- - javax.validation: validation-api
+ - jakarta.validation: jakarta.validation-api
---
diff --git a/pom.xml b/pom.xml
index 702d0daa94..5ce9627785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<aws.sdk.version>1.12.497</aws.sdk.version>
<caffeine.version>2.8.0</caffeine.version>
<jacoco.version>0.8.7</jacoco.version>
- <hibernate-validator.version>5.3.6.Final</hibernate-validator.version>
+ <hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
<httpclient.version>4.5.13</httpclient.version>
<!-- When upgrading ZK, edit docs and integration tests as well
(integration-tests/docker-base/setup.sh) -->
<zookeeper.version>3.5.10</zookeeper.version>
@@ -556,7 +556,12 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.1.0.Final</version>
+ <version>2.0.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
diff --git a/processing/pom.xml b/processing/pom.xml
index 081881cf24..321ec81409 100644
--- a/processing/pom.xml
+++ b/processing/pom.xml
@@ -120,8 +120,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index 842d0ebe36..5ba0b170a9 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -280,8 +280,8 @@
<artifactId>jetty-http</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
diff --git
a/server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java
b/server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java
index 8e65c522a3..6d3dffe84b 100644
---
a/server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java
+++
b/server/src/test/java/org/apache/druid/server/log/FilteredRequestLoggerTest.java
@@ -287,7 +287,7 @@ public class FilteredRequestLoggerTest
);
expectedException.expect(ProvisionException.class);
- expectedException.expectMessage("log.delegate - may not be null");
+ expectedException.expectMessage("log.delegate - must not be null");
configurator.configurate(properties, "log", RequestLoggerProvider.class);
}
}
diff --git a/services/pom.xml b/services/pom.xml
index 6b10577c59..6f1813745a 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -128,8 +128,8 @@
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
diff --git a/sql/pom.xml b/sql/pom.xml
index da840f990d..e8be934e51 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -171,8 +171,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
