You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2011/02/22 09:14:32 UTC
svn commit: r1073245 - in /servicemix/smx3/trunk: ./
distributions/apache-servicemix/
distributions/apache-servicemix/src/main/assembly/
platforms/geronimo/servicemix/ samples/basic/ samples/servicemix-web/
Author: jbonofre
Date: Tue Feb 22 08:14:32 2011
New Revision: 1073245
URL: http://svn.apache.org/viewvc?rev=1073245&view=rev
Log:
Remove "old" servicemix-components module dependency.
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/samples/basic/pom.xml
servicemix/smx3/trunk/samples/servicemix-web/pom.xml
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=1073245&r1=1073244&r2=1073245&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Tue Feb 22 08:14:32 2011
@@ -59,10 +59,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
</dependency>
<dependency>
@@ -166,10 +162,6 @@
<artifactId>servicemix-vfs</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>servicemix-web</artifactId>
<type>war</type>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml?rev=1073245&r1=1073244&r2=1073245&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml Tue Feb 22 08:14:32 2011
@@ -112,7 +112,6 @@
<dependencySet>
<outputDirectory>extras</outputDirectory>
<includes>
- <include>org.apache.servicemix:servicemix-components</include>
<include>org.apache.servicemix:servicemix-beanflow</include>
</includes>
</dependencySet>
@@ -190,30 +189,5 @@
<include>commons-collections:commons-collections</include>
</includes>
</dependencySet>
- <!--
- <dependencySet>
- <outputDirectory>lib/optional</outputDirectory>
- <includes>
- <include>quartz:quartz</include>
- <include>org.apache.servicemix:servicemix-components</include>
- <include>commons-pool:commons-pool</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-discovery:commons-discovery</include>
- <include>xmlbeans:xmlpublic</include>
- <include>lingo:lingo</include>
- <include>jaxen:jaxen</include>
- <include>org.mortbay.jetty:jetty</include>
- <include>org.mortbay.jetty:jetty-util</include>
- <include>drools:drools-all-jdk1.4</include>
- <include>stax-utils:stax-utils</include>
- <include>junit:junit</include>
- <include>commons-vfs:commons-vfs</include>
- <include>rome:rome</include>
- <include>axis:axis</include>
- <include>axis:axis-jaxrpc</include>
- <include>axis:axis-saaj</include>
- </includes>
- </dependencySet>
- -->
</dependencySets>
</assembly>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml?rev=1073245&r1=1073244&r2=1073245&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml Tue Feb 22 08:14:32 2011
@@ -104,7 +104,6 @@
<dependencySet>
<outputDirectory>extras</outputDirectory>
<includes>
- <include>org.apache.servicemix:servicemix-components</include>
<include>org.apache.servicemix:servicemix-beanflow</include>
</includes>
</dependencySet>
@@ -182,30 +181,5 @@
<include>commons-collections:commons-collections</include>
</includes>
</dependencySet>
- <!--
- <dependencySet>
- <outputDirectory>lib/optional</outputDirectory>
- <includes>
- <include>quartz:quartz</include>
- <include>org.apache.servicemix:servicemix-components</include>
- <include>commons-pool:commons-pool</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-discovery:commons-discovery</include>
- <include>xmlbeans:xmlpublic</include>
- <include>lingo:lingo</include>
- <include>jaxen:jaxen</include>
- <include>org.mortbay.jetty:jetty</include>
- <include>org.mortbay.jetty:jetty-util</include>
- <include>drools:drools-all-jdk1.4</include>
- <include>stax-utils:stax-utils</include>
- <include>junit:junit</include>
- <include>commons-vfs:commons-vfs</include>
- <include>rome:rome</include>
- <include>axis:axis</include>
- <include>axis:axis-jaxrpc</include>
- <include>axis:axis-saaj</include>
- </includes>
- </dependencySet>
- -->
</dependencySets>
</assembly>
Modified: servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml?rev=1073245&r1=1073244&r2=1073245&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml Tue Feb 22 08:14:32 2011
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>servicemix-service</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -100,12 +100,6 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=1073245&r1=1073244&r2=1073245&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Tue Feb 22 08:14:32 2011
@@ -464,11 +464,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>deployer-service</artifactId>
<version>${project.version}</version>
Modified: servicemix/smx3/trunk/samples/basic/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/basic/pom.xml?rev=1073245&r1=1073244&r2=1073245&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/basic/pom.xml (original)
+++ servicemix/smx3/trunk/samples/basic/pom.xml Tue Feb 22 08:14:32 2011
@@ -56,10 +56,6 @@
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jms</artifactId>
</dependency>
<dependency>
Modified: servicemix/smx3/trunk/samples/servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/servicemix-web/pom.xml?rev=1073245&r1=1073244&r2=1073245&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/servicemix-web/pom.xml (original)
+++ servicemix/smx3/trunk/samples/servicemix-web/pom.xml Tue Feb 22 08:14:32 2011
@@ -61,10 +61,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-http</artifactId>
</dependency>
<dependency>