activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1097794 - in /activemq/trunk/activemq-karaf: pom.xml src/main/resources/features-2.1.xml src/main/resources/features.xml
Date Fri, 29 Apr 2011 12:41:16 GMT
Author: gtully
Date: Fri Apr 29 12:41:15 2011
New Revision: 1097794

URL: http://svn.apache.org/viewvc?rev=1097794&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3297 - add xtream necessary bundles to activemq-karaf/features.xml.
patch applied with thanks

Modified:
    activemq/trunk/activemq-karaf/pom.xml
    activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml
    activemq/trunk/activemq-karaf/src/main/resources/features.xml

Modified: activemq/trunk/activemq-karaf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1097794&r1=1097793&r2=1097794&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Fri Apr 29 12:41:15 2011
@@ -29,6 +29,14 @@
   <packaging>bundle</packaging>
   <name>ActiveMQ :: Apache Karaf</name>
   <description>Provides resources for running ActiveMQ in Apache Karaf</description>
+ 
+  <properties>
+    <xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version>
+    <jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
+    <jdom-bundle-version>1.1_2</jdom-bundle-version>
+    <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
+    <xstream-bundle-version>1.3_3</xstream-bundle-version>
+  </properties>
 
     <dependencies>
       <dependency>
@@ -131,4 +139,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml?rev=1097794&r1=1097793&r2=1097794&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml Fri Apr 29 12:41:15
2011
@@ -31,6 +31,11 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>

         <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle> 
         <bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1097794&r1=1097793&r2=1097794&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Apr 29 12:41:15 2011
@@ -30,6 +30,11 @@
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>

         <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle> 
         <bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>



Mime
View raw message