cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject cxf git commit: cxf-6705: Fix versions used to import javax.validation packages.
Date Fri, 11 Dec 2015 14:06:11 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 0dfe3a614 -> 358589c33


cxf-6705: Fix versions used to import javax.validation packages.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/358589c3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/358589c3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/358589c3

Branch: refs/heads/3.1.x-fixes
Commit: 358589c33f44d747f5a924f0b1cdedfcb7018a22
Parents: 0dfe3a6
Author: Benson Margulies <benson@basistech.com>
Authored: Fri Dec 11 09:02:36 2015 -0500
Committer: Benson Margulies <benson@basistech.com>
Committed: Fri Dec 11 09:06:00 2015 -0500

----------------------------------------------------------------------
 core/pom.xml   | 2 +-
 parent/pom.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/358589c3/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3cebe9f..8bc295e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -56,7 +56,7 @@
             javax.annotation;version="${cxf.osgi.javax.annotation.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
             javax.xml.stream*;version="${cxf.osgi.javax.stream.version}",
-            javax.validation*;resolution:=optional;version="${cxf.validation.api.version}",

+            javax.validation*;resolution:=optional;version="${cxf.validation.api.package.version}",

             com.sun.xml.bind.api;resolution:=optional,
             com.sun.xml.bind.api.impl;resolution:=optional,
             com.sun.xml.internal.bind.api;resolution:=optional,

http://git-wip-us.apache.org/repos/asf/cxf/blob/358589c3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8ca9fdb..7e62766 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,6 +156,9 @@
         <cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>
         <cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
         <cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version>
+        <!-- the Export-Package is not the same as the Maven artifact
+             version -->
+        <cxf.validation.api.package.version>1.0.0</cxf.validation.api.package.version>
         <cxf.cdi.api.version>1.1</cxf.cdi.api.version>
         <cxf.json.api.version>1.0</cxf.json.api.version>
         <cxf.jboss.weld.version>2.1.2.Final</cxf.jboss.weld.version>


Mime
View raw message