Author: gertv
Date: Mon Jul 4 12:21:18 2011
New Revision: 1142639
URL: http://svn.apache.org/viewvc?rev=1142639&view=rev
Log:
SM-2103: Fix ServiceMix 3 build to play more nicely with Maven 3
Modified:
servicemix/smx3/trunk/common/servicemix-components/pom.xml
servicemix/smx3/trunk/core/servicemix-core/pom.xml
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/parent/pom.xml
servicemix/smx3/trunk/platforms/geronimo/deployer-service/pom.xml
servicemix/smx3/trunk/platforms/geronimo/deployer/pom.xml
servicemix/smx3/trunk/platforms/geronimo/pom.xml
servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
servicemix/smx3/trunk/platforms/jboss/deployer/pom.xml
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml
servicemix/smx3/trunk/samples/servicemix-web/pom.xml
servicemix/smx3/trunk/servicemix-itests/pom.xml
Modified: servicemix/smx3/trunk/common/servicemix-components/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/pom.xml (original)
+++ servicemix/smx3/trunk/common/servicemix-components/pom.xml Mon Jul 4
12:21:18 2011
@@ -175,11 +175,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all-1.0-jsr</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.livetribe</groupId>
<artifactId>livetribe-jsr223</artifactId>
<version>2.0.5</version>
@@ -196,12 +191,6 @@
<artifactId>jdom</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>axis</groupId>
Modified: servicemix/smx3/trunk/core/servicemix-core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/pom.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/pom.xml Mon Jul 4 12:21:18 2011
@@ -139,14 +139,6 @@
<artifactId>jencks</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- </dependency>
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
@@ -185,12 +177,6 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- </dependency>
- -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -208,10 +194,6 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<optional>true</optional>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Mon Jul 4
12:21:18 2011
@@ -740,12 +740,12 @@
<goal>copy</goal>
</goals>
<configuration>
-
<outputDirectory>target/samples/bridge-${pom.version}</outputDirectory>
+
<outputDirectory>target/samples/bridge-${project.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.bridge</groupId>
<artifactId>bridge-sa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -759,12 +759,12 @@
<goal>copy</goal>
</goals>
<configuration>
-
<outputDirectory>target/samples/bridge-camel-${pom.version}</outputDirectory>
+
<outputDirectory>target/samples/bridge-camel-${project.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.bridge-camel</groupId>
<artifactId>bridge-camel-sa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -777,12 +777,12 @@
<goal>copy</goal>
</goals>
<configuration>
-
<outputDirectory>target/samples/loan-broker-${pom.version}</outputDirectory>
+
<outputDirectory>target/samples/loan-broker-${project.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
<artifactId>loan-broker-sa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -796,12 +796,12 @@
</goals>
<configuration>
<id>wsdl-first</id>
-
<outputDirectory>target/samples/wsdl-first-${pom.version}</outputDirectory>
+
<outputDirectory>target/samples/wsdl-first-${project.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
<artifactId>wsdl-first-sa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -815,12 +815,12 @@
</goals>
<configuration>
<id>cxf-wsdl-first</id>
-
<outputDirectory>target/samples/cxf-wsdl-first-${pom.version}</outputDirectory>
+
<outputDirectory>target/samples/cxf-wsdl-first-${project.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.cxf-wsdl-first</groupId>
<artifactId>wsdl-first-cxf-sa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -834,12 +834,12 @@
</goals>
<configuration>
<id>camel</id>
-
<outputDirectory>target/samples/camel-${pom.version}</outputDirectory>
+
<outputDirectory>target/samples/camel-${project.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>camel-sa</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -857,56 +857,56 @@
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>servicemix-web</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>wsdl-first</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>cxf-wsdl-first</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>loan-broker</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge-camel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>basic</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>camel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
@@ -924,7 +924,7 @@
<inputDirectory>${basedir}/src/main/release</inputDirectory>
<outputDirectory>${basedir}/target/filtered</outputDirectory>
<filters>
- <servicemix-version>${pom.version}</servicemix-version>
+
<servicemix-version>${project.version}</servicemix-version>
<servicemix-common-version>${servicemix-common-version}</servicemix-common-version>
<servicemix-wsn2005-version>${servicemix-common-version}</servicemix-wsn2005-version>
<releases-repo-url>${releases-repo-url}</releases-repo-url>
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=1142639&r1=1142638&r2=1142639&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
Mon Jul 4 12:21:18 2011
@@ -71,35 +71,35 @@
<outputDirectory>schemas</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/servicemix-web-${pom.version}</directory>
+
<directory>target/samples/servicemix-web-${project.version}</directory>
<outputDirectory>examples/servicemix-web</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/wsdl-first-${pom.version}</directory>
+ <directory>target/samples/wsdl-first-${project.version}</directory>
<outputDirectory>examples/wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
+
<directory>target/samples/cxf-wsdl-first-${project.version}</directory>
<outputDirectory>examples/cxf-wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/loan-broker-${pom.version}</directory>
+
<directory>target/samples/loan-broker-${project.version}</directory>
<outputDirectory>examples/loan-broker-bpel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-${pom.version}</directory>
+ <directory>target/samples/bridge-${project.version}</directory>
<outputDirectory>examples/bridge</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-camel-${pom.version}</directory>
+
<directory>target/samples/bridge-camel-${project.version}</directory>
<outputDirectory>examples/bridge-camel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/basic-${pom.version}</directory>
+ <directory>target/samples/basic-${project.version}</directory>
<outputDirectory>examples/basic</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/camel-${pom.version}</directory>
+ <directory>target/samples/camel-${project.version}</directory>
<outputDirectory>examples/camel</outputDirectory>
</fileSet>
<fileSet>
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=1142639&r1=1142638&r2=1142639&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
Mon Jul 4 12:21:18 2011
@@ -63,35 +63,35 @@
<outputDirectory>schemas</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/servicemix-web-${pom.version}</directory>
+
<directory>target/samples/servicemix-web-${project.version}</directory>
<outputDirectory>examples/servicemix-web</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/wsdl-first-${pom.version}</directory>
+ <directory>target/samples/wsdl-first-${project.version}</directory>
<outputDirectory>examples/wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
+
<directory>target/samples/cxf-wsdl-first-${project.version}</directory>
<outputDirectory>examples/cxf-wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/loan-broker-${pom.version}</directory>
+
<directory>target/samples/loan-broker-${project.version}</directory>
<outputDirectory>examples/loan-broker-bpel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-${pom.version}</directory>
+ <directory>target/samples/bridge-${project.version}</directory>
<outputDirectory>examples/bridge</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-camel-${pom.version}</directory>
+
<directory>target/samples/bridge-camel-${project.version}</directory>
<outputDirectory>examples/bridge-camel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/basic-${pom.version}</directory>
+ <directory>target/samples/basic-${project.version}</directory>
<outputDirectory>examples/basic</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/camel-${pom.version}</directory>
+ <directory>target/samples/camel-${project.version}</directory>
<outputDirectory>examples/camel</outputDirectory>
</fileSet>
<fileSet>
Modified: servicemix/smx3/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/parent/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/parent/pom.xml (original)
+++ servicemix/smx3/trunk/parent/pom.xml Mon Jul 4 12:21:18 2011
@@ -82,6 +82,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
Modified: servicemix/smx3/trunk/platforms/geronimo/deployer-service/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/deployer-service/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/deployer-service/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/deployer-service/pom.xml Mon Jul
4 12:21:18 2011
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>servicemix-service</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
Modified: servicemix/smx3/trunk/platforms/geronimo/deployer/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/deployer/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/deployer/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/deployer/pom.xml Mon Jul 4
12:21:18 2011
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>servicemix</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
<scope>runtime</scope>
<exclusions>
Modified: servicemix/smx3/trunk/platforms/geronimo/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/pom.xml Mon Jul 4 12:21:18 2011
@@ -36,7 +36,7 @@
<geronimoVersion>${geronimo-version}</geronimoVersion>
<car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
<geronimoSchemaVersion>1.2</geronimoSchemaVersion>
-
<gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
+
<gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${project.version}/car</gbeanDeployer>
<xbean-version>3.1</xbean-version>
</properties>
Modified: servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/servicemix/pom.xml Mon Jul 4
12:21:18 2011
@@ -59,26 +59,6 @@
<version>1.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimo-version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
- <version>${geronimo-version}</version>
- <type>car</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- For build ordering -->
<dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
Modified: servicemix/smx3/trunk/platforms/jboss/deployer/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/jboss/deployer/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/jboss/deployer/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/jboss/deployer/pom.xml Mon Jul 4 12:21:18
2011
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
Modified: servicemix/smx3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Mon Jul 4 12:21:18 2011
@@ -1865,6 +1865,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
<configuration>
<warSourceDirectory>src/webapp/</warSourceDirectory>
</configuration>
@@ -1903,6 +1904,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
@@ -1916,6 +1918,11 @@
</projectnatures>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xmlbeans-maven-plugin</artifactId>
+ <version>2.3.3</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified:
servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
---
servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml
(original)
+++
servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml
Mon Jul 4 12:21:18 2011
@@ -29,7 +29,7 @@
<sm:deployments>
<sm:installSharedLibrary groupId="org.apache.servicemix"
artifactId="servicemix-shared" version="${servicemix-shared-version}"/>
<sm:installComponent groupId="org.apache.servicemix"
artifactId="servicemix-camel" version="${servicemix-camel-version}"/>
- <sm:deployServiceAssembly groupId="org.apache.servicemix.samples"
artifactId="camel-sa" version="${pom.version}"/>
+ <sm:deployServiceAssembly groupId="org.apache.servicemix.samples"
artifactId="camel-sa" version="${project.version}"/>
</sm:deployments>
</sm:container>
Modified: servicemix/smx3/trunk/samples/servicemix-web/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/servicemix-web/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/servicemix-web/pom.xml (original)
+++ servicemix/smx3/trunk/samples/servicemix-web/pom.xml Mon Jul 4 12:21:18
2011
@@ -56,13 +56,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>apache-servicemix-web</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
</dependency>
@@ -118,6 +111,18 @@
<artifactId>commons-pool</artifactId>
</dependency>
</dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>apache-servicemix-web</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
Modified: servicemix/smx3/trunk/servicemix-itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/servicemix-itests/pom.xml?rev=1142639&r1=1142638&r2=1142639&view=diff
==============================================================================
--- servicemix/smx3/trunk/servicemix-itests/pom.xml (original)
+++ servicemix/smx3/trunk/servicemix-itests/pom.xml Mon Jul 4 12:21:18 2011
@@ -75,11 +75,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
<scope>test</scope>
</dependency>
