Author: ccustine
Date: Mon Nov 16 06:14:58 2009
New Revision: 880610
URL: http://svn.apache.org/viewvc?rev=880610&view=rev
Log:
- Removing duplicate dependencies
- Updated some really old release versions of servicemix-shared, etc for itests
Modified:
servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml?rev=880610&r1=880609&r2=880610&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Mon Nov 16 06:14:58 2009
@@ -63,11 +63,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
<scope>test</scope>
@@ -83,10 +78,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.management</artifactId>
</dependency>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=880610&r1=880609&r2=880610&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Nov 16 06:14:58 2009
@@ -118,10 +118,10 @@
<pax.logging.version>1.4</pax.logging.version>
<pax.runner.version>1.1.1</pax.runner.version>
<servicemix3.version>3.3</servicemix3.version>
- <servicemix.eip.version>2008.01</servicemix.eip.version>
- <servicemix.http.version>2008.01</servicemix.http.version>
- <servicemix.jsr181.version>2008.01</servicemix.jsr181.version>
- <servicemix.shared.version>2008.01</servicemix.shared.version>
+ <servicemix.eip.version>2009.02-SNAPSHOT</servicemix.eip.version>
+ <servicemix.http.version>2009.02-SNAPSHOT</servicemix.http.version>
+ <servicemix.jsr181.version>2009.02-SNAPSHOT</servicemix.jsr181.version>
+ <servicemix.shared.version>2009.02-SNAPSHOT</servicemix.shared.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.4-SNAPSHOT</servicemix.specs.version>
<servicemix.utils.version>1.3.0-SNAPSHOT</servicemix.utils.version>
@@ -231,17 +231,6 @@
<version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-test</artifactId>
- <version>${spring.osgi.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>asm.osgi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -374,21 +363,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.jbi.cluster</groupId>
- <artifactId>org.apache.servicemix.jbi.cluster.requestor</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.jbi.cluster</groupId>
- <artifactId>org.apache.servicemix.jbi.cluster.engine</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.jbi.cluster</groupId>
- <artifactId>org.apache.servicemix.jbi.cluster.config</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.jbi.cluster</groupId>
<artifactId>cluster</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -433,11 +407,6 @@
<version>${cglib.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.prefs</artifactId>
<version>${felix.prefs.version}</version>
@@ -529,11 +498,6 @@
<version>${geronimo.jms.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo.jta.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit.version}</version>
@@ -571,11 +535,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.nmr.branding</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared</artifactId>
<version>${servicemix.shared.version}</version>
@@ -720,21 +679,6 @@
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-io</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-test</artifactId>
<version>${spring.osgi.version}</version>
<exclusions>
@@ -967,7 +911,7 @@
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<executions>
<execution>
<goals>