diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 14ce28c63d8..a50f5194fa2 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -51,17 +51,6 @@
-
- org.apache.geronimo.specs
- geronimo-jcache_1.0_spec
- 1.0-alpha-1
-
-
- *
- *
-
-
-
org.apache.geronimo.specs
geronimo-mail_2.1_spec
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index dd61abba6be..ea54a8cef56 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -661,28 +661,6 @@
-
- org.apache.commons
- commons-jcs-core
- 2.2.1
-
-
- *
- *
-
-
-
-
- org.apache.commons
- commons-jcs-jcache
- 2.2.1
-
-
- *
- *
-
-
-
org.apache.commons
commons-lang3
@@ -958,17 +936,6 @@
-
- org.apache.geronimo.specs
- geronimo-jcache_1.0_spec
- 1.0-alpha-1
-
-
- *
- *
-
-
-
org.apache.geronimo.specs
geronimo-mail_2.1_spec
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index 8adbbc6b364..d2001f4f7a7 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -51,17 +51,6 @@
-
- org.apache.geronimo.specs
- geronimo-jcache_1.0_spec
- 1.0-alpha-1
-
-
- *
- *
-
-
-
org.apache.geronimo.specs
geronimo-mail_2.1_spec
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 3141207ada9..56e1620b0ce 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -661,28 +661,6 @@
-
- org.apache.commons
- commons-jcs-core
- 2.2.1
-
-
- *
- *
-
-
-
-
- org.apache.commons
- commons-jcs-jcache
- 2.2.1
-
-
- *
- *
-
-
-
org.apache.commons
commons-lang3
@@ -958,17 +936,6 @@
-
- org.apache.geronimo.specs
- geronimo-jcache_1.0_spec
- 1.0-alpha-1
-
-
- *
- *
-
-
-
org.apache.geronimo.specs
geronimo-mail_2.1_spec
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
index f9705a36150..3a859fd2b6e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java
@@ -197,23 +197,6 @@ private boolean isFiltered(final Collection extensions, final Extensi
break;
case "org.apache.batchee.container.cdi.BatchCDIInjectionExtension": // see org.apache.openejb.batchee.BatchEEServiceManager
return "true".equals(systemInstance.getProperty("tomee.batchee.cdi.use-extension", "false"));
- case "org.apache.commons.jcs.jcache.cdi.MakeJCacheCDIInterceptorFriendly":
- final String spi = "META-INF/services/javax.cache.spi.CachingProvider";
- try {
- final Enumeration appResources = Thread.currentThread().getContextClassLoader().getResources(spi);
- if (appResources != null && appResources.hasMoreElements()) {
- final Collection containerResources = Collections.list(containerLoader.getResources(spi));
- do {
- if (!containerResources.contains(appResources.nextElement())) {
- log.info("Skipping JCS CDI integration cause another provide was found in the application");
- return true;
- }
- } while (appResources.hasMoreElements());
- }
- } catch (final Exception e) {
- // no-op
- }
- break;
default:
}
return false;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
index 2ec5379b1ae..8e77033515a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
@@ -1117,7 +1117,6 @@ private void ensureContainerUrls() {
if ((skipContainerFolders && file.isDirectory())
// few hardcoded exclusions, TODO: see if we should filter them in previous call of applyBuiltinExcludes()
|| name.endsWith("tomcat-websocket.jar")
- || name.startsWith("commons-jcs-")
|| name.startsWith("xx-arquillian-tomee")
|| ("lib".equals(name) && file.isDirectory() &&
new File(JavaSecurityManagers.getSystemProperty("openejb.base", "-")).equals(file.getParentFile()))) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
index 6f0b77176ce..730ebd19a53 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
@@ -328,7 +328,7 @@ private static List urls(final ClassLoader classLoader) {
urlSet = applyBuiltinExcludes(
urlSet,
Filters.tokens("taglibs-shade", "taglibs-standard-impl", "taglibs-standard-jstlel", "jakarta.faces-2.", "jakarta.faces-2", "spring-security-taglibs", "spring-webmvc"),
- Filters.prefixes("commons-jcs-", "myfaces-", "tomcat-websocket.jar")); // myfaces is hardcoded in tomee
+ Filters.prefixes("myfaces-", "tomcat-websocket.jar")); // myfaces is hardcoded in tomee
} catch (final IOException e) {
DeploymentLoader.LOGGER.warning("Error scanning class loader for JSP tag libraries", e);
}
diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions
index a1cb1bc134b..2ef3b6a15b1 100644
--- a/container/openejb-core/src/main/resources/default.exclusions
+++ b/container/openejb-core/src/main/resources/default.exclusions
@@ -56,8 +56,6 @@ commons-digester-
commons-discovery-
commons-httpclient-
commons-io-
-commons-jcs-core-
-commons-jcs-jcache-
commons-lang-
commons-lang3-
commons-logging-
diff --git a/pom.xml b/pom.xml
index 99544a05f0d..57e9a9610df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,6 @@
2.12.0
0.5
2.16.1
- 2.2.1
3.16.0
3.11.1
2.12.0
@@ -231,7 +230,6 @@
3.0.3
3.0.4
- 1.0-alpha-1
2.0.2
0.9.6
0.9
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index c93bd71bb58..2b327f9dfaa 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -186,19 +186,6 @@
-
-
- org.apache.geronimo.specs
- geronimo-jcache_1.0_spec
- ${version.geronimo-jcache_1.0_spec}
- test
-
-
- org.apache.commons
- commons-jcs-jcache
- ${version.commons-jcs-cache}
- test
-
${project.groupId}
tomee-catalina
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 5f9384f193d..2c3fa49886c 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -351,18 +351,6 @@
-
- org.apache.geronimo.specs
- geronimo-jcache_1.0_spec
- ${version.geronimo-jcache_1.0_spec}
- runtime
-
-
- org.apache.commons
- commons-jcs-jcache
- ${version.commons-jcs-cache}
- runtime
-
org.apache.geronimo.components
geronimo-connector
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index ea63e42bbb2..74acb487994 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -351,18 +351,6 @@
-
- org.apache.geronimo.specs
- geronimo-jcache_1.0_spec
- ${version.geronimo-jcache_1.0_spec}
- runtime
-
-
- org.apache.commons
- commons-jcs-jcache
- ${version.commons-jcs-cache}
- runtime
-
org.apache.geronimo.components
geronimo-connector