This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 14fb45bd86d7595530b64ca334b01142e4f1ed38 Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Tue Apr 5 16:00:08 2022 +0200 Exclude ehcache old version to use the latest jakarta compatible one --- pom.xml | 6 +++--- server/openejb-cxf/pom.xml | 12 ++++++++++-- utils/openejb-core-hibernate/pom.xml | 8 ++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 75b7efdc65..c417996105 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ <tomcat.version>10.0.20</tomcat.version> <cxf.version>3.5.0</cxf.version> - <ehcache.version>2.10.3</ehcache.version> + <ehcache.version>3.10.0</ehcache.version> <wss4j.version>2.4.0</wss4j.version> <!-- used by cxf for security (replay attack) --> <jetty.version>11.0.8</jetty.version> @@ -1868,8 +1868,8 @@ <version>1.4.7</version> </dependency> <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> + <groupId>org.ehcache</groupId> + <artifactId>ehcache</artifactId> <version>${ehcache.version}</version> </dependency> <dependency> diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 68c7abf481..71cee42a87 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -84,7 +84,11 @@ </exclusion> <exclusion> <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.ehcache</groupId> + <artifactId>*</artifactId> </exclusion> <exclusion> <artifactId>guava</artifactId> @@ -122,7 +126,11 @@ <exclusions> <exclusion> <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.ehcache</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml index 9b743f4bc9..e0d01b6dd7 100644 --- a/utils/openejb-core-hibernate/pom.xml +++ b/utils/openejb-core-hibernate/pom.xml @@ -92,12 +92,16 @@ </exclusion> <exclusion> <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.ehcache</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>net.sf.ehcache</groupId> + <groupId>org.ehcache</groupId> <artifactId>ehcache</artifactId> <version>${ehcache.version}</version> </dependency>
