servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r365879 - in /incubator/servicemix/trunk: ./ servicemix-components/ servicemix-core/ servicemix-http/ servicemix-jms/ servicemix-jsr181/ servicemix-lwcontainer/ servicemix-sca/ servicemix-wsn2005/
Date Wed, 04 Jan 2006 10:15:25 GMT
Author: gnodet
Date: Wed Jan  4 02:15:15 2006
New Revision: 365879

URL: http://svn.apache.org/viewcvs?rev=365879&view=rev
Log:
Clean dependencies to avoid having multiple copies of the same artifact (under different packaging)
and reduce the size of jbi installers.

Modified:
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/servicemix-components/pom.xml
    incubator/servicemix/trunk/servicemix-core/pom.xml
    incubator/servicemix/trunk/servicemix-http/pom.xml
    incubator/servicemix/trunk/servicemix-jms/pom.xml
    incubator/servicemix/trunk/servicemix-jsr181/pom.xml
    incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
    incubator/servicemix/trunk/servicemix-sca/pom.xml
    incubator/servicemix/trunk/servicemix-wsn2005/pom.xml

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Wed Jan  4 02:15:15 2006
@@ -552,13 +552,23 @@
       </dependency>
       <dependency>
         <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
+        <artifactId>commons-beanutils-core</artifactId>
         <version>1.7.0</version>
       </dependency>
       <dependency>
         <groupId>commons-betwixt</groupId>
         <artifactId>commons-betwixt</artifactId>
         <version>0.7</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xerces</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
@@ -578,7 +588,13 @@
       <dependency>
         <groupId>commons-digester</groupId>
         <artifactId>commons-digester</artifactId>
-        <version>1.7</version>
+        <version>1.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-discovery</groupId>
@@ -624,6 +640,12 @@
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <version>1.2</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xerces</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-primitives</groupId>
@@ -792,13 +814,8 @@
       </dependency>
       <dependency>
         <groupId>groovy</groupId>
-        <artifactId>groovy-1.0-jsr</artifactId>
-        <version>03</version>
-      </dependency>
-      <dependency>
-        <groupId>groovy</groupId>
-        <artifactId>groovy-all</artifactId>
-        <version>1.0-jsr-03</version>
+        <artifactId>groovy-all-1.0-jsr</artifactId>
+        <version>04</version>
       </dependency>
       <dependency>
         <groupId>howl</groupId>
@@ -814,6 +831,16 @@
         <groupId>httpunit</groupId>
         <artifactId>httpunit</artifactId>
         <version>1.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xerces</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>janino</groupId>
@@ -1015,6 +1042,22 @@
         <version>1.2.5</version>
       </dependency>
       <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>1.2.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-dao</artifactId>
+        <version>1.2.5</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
         <groupId>stax</groupId>
         <artifactId>stax-api</artifactId>
         <version>1.0</version>
@@ -1078,6 +1121,16 @@
         <groupId>org.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>springframework</groupId>
+            <artifactId>spring</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>

Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Wed Jan  4 02:15:15 2006
@@ -91,7 +91,7 @@
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
+      <artifactId>commons-beanutils-core</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -179,7 +179,7 @@
     </dependency>
     <dependency>
       <groupId>groovy</groupId>
-      <artifactId>groovy-all</artifactId>
+      <artifactId>groovy-all-1.0-jsr</artifactId>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
@@ -346,8 +346,8 @@
       <artifactId>xercesImpl</artifactId>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
     </dependency>
     <dependency>
       <groupId>servicemix</groupId>

Modified: incubator/servicemix/trunk/servicemix-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/pom.xml Wed Jan  4 02:15:15 2006
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <!-- $Rev$ $Date$ -->
-<model xsi:defaultSchemaLocation="http://maven.apache.org/maven-v4_0_0.xsd">
+	<model xsi:defaultSchemaLocation="http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -114,6 +114,15 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-dao</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>activecluster</groupId>
@@ -165,7 +174,7 @@
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
+            <artifactId>commons-beanutils-core</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -352,10 +361,10 @@
                         <exclude>**/ComponentAssemblyInstallationTest.*</exclude>
                         <exclude>**/DeploymentTest.*</exclude>
                         
-                        <!-- Succeed in Eclipse, but fail with maven, why ? -->
+                        <!-- Succeed in Eclipse, but fail with maven, why ? 
                         <exclude>**/AdminServiceTest.*</exclude>
                         <exclude>**/ManagementAttributesTest.*</exclude>
