Skip to content

Commit a1ae35e

Browse files
authored
HADOOP-19135. Remove Jcache 1.0-alpha. (#6695) Contributed by Shilun Fan.
Reviewed-by: Steve Loughran <stevel@cloudera.com> Signed-off-by: Shilun Fan <slfan1989@apache.org>
1 parent 6ed7389 commit a1ae35e

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

LICENSE-binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ org.apache.commons:commons-validator:1.6
310310
org.apache.curator:curator-client:5.2.0
311311
org.apache.curator:curator-framework:5.2.0
312312
org.apache.curator:curator-recipes:5.2.0
313-
org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1
314313
org.apache.hbase:hbase-annotations:1.7.1
315314
org.apache.hbase:hbase-client:1.7.1
316315
org.apache.hbase:hbase-common:1.7.1
@@ -507,6 +506,7 @@ com.sun.jersey:jersey-server:1.19.4
507506
com.sun.jersey:jersey-servlet:1.19.4
508507
com.sun.xml.bind:jaxb-impl:2.2.3-1
509508
javax.annotation:javax.annotation-api:1.3.2
509+
javax.cache:cache-api:1.1.1
510510
javax.servlet:javax.servlet-api:3.1.0
511511
javax.servlet.jsp:jsp-api:2.1
512512
javax.websocket:javax.websocket-api:1.0

hadoop-project/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@
132132
<commons-text.version>1.10.0</commons-text.version>
133133

134134
<kerby.version>2.0.3</kerby.version>
135-
<jcache.version>1.0-alpha-1</jcache.version>
136135
<ehcache.version>3.8.2</ehcache.version>
136+
<cache.api.version>1.1.1</cache.api.version>
137137
<hikari.version>4.0.3</hikari.version>
138138
<derby.version>10.14.2.0</derby.version>
139139
<mssql.version>6.2.1.jre7</mssql.version>
@@ -1943,11 +1943,6 @@
19431943
<artifactId>kerb-core</artifactId>
19441944
<version>${kerby.version}</version>
19451945
</dependency>
1946-
<dependency>
1947-
<groupId>org.apache.geronimo.specs</groupId>
1948-
<artifactId>geronimo-jcache_1.0_spec</artifactId>
1949-
<version>${jcache.version}</version>
1950-
</dependency>
19511946
<dependency>
19521947
<groupId>org.ehcache</groupId>
19531948
<artifactId>ehcache</artifactId>
@@ -2078,6 +2073,11 @@
20782073
<artifactId>log4j-web</artifactId>
20792074
<version>${log4j2.version}</version>
20802075
</dependency>
2076+
<dependency>
2077+
<groupId>javax.cache</groupId>
2078+
<artifactId>cache-api</artifactId>
2079+
<version>${cache.api.version}</version>
2080+
</dependency>
20812081
</dependencies>
20822082
</dependencyManagement>
20832083

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,8 @@
124124
<artifactId>leveldbjni-all</artifactId>
125125
</dependency>
126126
<dependency>
127-
<groupId>org.apache.geronimo.specs</groupId>
128-
<artifactId>geronimo-jcache_1.0_spec</artifactId>
129-
<exclusions>
130-
<exclusion>
131-
<groupId>org.osgi</groupId>
132-
<artifactId>org.osgi.core</artifactId>
133-
</exclusion>
134-
</exclusions>
127+
<groupId>javax.cache</groupId>
128+
<artifactId>cache-api</artifactId>
135129
</dependency>
136130
<dependency>
137131
<groupId>org.ehcache</groupId>

0 commit comments

Comments
 (0)