You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/03/07 20:03:14 UTC

[12/15] cxf git commit: Use the right property with the OSGi formatted version string

Use the right property with the OSGi formatted version string


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

Branch: refs/heads/3.1.x-fixes
Commit: 7b8145e65e9300931aea628251446e49f2e8bfe0
Parents: e81a5c9
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Mar 7 10:17:33 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 7 14:07:37 2017 -0500

----------------------------------------------------------------------
 services/wsn/wsn-api/pom.xml  | 8 ++++----
 services/wsn/wsn-core/pom.xml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7b8145e6/services/wsn/wsn-api/pom.xml
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 0e2b1c2..6c1a90d 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -90,10 +90,10 @@
                         <Export-Package>
                             org.oasis_open.docs.wsn.*;version=1.3;-noimport:=true,
                             org.oasis_open.docs.wsrf.*;version=1.2,
-                            org.apache.cxf.wsn.client;version=${project.version},
-                            org.apache.cxf.wsn.util;version=${project.version},
-                            org.apache.cxf.wsn.wsdl;version=${project.version},
-                            org.apache.cxf.wsn.jaxws;version=${project.version}
+                            org.apache.cxf.wsn.client;version=${cxf.osgi.version.clean},
+                            org.apache.cxf.wsn.util;version=${cxf.osgi.version.clean},
+                            org.apache.cxf.wsn.wsdl;version=${cxf.osgi.version.clean},
+                            org.apache.cxf.wsn.jaxws;version=${cxf.osgi.version.clean}
                         </Export-Package>
                         <_nouses>true</_nouses>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>

http://git-wip-us.apache.org/repos/asf/cxf/blob/7b8145e6/services/wsn/wsn-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 7056cc3..07a9ebe 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -157,7 +157,7 @@
                             org.apache.cxf.services.wsn.cxf-services-wsn-api
                         </Require-Bundle>
                         <Import-Package>
-                            org.apache.cxf.wsn.util.*;version=${project.version},
+                            org.apache.cxf.wsn.util.*;version=${cxf.osgi.version.clean},
                             !org.apache.cxf.wsn*,
                             javax.xml.bind*;version="[0.0,3)",
                             javax.jws*;version="[0.0,3)",
@@ -166,7 +166,7 @@
                             *
                         </Import-Package>
                         <Export-Package>
-                            org.apache.cxf.wsn.services;version=${project.version}
+                            org.apache.cxf.wsn.services;version=${cxf.osgi.version.clean}
                         </Export-Package>
                         <_nouses>true</_nouses>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>