-                        <exclude>**/ManagementContextTest.*</exclude>
+                        <exclude>**/ManagementContextTest.*</exclude>-->
                     </excludes>
                 </configuration>
             </plugin>

Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Wed Jan  4 02:15:15 2006
@@ -99,7 +99,7 @@
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
+            <artifactId>commons-beanutils-core</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-pool</groupId>

Modified: incubator/servicemix/trunk/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/pom.xml Wed Jan  4 02:15:15 2006
@@ -100,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
+            <artifactId>commons-beanutils-core</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-pool</groupId>

Modified: incubator/servicemix/trunk/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/pom.xml Wed Jan  4 02:15:15 2006
@@ -36,23 +36,6 @@
     <description>JSR-181 service engine</description>
     <dependencies>
     
-        <!-- Check this dependency -->
-        <!-- dependency>
-            <groupId>servicemix</groupId>
-            <artifactId>maven-jbi-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
-            <type>plugin</type>
-            <classifier></classifier>
-            <scope></scope>
-            <systemPath></systemPath>
-            <exclusions>
-                <exclusion></exclusion>
-            </exclusions>
-            <optional></optional>
-        </dependency -->
-        
-        <!-- found in codehaus.org and should be in parent pom.xml -->
-             
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-common</artifactId>
@@ -99,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
+            <artifactId>spring-beans</artifactId>
         </dependency>
         <dependency>
             <groupId>woodstox</groupId>
@@ -127,64 +110,42 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jbi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-remote</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-components</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
         </dependency>
         <dependency>
-            <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jencks</groupId>
-            <artifactId>jencks-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
+            <artifactId>commons-beanutils-core</artifactId>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>annogen</groupId>
             <artifactId>annogen</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>qdox</groupId>
             <artifactId>qdox</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>beehive</groupId>

Modified: incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml Wed Jan  4 02:15:15 2006
@@ -49,18 +49,7 @@
             <artifactId>servicemix-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>servicemix</groupId>
             <artifactId>xfire-all</artifactId>
@@ -70,10 +59,6 @@
             <artifactId>xfire-jaxws</artifactId>
         </dependency>
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
         </dependency>
@@ -90,14 +75,6 @@
             <artifactId>xbean-kernel</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-        </dependency>
-        <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
         </dependency>
@@ -117,22 +94,6 @@
         <dependency>
             <groupId>xfire</groupId>
             <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
         </dependency>
         <dependency>
             <groupId>beehive</groupId>

Modified: incubator/servicemix/trunk/servicemix-sca/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/pom.xml Wed Jan  4 02:15:15 2006
@@ -124,6 +124,7 @@
         <dependency>
         	<groupId>org.apache.servicemix</groupId>
         	<artifactId>servicemix-core</artifactId>
+        	<scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/pom.xml?rev=365879&r1=365878&r2=365879&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/pom.xml Wed Jan  4 02:15:15 2006
@@ -36,84 +36,25 @@
     <description>WS-Notification Service Engine</description>
     <dependencies>
         
-        <!-- Check this dependency -->
-        <!--dependency>
-            <groupId>servicemix</groupId>
-            <artifactId>maven-jbi-plugin</artifactId>
-        </dependency-->
         <dependency>
-	        <groupId>org.apache.servicemix</groupId>
+	          <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-        </dependency>
-        <dependency>
-	        <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jbi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jms</artifactId>
-        </dependency>
-        <dependency>
-	        <groupId>org.apache.servicemix</groupId>
+	          <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-	        <groupId>org.apache.servicemix</groupId>
+	          <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-components</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq</artifactId>
         </dependency>
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jencks</groupId>
-            <artifactId>jencks-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
-
+        
     <dependency>
       <groupId>servicemix</groupId>
       <artifactId>jsr181-api</artifactId>
@@ -169,11 +110,24 @@
       <artifactId>sjsxp</artifactId>
       <version>20051215</version>
     </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxws-tools</artifactId>
-      <version>20051215</version>
-    </dependency>
+
+        <dependency>
+            <groupId>servicemix</groupId>
+            <artifactId>jaxws-tools</artifactId>
+            <version>20051215</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-activation</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
 
     </dependencies>
 



Mime
View raw message