cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1494467 - in /cxf/branches/2.7.x-fixes: ./ rt/bindings/coloc/ rt/bindings/object/ rt/bindings/soap/ rt/core/ rt/frontend/jaxrs/ rt/frontend/jaxws/ rt/frontend/simple/ rt/transports/http-jetty/ rt/transports/http/ rt/ws/addr/ rt/ws/policy/ ...
Date Wed, 19 Jun 2013 06:10:51 GMT
Author: ffang
Date: Wed Jun 19 06:10:50 2013
New Revision: 1494467

URL: http://svn.apache.org/r1494467
Log:
Merged revisions 1494465 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1494465 | ffang | 2013-06-19 13:56:03 +0800 (δΈ‰, 19  6 2013) | 1 line
  
  [CXF-5082]make aries.blueprint dependency as optional
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/bindings/coloc/pom.xml
    cxf/branches/2.7.x-fixes/rt/bindings/object/pom.xml
    cxf/branches/2.7.x-fixes/rt/bindings/soap/pom.xml
    cxf/branches/2.7.x-fixes/rt/core/pom.xml
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.7.x-fixes/rt/frontend/jaxws/pom.xml
    cxf/branches/2.7.x-fixes/rt/frontend/simple/pom.xml
    cxf/branches/2.7.x-fixes/rt/transports/http-jetty/pom.xml
    cxf/branches/2.7.x-fixes/rt/transports/http/pom.xml
    cxf/branches/2.7.x-fixes/rt/ws/addr/pom.xml
    cxf/branches/2.7.x-fixes/rt/ws/policy/pom.xml
    cxf/branches/2.7.x-fixes/rt/ws/rm/pom.xml
    cxf/branches/2.7.x-fixes/services/wsn/wsn-core/pom.xml

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1494465

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/coloc/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/coloc/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/coloc/pom.xml Wed Jun 19 06:10:50 2013
@@ -44,6 +44,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/bindings/object/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/object/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/object/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/object/pom.xml Wed Jun 19 06:10:50 2013
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/soap/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/soap/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/soap/pom.xml Wed Jun 19 06:10:50 2013
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/core/pom.xml Wed Jun 19 06:10:50 2013
@@ -57,6 +57,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/pom.xml Wed Jun 19 06:10:50 2013
@@ -47,6 +47,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/pom.xml Wed Jun 19 06:10:50 2013
@@ -47,6 +47,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/simple/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/simple/pom.xml Wed Jun 19 06:10:50 2013
@@ -58,6 +58,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-jetty/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-jetty/pom.xml Wed Jun 19 06:10:50 2013
@@ -49,6 +49,7 @@
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/pom.xml Wed Jun 19 06:10:50 2013
@@ -98,6 +98,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: cxf/branches/2.7.x-fixes/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/addr/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/addr/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/ws/addr/pom.xml Wed Jun 19 06:10:50 2013
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/policy/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/ws/policy/pom.xml Wed Jun 19 06:10:50 2013
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/rm/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/rm/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/ws/rm/pom.xml Wed Jun 19 06:10:50 2013
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: cxf/branches/2.7.x-fixes/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/wsn/wsn-core/pom.xml?rev=1494467&r1=1494466&r2=1494467&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/wsn/wsn-core/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/services/wsn/wsn-core/pom.xml Wed Jun 19 06:10:50 2013
@@ -55,6 +55,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>



Mime
View raw message