servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r601246 - in /servicemix/branches/servicemix-4.0/bundles: acegi/ ant/ aopalliance/ asm/ cglib/ cxf/ httpcore/ jaxb-api/ jaxb-impl/ jaxws-api/ openejb/ openjpa/ wsdl4j/ xstream/
Date Wed, 05 Dec 2007 08:42:27 GMT
Author: gnodet
Date: Wed Dec  5 00:42:25 2007
New Revision: 601246

URL: http://svn.apache.org/viewvc?rev=601246&view=rev
Log:
Use otpional dependencies instead of provided, in preparation for 1.1.0 maven bundle plugin

Modified:
    servicemix/branches/servicemix-4.0/bundles/acegi/pom.xml
    servicemix/branches/servicemix-4.0/bundles/ant/pom.xml
    servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml
    servicemix/branches/servicemix-4.0/bundles/asm/pom.xml
    servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml
    servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml
    servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml
    servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml
    servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml
    servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml
    servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml
    servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml
    servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml
    servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml

Modified: servicemix/branches/servicemix-4.0/bundles/acegi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/acegi/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/acegi/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/acegi/pom.xml Wed Dec  5 00:42:25 2007
@@ -49,16 +49,19 @@
             <groupId>org.acegisecurity</groupId>
             <artifactId>acegi-security</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.acegisecurity</groupId>
             <artifactId>acegi-security-cas</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.acegisecurity</groupId>
             <artifactId>acegi-security-tiger</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/ant/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/ant/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/ant/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/ant/pom.xml Wed Dec  5 00:42:25 2007
@@ -42,26 +42,16 @@
         <pkgVersion>1.7.0</pkgVersion>
         <pomVersion>4.0-SNAPSHOT</pomVersion>
 
-    <servicemix.osgi.export.pkg>org.apache.tools</servicemix.osgi.export.pkg>
-<!--
+        <servicemix.osgi.export.pkg>org.apache.tools</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            com.ibm*;resolution:=optional,
-            com.sun*;resolution:=optional,
-            junit.framework*;resolution:=optional,
-            org.apache.commons.lang*;resolution:=optional,
-            org.apache.log4j*;resolution:=optional,
-            org.apache.neethi*;resolution:=optional,
-            org.apache.tools.ant*;resolution:=optional,
-            org.apache.velocity*;resolution:=optional,
-            org.apache.ws.commons.schema*;resolution:=optional,
-            org.apache.xml.resolver*;resolution:=optional,
-            org.junit*;resolution:=optional,
-            org.mortbay*;resolution:=optional,
-            org.springframework*;resolution:=optional,
-            org.xmlsoap.schemas.wsdl.http*;resolution:=optional,
+            com.sun.tools.javac*;resolution:=optional,
+            org.apache.env*;resolution:=optional,
+            org.apache.tools.ant.taskdefs.optional*;resolution:=optional,
+            org.apache.tools.ant.util.java15*;resolution:=optional,
+            sun.rmi*;resolution:=optional,
+            sun.tools.javac*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
--->
     </properties>
 
     <repositories>
@@ -76,11 +66,13 @@
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant-launcher</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/aopalliance/pom.xml Wed Dec  5 00:42:25 2007
@@ -48,6 +48,7 @@
             <groupId>aopalliance</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/asm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/asm/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/asm/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/asm/pom.xml Wed Dec  5 00:42:25 2007
@@ -48,6 +48,7 @@
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/cglib/pom.xml Wed Dec  5 00:42:25 2007
@@ -57,6 +57,7 @@
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml Wed Dec  5 00:42:25 2007
@@ -79,19 +79,19 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-bundle</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
             <version>1.2</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
             <version>2.0.2</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <!-- Dependency on other bundles -->

Modified: servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/httpcore/pom.xml Wed Dec  5 00:42:25 2007
@@ -49,16 +49,19 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>${pkgArtifactId}-nio</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>${pkgArtifactId}-niossl</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml Wed Dec  5 00:42:25 2007
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>

Modified: servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml Wed Dec  5 00:42:25 2007
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>

Modified: servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml Wed Dec  5 00:42:25 2007
@@ -53,7 +53,7 @@
             <groupId>javax.xml.ws</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
             <exclusions>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>

Modified: servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml Wed Dec  5 00:42:25 2007
@@ -69,67 +69,67 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-client</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-javaagent</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-jee</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-loader</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-cxf</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-http</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-server</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-ejbd</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-webservices</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.codehaus.swizzle</groupId>
             <artifactId>swizzle-stream</artifactId>
             <version>1.0.1</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml Wed Dec  5 00:42:25 2007
@@ -62,43 +62,43 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc-5</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel-5</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>

Modified: servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml Wed Dec  5 00:42:25 2007
@@ -50,7 +50,7 @@
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml?rev=601246&r1=601245&r2=601246&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml Wed Dec  5 00:42:25 2007
@@ -63,7 +63,7 @@
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 



Mime
View raw message