This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new e0fcb173964c HADOOP-19124. Update org.ehcache from 3.3.1 to 3.8.2.
(#6665) (#6705) Contributed by Shilun Fan.
e0fcb173964c is described below
commit e0fcb173964c85c1ab79e6b3a32eca02c3cb4221
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Fri Apr 5 22:07:28 2024 +0800
HADOOP-19124. Update org.ehcache from 3.3.1 to 3.8.2. (#6665) (#6705)
Contributed by Shilun Fan.
Reviewed-by: Steve Loughran <ste...@cloudera.com>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
LICENSE-binary | 2 +-
hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml | 1 +
.../src/test/resources/ensure-jars-have-correct-contents.sh | 6 ++++++
hadoop-project/pom.xml | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index b2a635a18757..182938cfb933 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -356,7 +356,7 @@ org.eclipse.jetty:jetty-webapp:9.4.53.v20231009
org.eclipse.jetty:jetty-xml:9.4.53.v20231009
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.53.v20231009
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.53.v20231009
-org.ehcache:ehcache:3.3.1
+org.ehcache:ehcache:3.8.2
org.ini4j:ini4j:0.5.4
org.lz4:lz4-java:1.7.1
org.objenesis:objenesis:2.6
diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
index a4164ec0b4bc..ebacc249badb 100644
--- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
+++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
@@ -100,6 +100,7 @@
<exclude>org.bouncycastle:*</exclude>
<!-- Leave snappy that includes native methods which
cannot be relocated. -->
<exclude>org.xerial.snappy:*</exclude>
+ <exclude>org.ehcache:*</exclude>
</excludes>
</banTransitiveDependencies>
<banDuplicateClasses>
diff --git
a/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
b/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
index 0dbfefbf4f16..ca68608fd6a4 100644
---
a/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+++
b/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
@@ -58,6 +58,12 @@
allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
allowed_expr+="|^java.policy$"
# * Used by javax.annotation
allowed_expr+="|^jndi.properties$"
+# * Used by ehcache
+allowed_expr+="|^ehcache-107-ext.xsd$"
+allowed_expr+="|^ehcache-multi.xsd$"
+allowed_expr+="|^.gitkeep$"
+allowed_expr+="|^OSGI-INF.*$"
+allowed_expr+="|^javax.*$"
allowed_expr+=")"
declare -i bad_artifacts=0
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index aefeaa91baf1..8ca757650579 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -133,7 +133,7 @@
<kerby.version>2.0.3</kerby.version>
<jcache.version>1.0-alpha-1</jcache.version>
- <ehcache.version>3.3.1</ehcache.version>
+ <ehcache.version>3.8.2</ehcache.version>
<hikari.version>4.0.3</hikari.version>
<derby.version>10.14.2.0</derby.version>
<mssql.version>6.2.1.jre7</mssql.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
