Author: rickmcguire
Date: Thu Oct 28 19:09:19 2010
New Revision: 1028436
URL: http://svn.apache.org/viewvc?rev=1028436&view=rev
Log:
make sure bundle versions of activemq dependencies are used
Modified:
geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
geronimo/server/trunk/plugins/activemq/pom.xml
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml?rev=1028436&r1=1028435&r2=1028436&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml Thu Oct 28 19:09:19
2010
@@ -71,6 +71,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=1028436&r1=1028435&r2=1028436&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
Thu Oct 28 19:09:19 2010
@@ -7,11 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<type>jar</type>
@@ -83,6 +78,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
<type>jar</type>
</dependency>
@@ -101,9 +101,4 @@
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=1028436&r1=1028435&r2=1028436&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Thu Oct 28
19:09:19 2010
@@ -58,6 +58,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml?rev=1028436&r1=1028435&r2=1028436&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml Thu Oct 28 19:09:19
2010
@@ -48,6 +48,12 @@
-->
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=1028436&r1=1028435&r2=1028436&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Thu Oct 28 19:09:19 2010
@@ -101,8 +101,22 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ <version>1.6_1</version>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
|