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

ffang pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new 9bf2460  [CXF-7705]Use Java EL api and impl bundle from Servicemix for 
cxf-bean-validation feature
9bf2460 is described below

commit 9bf2460815a7d46070e804c707d7be37c0c847a9
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Thu Apr 12 15:07:45 2018 +0800

    [CXF-7705]Use Java EL api and impl bundle from Servicemix for 
cxf-bean-validation feature
    
    (cherry picked from commit e1089d4a286ff12186dce6412b48639d73409074)
---
 osgi/karaf/features/src/main/resources/features.xml | 4 ++--
 parent/pom.xml                                      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 166b470..5af8e7e 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -484,8 +484,8 @@
 
     <feature name="cxf-bean-validation" version="${project.version}" 
resolver="(obr)">
         <feature 
version="${project.version}">cxf-bean-validation-core</feature>
-        <bundle start-level="30" 
dependency="true">mvn:javax.el/javax.el-api/${cxf.javax.el.version}</bundle> 
-        <bundle start-level="30" 
dependency="true">mvn:org.glassfish/javax.el/${cxf.javax.el.version}</bundle> 
+        <bundle start-level="30" 
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javax-el-api-3.0.0/${cxf.servicemix.javax.el.version}</bundle>
 
+        <bundle start-level="30" 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-el-impl/${cxf.servicemix.javax.el.version}</bundle>
     </feature>
 
     <feature name="cxf-management-web" version="${project.version}" 
resolver="(obr)">
diff --git a/parent/pom.xml b/parent/pom.xml
index 45fc3fd..4c71d39 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,6 +181,7 @@
         <cxf.glassfish.json.version>1.0.4</cxf.glassfish.json.version>
         <cxf.johnzon.version>1.0.0</cxf.johnzon.version>
         <cxf.javax.el.version>3.0.0</cxf.javax.el.version>
+        
<cxf.servicemix.javax.el.version>3.0.0_1</cxf.servicemix.javax.el.version>
         <!-- various OSGi related versions -->
         <cxf.aries.version>1.0.0</cxf.aries.version>
         <cxf.aries.parser.version>1.3.1</cxf.aries.parser.version> 

-- 
To stop receiving notification emails like this one, please contact
ff...@apache.org.

Reply via email to