Explorar el Código

HADOOP-19124. Update org.ehcache from 3.3.1 to 3.8.2. (#6665) (#6705) Contributed by Shilun Fan.

Reviewed-by: Steve Loughran <stevel@cloudera.com>
Signed-off-by: Shilun Fan <slfan1989@apache.org>
slfan1989 hace 1 año
padre
commit
e0fcb17396

+ 1 - 1
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:jetty-xml:9.4.53.v20231009
 org.eclipse.jetty.websocket:javax-websocket-client-impl: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.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.ini4j:ini4j:0.5.4
 org.lz4:lz4-java:1.7.1
 org.lz4:lz4-java:1.7.1
 org.objenesis:objenesis:2.6
 org.objenesis:objenesis:2.6

+ 1 - 0
hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml

@@ -100,6 +100,7 @@
                     <exclude>org.bouncycastle:*</exclude>
                     <exclude>org.bouncycastle:*</exclude>
                     <!-- Leave snappy that includes native methods which cannot be relocated. -->
                     <!-- Leave snappy that includes native methods which cannot be relocated. -->
                     <exclude>org.xerial.snappy:*</exclude>
                     <exclude>org.xerial.snappy:*</exclude>
+                    <exclude>org.ehcache:*</exclude>
                   </excludes>
                   </excludes>
                 </banTransitiveDependencies>
                 </banTransitiveDependencies>
                 <banDuplicateClasses>
                 <banDuplicateClasses>

+ 6 - 0
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$"
 allowed_expr+="|^java.policy$"
 #   * Used by javax.annotation
 #   * Used by javax.annotation
 allowed_expr+="|^jndi.properties$"
 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+=")"
 allowed_expr+=")"
 declare -i bad_artifacts=0
 declare -i bad_artifacts=0

+ 1 - 1
hadoop-project/pom.xml

@@ -133,7 +133,7 @@
 
 
     <kerby.version>2.0.3</kerby.version>
     <kerby.version>2.0.3</kerby.version>
     <jcache.version>1.0-alpha-1</jcache.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>
     <hikari.version>4.0.3</hikari.version>
     <derby.version>10.14.2.0</derby.version>
     <derby.version>10.14.2.0</derby.version>
     <mssql.version>6.2.1.jre7</mssql.version>
     <mssql.version>6.2.1.jre7</mssql.version>