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 2010/03/03 19:12:18 UTC
svn commit: r918608 - in /servicemix/smx4/features/trunk: assembly/pom.xml
assembly/src/main/filtered-resources/features.xml
examples/itests/tests/pom.xml pom.xml
Author: jbonofre
Date: Wed Mar 3 18:12:18 2010
New Revision: 918608
URL: http://svn.apache.org/viewvc?rev=918608&view=rev
Log:
Add bundles dependency required for the assembly build.
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=918608&r1=918607&r2=918608&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Mar 3 18:12:18 2010
@@ -138,7 +138,12 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
- <version>${jetty.bundle.version}</version>
+ <version>${jetty.camel.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
+ <version>${jetty.karaf.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -554,7 +559,12 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
- <version>${activemq.commons-pool.version}</version>
+ <version>${commons-pool.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <version>${commons-pool.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -671,11 +681,6 @@
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
- <version>${commons-pool.version}</version>
- </dependency>
<!-- Dependencies not included directly, but repackaged in bundles.
Listed for legal reasons (and LICENSE file generation)
<dependency>
@@ -876,6 +881,11 @@
<version>${scriptengines.version}</version>
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.camel.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>apache-camel</artifactId>
<version>${camel.version}</version>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=918608&r1=918607&r2=918608&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Wed Mar 3 18:12:18 2010
@@ -43,7 +43,7 @@
<feature name="activemq" version="${activemq.version}">
<feature version="${version}">connector</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo.j2ee.management.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${activemq.commons-pool.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.activemq.version}</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
<bundle>mvn:org.apache.activemq/kahadb/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
@@ -182,7 +182,7 @@
<feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc-version}">
<feature version="${servicemix-shared-version}">servicemix-shared</feature>
<feature version="${cxf.version}">cxf</feature>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.karaf.bundle.version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
@@ -207,7 +207,7 @@
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.karaf.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared-version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared-version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http-version}</bundle>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=918608&r1=918607&r2=918608&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Wed Mar 3 18:12:18 2010
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
- <version>${jetty.bundle.version}</version>
+ <version>${jetty.karaf.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=918608&r1=918607&r2=918608&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Mar 3 18:12:18 2010
@@ -79,7 +79,6 @@
<commons-beanutils.version>1.7.0_3</commons-beanutils.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-csv.version>1.0-r706899_1</commons-csv.version>
- <commons-dbcp.version>1.2.2_5</commons-dbcp.version>
<commons-httpclient.version>3.1_4</commons-httpclient.version>
<commons-io.version>1.3.2_3</commons-io.version>
<commons-codec.version>1.3_2</commons-codec.version>
@@ -87,8 +86,8 @@
<commons-logging.version>1.1.1</commons-logging.version>
<commons-net.version>1.4.1_3</commons-net.version>
<commons-pool.version>1.5.4_1</commons-pool.version>
- <!-- Required by ActiveMQ -->
- <activemq.commons-pool.version>1.4_1</activemq.commons-pool.version>
+ <commons-pool.camel.version>1.5.4</commons-pool.camel.version>
+ <commons-pool.activemq.version>1.4_1</commons-pool.activemq.version>
<commons-vfs.version>1.0_3</commons-vfs.version>
<commons-jexl.version>1.1_3</commons-jexl.version>
<commons-lang-version>2.4</commons-lang-version>
@@ -147,8 +146,9 @@
<jdt.core.version>3.2.3_2</jdt.core.version>
<jdom.version>1.1_2</jdom.version>
<jencks.version>2.2</jencks.version>
- <jetty.version>6.1.19</jetty.version>
- <jetty.bundle.version>6.1.19_2</jetty.bundle.version>
+ <jetty.version>6.1.22</jetty.version>
+ <jetty.karaf.bundle.version>6.1.22_1</jetty.karaf.bundle.version>
+ <jetty.camel.bundle.version>6.1.19_2</jetty.camel.bundle.version>
<jexcelapi.version>2.4.2_2</jexcelapi.version>
<jettison.version>1.2</jettison.version>
<jing.version>20030619_2</jing.version>