This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new a1ae35e69164 HADOOP-19135. Remove Jcache 1.0-alpha. (#6695)
Contributed by Shilun Fan.
a1ae35e69164 is described below
commit a1ae35e69164e42af68bf1d940744ae326ce130a
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Fri Apr 5 22:09:15 2024 +0800
HADOOP-19135. Remove Jcache 1.0-alpha. (#6695) Contributed by Shilun Fan.
Reviewed-by: Steve Loughran <ste...@cloudera.com>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
LICENSE-binary | 2 +-
hadoop-project/pom.xml | 12 ++++++------
.../hadoop-yarn-server/hadoop-yarn-server-common/pom.xml | 10 ++--------
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 02869088e1d9..c9577c8737a8 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -310,7 +310,6 @@ org.apache.commons:commons-validator:1.6
org.apache.curator:curator-client:5.2.0
org.apache.curator:curator-framework:5.2.0
org.apache.curator:curator-recipes:5.2.0
-org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1
org.apache.hbase:hbase-annotations:1.7.1
org.apache.hbase:hbase-client:1.7.1
org.apache.hbase:hbase-common:1.7.1
@@ -507,6 +506,7 @@ com.sun.jersey:jersey-server:1.19.4
com.sun.jersey:jersey-servlet:1.19.4
com.sun.xml.bind:jaxb-impl:2.2.3-1
javax.annotation:javax.annotation-api:1.3.2
+javax.cache:cache-api:1.1.1
javax.servlet:javax.servlet-api:3.1.0
javax.servlet.jsp:jsp-api:2.1
javax.websocket:javax.websocket-api:1.0
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index a01a31289d4e..67cd8fe58432 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -132,8 +132,8 @@
<commons-text.version>1.10.0</commons-text.version>
<kerby.version>2.0.3</kerby.version>
- <jcache.version>1.0-alpha-1</jcache.version>
<ehcache.version>3.8.2</ehcache.version>
+ <cache.api.version>1.1.1</cache.api.version>
<hikari.version>4.0.3</hikari.version>
<derby.version>10.14.2.0</derby.version>
<mssql.version>6.2.1.jre7</mssql.version>
@@ -1943,11 +1943,6 @@
<artifactId>kerb-core</artifactId>
<version>${kerby.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
- <version>${jcache.version}</version>
- </dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
@@ -2078,6 +2073,11 @@
<artifactId>log4j-web</artifactId>
<version>${log4j2.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
+ <version>${cache.api.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
index e67f53e21376..1f762d31800d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
@@ -124,14 +124,8 @@
<artifactId>leveldbjni-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.ehcache</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
