Author: dkulp
Date: Thu Jun 23 15:47:43 2011
New Revision: 1138946
URL: http://svn.apache.org/viewvc?rev=1138946&view=rev
Log:
Merged revisions 1138097 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1138097 | dkulp | 2011-06-21 13:11:53 -0400 (Tue, 21 Jun 2011) | 1 line
Mark blueprint optional in the all and minimal bundles
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 23 15:47:43 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1137964,1138220,1138644,1138913,1138919
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1137964,1138097,1138220,1138644,1138913,1138919
Modified: cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml?rev=1138946&r1=1138945&r2=1138946&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml Thu Jun 23
15:47:43 2011
@@ -354,6 +354,7 @@
org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
org.omg*;resolution:=optional,
org.opensaml*;resolution:=optional,
+ org.osgi.service.blueprint*;resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
javax.activation;version="[0.0,2)",
Modified: cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml?rev=1138946&r1=1138945&r2=1138946&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml Thu Jun 23
15:47:43 2011
@@ -204,6 +204,7 @@
org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
org.mozilla.javascript*;resolution:=optional,
org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
+ org.osgi.service.blueprint*;resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
javax.activation;version="[0.0,2)",
