[cxf] branch master updated: Update Ehcache to 3.9.0 (#743)

[bu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 3a05ddf  Update Ehcache to 3.9.0 (#743)
3a05ddf is described below

commit 3a05ddf21ef1e76c8b7b440213ff1afbf7757fbf
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Jan 25 14:51:33 2021 +0000

    Update Ehcache to 3.9.0 (#743)
---
 osgi/karaf/features/src/main/resources/features.xml         | 2 +-
 parent/pom.xml                                              | 2 +-
 services/xkms/xkms-features/src/main/resources/features.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 506c7e0..e811e5e 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -138,7 +138,7 @@
         <feature version="${project.version}">cxf-ws-policy</feature>
         <feature version="${project.version}">cxf-ws-addr</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
-        <bundle start-level="40" dependency="true">wrap:mvn:org.ehcache/ehcache/${cxf.ehcache3.version}$overwrite=merge&amp;Import-Package=javax.xml.bind*,*;resolution:=optional</bundle>
+        <bundle start-level="40" dependency="true">mvn:org.ehcache/ehcache/${cxf.ehcache3.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
     </feature>
     <feature name="cxf-rt-security" version="${project.version}">
diff --git a/parent/pom.xml b/parent/pom.xml
index 0335721..eba1c68 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,7 +104,7 @@
         <cxf.dom4j.version>2.1.3</cxf.dom4j.version>
         <cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
         <cxf.dropwizard4.version>4.1.17</cxf.dropwizard4.version>
-        <cxf.ehcache3.version>3.8.1</cxf.ehcache3.version>
+        <cxf.ehcache3.version>3.9.0</cxf.ehcache3.version>
         <cxf.el-api.version>3.0.3</cxf.el-api.version>
         <cxf.findbugs.version>3.0.2</cxf.findbugs.version>
         <cxf.geronimo.inject.version>1.1</cxf.geronimo.inject.version>
diff --git a/services/xkms/xkms-features/src/main/resources/features.xml b/services/xkms/xkms-features/src/main/resources/features.xml
index 481e1fd..6808f37 100644
--- a/services/xkms/xkms-features/src/main/resources/features.xml
+++ b/services/xkms/xkms-features/src/main/resources/features.xml
@@ -24,7 +24,7 @@
         <feature>cxf-jaxws</feature>
         <feature>cxf-http</feature>
         <feature>cxf-ws-security</feature>
-        <bundle start-level="40" dependency="true">wrap:mvn:org.ehcache/ehcache/${cxf.ehcache3.version}$overwrite=merge&amp;Import-Package=javax.xml.bind*,*;resolution:=optional</bundle>
+        <bundle start-level="40" dependency="true">mvn:org.ehcache/ehcache/${cxf.ehcache3.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-common/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-client/${project.version}</bundle>
         <configfile finalname="/etc/org.apache.cxf.xkms.client.cfg">