Author: dkulp
Date: Wed Mar 14 13:40:10 2012
New Revision: 1300541
URL: http://svn.apache.org/viewvc?rev=1300541&view=rev
Log:
Widen the range of Jetty versions that can be used with CXF
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/transports/http-jetty/pom.xml
Modified: cxf/trunk/osgi/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/all/pom.xml?rev=1300541&r1=1300540&r2=1300541&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/all/pom.xml (original)
+++ cxf/trunk/osgi/bundle/all/pom.xml Wed Mar 14 13:40:10 2012
@@ -341,7 +341,7 @@
org.codehaus.jra*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
org.eclipse.emf*;resolution:=optional,
-
org.eclipse.jetty*;resolution:=optional;version="[7.2,8)",
+
org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.jibx*;resolution:=optional;version="[1.2.3,2)",
Modified: cxf/trunk/osgi/bundle/compatible/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/compatible/pom.xml?rev=1300541&r1=1300540&r2=1300541&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/compatible/pom.xml (original)
+++ cxf/trunk/osgi/bundle/compatible/pom.xml Wed Mar 14 13:40:10 2012
@@ -235,7 +235,7 @@
org.codehaus.jra*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
org.eclipse.emf*;resolution:=optional,
-
org.eclipse.jetty*;resolution:=optional;version="[7.2,8)",
+
org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.jibx*;resolution:=optional;version="[1.2.3,2)",
Modified: cxf/trunk/osgi/bundle/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/jaxrs/pom.xml?rev=1300541&r1=1300540&r2=1300541&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/osgi/bundle/jaxrs/pom.xml Wed Mar 14 13:40:10 2012
@@ -146,7 +146,7 @@
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
-
org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
+
org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",
org.mozilla.javascript*;resolution:=optional,
org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
org.osgi.service.blueprint*;resolution:=optional,
Modified: cxf/trunk/osgi/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/minimal/pom.xml?rev=1300541&r1=1300540&r2=1300541&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/minimal/pom.xml (original)
+++ cxf/trunk/osgi/bundle/minimal/pom.xml Wed Mar 14 13:40:10 2012
@@ -197,7 +197,7 @@
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
-
org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
+
org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",
org.mozilla.javascript*;resolution:=optional,
org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
org.osgi.service.blueprint*;resolution:=optional,
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1300541&r1=1300540&r2=1300541&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Mar 14 13:40:10 2012
@@ -96,6 +96,7 @@
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jetty.version>7.5.4.v20111024</cxf.jetty.version>
+ <cxf.jetty.osgi.version>[7.2,8.2)</cxf.jetty.osgi.version>
<cxf.maven.core.version>2.2.1</cxf.maven.core.version>
<cxf.msv.version>2011.1</cxf.msv.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1300541&r1=1300540&r2=1300541&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Wed Mar 14 13:40:10 2012
@@ -35,6 +35,7 @@
<properties>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ org.eclipse.jetty*;version="${cxf.jetty.osgi.version}",
</cxf.osgi.import>
<cxf.osgi.dynamic.import>
org.eclipse.jetty.jmx
