You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2023/02/22 17:25:30 UTC
[ozone] branch master updated: HDDS-7839. Upgrade Weld to 3.1.9 (#4299)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 5da39f8cb8 HDDS-7839. Upgrade Weld to 3.1.9 (#4299)
5da39f8cb8 is described below
commit 5da39f8cb861dcb120892d9bfc9f3b709f81e5de
Author: rohit-kb <11...@users.noreply.github.com>
AuthorDate: Wed Feb 22 22:55:24 2023 +0530
HDDS-7839. Upgrade Weld to 3.1.9 (#4299)
---
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 2 +-
hadoop-ozone/dist/src/main/license/jar-report.txt | 2 +-
hadoop-ozone/s3gateway/pom.xml | 2 +-
pom.xml | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index f62e2cf563..98bef1a7dc 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -430,7 +430,7 @@ Apache License 2.0
org.jetbrains:annotations
org.jetbrains.kotlin:kotlin-stdlib
org.jetbrains.kotlin:kotlin-stdlib-common
- org.jboss.weld.servlet:weld-servlet
+ org.jboss.weld.servlet:weld-servlet-shaded
org.jheaps:jheaps
org.jooq:jooq
org.jooq:jooq-codegen
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 367380d584..5f72a0c6a3 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -252,6 +252,6 @@ share/ozone/lib/sqlite-jdbc.jar
share/ozone/lib/stax2-api.jar
share/ozone/lib/stax-ex.jar
share/ozone/lib/txw2.jar
-share/ozone/lib/weld-servlet.Final.jar
+share/ozone/lib/weld-servlet-shaded.Final.jar
share/ozone/lib/woodstox-core.jar
share/ozone/lib/zstd-jni.jar
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index d9e6ca8168..24e0df0092 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
+ <artifactId>weld-servlet-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
diff --git a/pom.xml b/pom.xml
index 8cc6c87590..1f76c46baa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<jaxb-api.version>2.3.0</jaxb-api.version>
<jaxb-runtime.version>2.3.0.1</jaxb-runtime.version>
<jsch.version>0.1.54</jsch.version>
- <cdi-api.version>1.2</cdi-api.version>
+ <cdi-api.version>2.0</cdi-api.version>
<servlet-api.version>3.1.0</servlet-api.version>
<glassfish-servlet.version>3.1</glassfish-servlet.version>
<jsp-api.version>2.1</jsp-api.version>
@@ -232,7 +232,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<rocksdb.version>7.7.3</rocksdb.version>
<sqlite.version>3.25.2</sqlite.version>
- <weld-servlet.version>2.4.7.Final</weld-servlet.version>
+ <weld-servlet.version>3.1.9.Final</weld-servlet.version>
<!-- define the Java language version used by the compiler -->
<javac.version>1.8</javac.version>
@@ -1442,7 +1442,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
+ <artifactId>weld-servlet-shaded</artifactId>
<version>${weld-servlet.version}</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org