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 2012/03/14 14:43:23 UTC
svn commit: r1300542 - in /cxf/branches/2.5.x-fixes: ./
osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml
osgi/bundle/minimal/pom.xml parent/pom.xml
Author: dkulp
Date: Wed Mar 14 13:43:23 2012
New Revision: 1300542
URL: http://svn.apache.org/viewvc?rev=1300542&view=rev
Log:
Merged revisions 1300541 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1300541 | dkulp | 2012-03-14 09:40:10 -0400 (Wed, 14 Mar 2012) | 1 line
Widen the range of Jetty versions that can be used with CXF
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml
cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml
cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml
cxf/branches/2.5.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 14 13:43:23 2012
@@ -1 +1 @@
-/cxf/trunk:1236902,1297296,1298470,1298601-1298624,1298830,1298832,1299086,1299635,1299682,1299707,1299747,1299900-1300084,1300342,1300509,1300518,1300523,1300530
+/cxf/trunk:1236902,1297296,1298470,1298601-1298624,1298830,1298832,1299086,1299635,1299682,1299707,1299747,1299900-1300084,1300342,1300509,1300518,1300523,1300530,1300541
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml?rev=1300542&r1=1300541&r2=1300542&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml Wed Mar 14 13:43:23 2012
@@ -351,7 +351,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/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1300542&r1=1300541&r2=1300542&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml Wed Mar 14 13:43:23 2012
@@ -152,7 +152,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,5)";resolution:=optional,
org.osgi.service.blueprint*;resolution:=optional,
Modified: cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml?rev=1300542&r1=1300541&r2=1300542&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml Wed Mar 14 13:43:23 2012
@@ -202,7 +202,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,5)";resolution:=optional,
org.osgi.service.blueprint*;resolution:=optional,
Modified: cxf/branches/2.5.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1300542&r1=1300541&r2=1300542&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/parent/pom.xml Wed Mar 14 13:43:23 2012
@@ -77,7 +77,8 @@
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jetty.version>7.5.4.v20111024</cxf.jetty.version>
- <cxf.maven.core.version>2.2.1</cxf.maven.core.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>
<cxf.saaj.version>1.3.4</cxf.saaj.version>