Author: gnodet
Date: Fri Feb 6 15:17:58 2009
New Revision: 741590
URL: http://svn.apache.org/viewvc?rev=741590&view=rev
Log:
Use managed dependencies everywhere
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/itests/pom.xml
servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml
servicemix/smx4/kernel/trunk/main/pom.xml
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/kernel/trunk/testing/itests/pom.xml
servicemix/smx4/kernel/trunk/testing/support/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Fri Feb 6 15:17:58 2009
@@ -266,21 +266,18 @@
<artifactItem>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>org.apache.servicemix.kernel.main</artifactId>
- <version>${pom.version}</version>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>org.apache.servicemix.kernel.client</artifactId>
- <version>${pom.version}</version>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix-client.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.kernel.jaas</groupId>
<artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
- <version>${pom.version}</version>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix-jaas-boot.jar</destFileName>
</artifactItem>
@@ -314,7 +311,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
<executions>
<execution>
<id>unix-bin</id>
@@ -372,12 +368,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- </executions>
- </plugin>
</plugins>
</build>
@@ -389,7 +379,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<executions>
<execution>
<id>unix-src</id>
Modified: servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/demos/smx4web/pom.xml Fri Feb 6 15:17:58 2009
@@ -43,12 +43,10 @@
<dependency>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>org.apache.servicemix.kernel.main</artifactId>
- <version>${servicemix.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>apache-servicemix-kernel</artifactId>
- <version>${servicemix.kernel.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
@@ -184,7 +182,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>${geronimo.servlet.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -249,7 +246,6 @@
<artifactItem>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>apache-servicemix-kernel</artifactId>
- <version>${servicemix.kernel.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/kernel/WEB-INF</outputDirectory>
<excludes>**/lib/*,**/*.txt,**/bin/*,**/lib,**/bin</excludes>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml Fri Feb 6
15:17:58 2009
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>copy-resources</id>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml Fri Feb 6
15:17:58 2009
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Fri Feb 6 15:17:58
2009
@@ -86,7 +86,6 @@
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-builtin</artifactId>
- <version>${gshell.version}</version>
<exclusions>
<exclusion>
<groupId>oro</groupId>
@@ -101,32 +100,26 @@
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-file</artifactId>
- <version>${gshell.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-network</artifactId>
- <version>${gshell.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-shell</artifactId>
- <version>${gshell.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-ssh</artifactId>
- <version>${gshell.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-text</artifactId>
- <version>${gshell.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.wisdom</groupId>
<artifactId>gshell-wisdom-core</artifactId>
- <version>${gshell.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.gshell.support</groupId>
Modified: servicemix/smx4/kernel/trunk/gshell/itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/itests/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/itests/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/itests/pom.xml Fri Feb 6 15:17:58 2009
@@ -71,7 +71,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>${depends.maven.plugin.version}</version>
<executions>
<execution>
<id>generate-depends-file</id>
Modified: servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/jaas/jaas-modules/pom.xml Fri Feb 6 15:17:58
2009
@@ -63,7 +63,6 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/kernel/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/main/pom.xml Fri Feb 6 15:17:58 2009
@@ -148,7 +148,6 @@
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
-
<version>${felix.osgi.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
@@ -165,7 +164,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Fri Feb 6 15:17:58 2009
@@ -279,6 +279,22 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.kernel.demos</groupId>
+ <artifactId>smx4web</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>zip</type>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.framework.version}</version>
@@ -510,66 +526,65 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-core</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-command-api</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-model</artifactId>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-builtin</artifactId>
<version>${gshell.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-common</artifactId>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-file</artifactId>
<version>${gshell.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-ansi</artifactId>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-network</artifactId>
<version>${gshell.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-i18n</artifactId>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-shell</artifactId>
<version>${gshell.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-clp</artifactId>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-ssh</artifactId>
<version>${gshell.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-parser</artifactId>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-text</artifactId>
<version>${gshell.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.remote</groupId>
- <artifactId>gshell-whisper</artifactId>
+ <groupId>org.apache.geronimo.gshell.wisdom</groupId>
+ <artifactId>gshell-wisdom-core</artifactId>
<version>${gshell.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-filter-ssl</artifactId>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-ivy</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-xstore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.gshell.commands</groupId>
- <artifactId>gshell-ssh</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
<version>1.0-alpha-32</version>
@@ -743,6 +758,21 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.3</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>${depends.maven.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: servicemix/smx4/kernel/trunk/testing/itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/itests/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/itests/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/itests/pom.xml Fri Feb 6 15:17:58 2009
@@ -62,7 +62,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>${depends.maven.plugin.version}</version>
<executions>
<execution>
<id>generate-depends-file</id>
Modified: servicemix/smx4/kernel/trunk/testing/support/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/pom.xml?rev=741590&r1=741589&r2=741590&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/support/pom.xml Fri Feb 6 15:17:58
2009
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>copy-resources</id>
