Return-Path: <commits-return-45405-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id D5227200C30
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  7 Mar 2017 21:03:06 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id D3E8F160B65; Tue,  7 Mar 2017 20:03:06 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id B9E14160B8E
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  7 Mar 2017 21:03:05 +0100 (CET)
Received: (qmail 40720 invoked by uid 500); 7 Mar 2017 20:03:04 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 40021 invoked by uid 99); 7 Mar 2017 20:03:04 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Mar 2017 20:03:04 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 25F6FF217E; Tue,  7 Mar 2017 20:03:04 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dkulp@apache.org
To: commits@cxf.apache.org
Date: Tue, 07 Mar 2017 20:03:14 -0000
Message-Id: <1c74dce5f6fd4b5bbda303590afdc6a4@git.apache.org>
In-Reply-To: <26721b3c5c4149919f8fe9820bbb1771@git.apache.org>
References: <26721b3c5c4149919f8fe9820bbb1771@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [12/15] cxf git commit: Use the right property with the OSGi
 formatted version string
archived-at: Tue, 07 Mar 2017 20:03:07 -0000

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 <dkulp@apache.org>
Authored: Tue Mar 7 10:17:33 2017 -0500
Committer: Daniel Kulp <dkulp@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>