Author: ffang
Date: Fri May 25 02:41:44 2012
New Revision: 1342491
URL: http://svn.apache.org/viewvc?rev=1342491&view=rev
Log:
[CXF-4340]Modify Aries version to [0.3,2) at Import-Package
Modified:
cxf/trunk/osgi/bundle/all/pom.xml
cxf/trunk/osgi/bundle/compatible/pom.xml
cxf/trunk/osgi/bundle/jaxrs/pom.xml
cxf/trunk/osgi/bundle/minimal/pom.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/coloc/pom.xml
cxf/trunk/rt/bindings/object/pom.xml
cxf/trunk/rt/bindings/soap/pom.xml
cxf/trunk/rt/core/pom.xml
cxf/trunk/rt/features/clustering/pom.xml
cxf/trunk/rt/frontend/jaxrs/pom.xml
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/rt/frontend/simple/pom.xml
cxf/trunk/rt/transports/http-jetty/pom.xml
cxf/trunk/rt/transports/http/pom.xml
cxf/trunk/rt/ws/addr/pom.xml
cxf/trunk/rt/ws/policy/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
Modified: cxf/trunk/osgi/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/all/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/all/pom.xml (original)
+++ cxf/trunk/osgi/bundle/all/pom.xml Fri May 25 02:41:44 2012
@@ -367,7 +367,7 @@
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
net.oauth*;resolution:=optional,
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
-
org.apache.aries*;resolution:=optional;version="[0.2,2)",
+
org.apache.aries*;resolution:=optional;version="${cxf.aries.version.range}",
org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
org.apache.commons.codec*;resolution:=optional,
org.apache.commons.logging*;resolution:=optional,
Modified: cxf/trunk/osgi/bundle/compatible/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/compatible/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/compatible/pom.xml (original)
+++ cxf/trunk/osgi/bundle/compatible/pom.xml Fri May 25 02:41:44 2012
@@ -226,7 +226,7 @@
junit.framework*;resolution:=optional,
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
-
org.apache.aries*;resolution:=optional;version="[0.2,2)",
+
org.apache.aries*;resolution:=optional;version="${cxf.aries.version.range}",
org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
org.apache.commons.codec*;resolution:=optional,
org.apache.commons.pool*;resolution:=optional,
Modified: cxf/trunk/osgi/bundle/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/jaxrs/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/osgi/bundle/jaxrs/pom.xml Fri May 25 02:41:44 2012
@@ -147,7 +147,7 @@
junit.framework*;resolution:=optional,
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
-
org.apache.aries*;resolution:=optional;version="[0.2,2)",
+
org.apache.aries*;resolution:=optional;version="${cxf.aries.version.range}",
org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
org.apache.commons.codec*;resolution:=optional,
org.apache.commons.pool*;resolution:=optional,
Modified: cxf/trunk/osgi/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/minimal/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/minimal/pom.xml (original)
+++ cxf/trunk/osgi/bundle/minimal/pom.xml Fri May 25 02:41:44 2012
@@ -197,7 +197,7 @@
junit.framework*;resolution:=optional,
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
-
org.apache.aries*;resolution:=optional;version="[0.2,2)",
+
org.apache.aries*;resolution:=optional;version="${cxf.aries.version.range}",
org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
org.apache.commons.codec*;resolution:=optional,
org.apache.commons.pool*;resolution:=optional,
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri May 25 02:41:44 2012
@@ -161,6 +161,7 @@
<!-- various OSGi related versions -->
<cxf.aries.version>0.3.1</cxf.aries.version>
+ <cxf.aries.version.range>[0.3,2)</cxf.aries.version.range>
<cxf.osgi.version>4.2.0</cxf.osgi.version>
<cxf.karaf.version>2.2.6</cxf.karaf.version>
Modified: cxf/trunk/rt/bindings/coloc/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/pom.xml (original)
+++ cxf/trunk/rt/bindings/coloc/pom.xml Fri May 25 02:41:44 2012
@@ -32,6 +32,13 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: cxf/trunk/rt/bindings/object/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/pom.xml (original)
+++ cxf/trunk/rt/bindings/object/pom.xml Fri May 25 02:41:44 2012
@@ -31,6 +31,12 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Fri May 25 02:41:44 2012
@@ -31,6 +31,12 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: cxf/trunk/rt/core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/core/pom.xml (original)
+++ cxf/trunk/rt/core/pom.xml Fri May 25 02:41:44 2012
@@ -42,7 +42,8 @@
javax.mail;version="${cxf.osgi.javax.mail.version}",
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.xml.stream*;version="${cxf.osgi.javax.stream.version}",
+ org.apache.aries*;version="${cxf.aries.version.range}"
</cxf.osgi.import>
<cxf.osgi.export>
META-INF.cxf, *
Modified: cxf/trunk/rt/features/clustering/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/features/clustering/pom.xml (original)
+++ cxf/trunk/rt/features/clustering/pom.xml Fri May 25 02:41:44 2012
@@ -33,6 +33,13 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
+
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Fri May 25 02:41:44 2012
@@ -36,6 +36,7 @@
<properties>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ org.apache.aries*;version="${cxf.aries.version.range}"
</cxf.osgi.import>
</properties>
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Fri May 25 02:41:44 2012
@@ -37,6 +37,7 @@
<cxf.spi-dir>spi-2.1</cxf.spi-dir>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ org.apache.aries*;version="${cxf.aries.version.range}"
</cxf.osgi.import>
</properties>
<dependencies>
Modified: cxf/trunk/rt/frontend/simple/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/pom.xml (original)
+++ cxf/trunk/rt/frontend/simple/pom.xml Fri May 25 02:41:44 2012
@@ -33,6 +33,11 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Fri May 25 02:41:44 2012
@@ -37,6 +37,7 @@
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.eclipse.jetty*;version="${cxf.jetty.osgi.version}",
+ org.apache.aries*;version="${cxf.aries.version.range}"
</cxf.osgi.import>
<cxf.osgi.dynamic.import>
org.eclipse.jetty.jmx
Modified: cxf/trunk/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Fri May 25 02:41:44 2012
@@ -36,6 +36,7 @@
<cxf.bundle.activator>org.apache.cxf.transport.http.osgi.HTTPTransportActivator</cxf.bundle.activator>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ org.apache.aries*;version="${cxf.aries.version.range}"
</cxf.osgi.import>
<cxf.osgi.export>
'=META-INF.cxf.osgi',
Modified: cxf/trunk/rt/ws/addr/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/pom.xml (original)
+++ cxf/trunk/rt/ws/addr/pom.xml Fri May 25 02:41:44 2012
@@ -32,6 +32,11 @@
</parent>
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
<dependencies>
<dependency>
Modified: cxf/trunk/rt/ws/policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Fri May 25 02:41:44 2012
@@ -30,6 +30,12 @@
<version>2.6.1-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
<dependencies>
<dependency>
Modified: cxf/trunk/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=1342491&r1=1342490&r2=1342491&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Fri May 25 02:41:44 2012
@@ -31,6 +31,12 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
+ <properties>
+ <cxf.osgi.import>
+ org.apache.aries*;version="${cxf.aries.version.range}"
+ </cxf.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
