You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/07/29 07:35:44 UTC
[tomee] branch tomee-8.x updated: TOMEE-4021 - Unexpected ehcache 3.8.1 in tomee/lib
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 1e005c4f9e TOMEE-4021 - Unexpected ehcache 3.8.1 in tomee/lib
1e005c4f9e is described below
commit 1e005c4f9e71b029c419c2453c875eb832db6655
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Fri Jul 29 09:35:34 2022 +0200
TOMEE-4021 - Unexpected ehcache 3.8.1 in tomee/lib
---
.../java/org/apache/openejb/util/ContainerClassesFilter.java | 1 +
.../java/org/apache/openejb/util/JuliLogStreamFactory.java | 1 +
pom.xml | 2 +-
server/openejb-cxf/pom.xml | 10 +++++++++-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
index 4bad1a10b6..ade88d8351 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
@@ -123,6 +123,7 @@ public class ContainerClassesFilter implements Filter {
excluded.add("org.cryptacular");
excluded.add("org.eclipse.jdt.core");
excluded.add("org.eclipse.jdt.internal");
+ excluded.add("org.ehcache");
excluded.add("org.fusesource.hawtbuf");
excluded.add("org.hamcrest");
excluded.add("org.hsqldb");
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
index 3dc2291711..aba85e7cbe 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
@@ -199,6 +199,7 @@ public class JuliLogStreamFactory implements LogStreamFactory {
|| (name.startsWith("org.apache.") && !name.startsWith("org.apache.geronimo.connector.work.WorkerContext."))
|| name.startsWith("openjpa.")
|| name.startsWith("net.sf.ehcache.")
+ || name.startsWith("org.ehcache.")
|| name.startsWith("org.quartz.")
|| name.startsWith("org.hibernate.");
}
diff --git a/pom.xml b/pom.xml
index 5da2b72286..e4aadb0f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
<tomcat.version>9.0.64</tomcat.version>
<cxf.version>3.4.5</cxf.version>
- <ehcache.version>2.10.3</ehcache.version>
+ <ehcache.version>2.10.6</ehcache.version>
<!-- used by cxf for security (replay attack) -->
<jetty.version>7.6.9.v20130131</jetty.version>
<pax-url.version>1.3.5</pax-url.version>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 344c38f7f6..7317aac567 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -86,6 +86,10 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.ehcache</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
@@ -124,6 +128,10 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.ehcache</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -237,7 +245,7 @@
</exclusion>
<exclusion>
<groupId>org.ehcache</groupId>
- <artifactId>ehcache</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.cxf</groupId>