activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1433970 - in /activemq/trunk: activemq-karaf/pom.xml activemq-karaf/src/main/resources/features.xml pom.xml
Date Wed, 16 Jan 2013 15:05:53 GMT
Author: dejanb
Date: Wed Jan 16 15:05:53 2013
New Revision: 1433970

URL: http://svn.apache.org/viewvc?rev=1433970&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4034 - fixing activemq-broker feature

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

Modified: activemq/trunk/activemq-karaf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1433970&r1=1433969&r2=1433970&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Wed Jan 16 15:05:53 2013
@@ -26,6 +26,7 @@
   </parent>
 
   <artifactId>activemq-karaf</artifactId>
+  <packaging>bundle</packaging>
   <name>ActiveMQ :: Apache Karaf</name>
   <description>Provides resources for running ActiveMQ in Apache Karaf</description>
 
@@ -176,6 +177,7 @@
                 </Import-Package>
                 <Private-Package>!*</Private-Package>
                 <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                <Embed-Transitive>true</Embed-Transitive>
             </instructions>
         </configuration>
       </plugin>

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=1433970&r1=1433969&r2=1433970&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Wed Jan 16 15:05:53 2013
@@ -61,26 +61,28 @@
         <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 dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
         <!-- the following 4 bundles is needed by activemq-console -->
         <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
         <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf-proto/${hawtbuf-version}</bundle>
         <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
         <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
-        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
     </feature>
 
     <feature name="activemq-spring" version="${project.version}" resolver="(obr)" start-level="50">
         <feature version="[1.2,2)">spring-dm</feature>
-        <feature version="${project.version}">activemq</feature>
+        <feature version="${project.version}">activemq-broker</feature>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-spring/${project.version}</bundle>
     </feature>
 
     <feature name="activemq-blueprint" version="${project.version}" resolver="(obr)" start-level="50">
-        <feature version="${project.version}">activemq</feature>
+        <feature version="${project.version}">activemq-broker</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
         <bundle dependency="true">mvn:org.apache.commons/commons-jexl/2.0.1</bundle>
+        <bundle dependency="true">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries-version}</bundle>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-blueprint/${xbean-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-blueprint/${project.version}</bundle>
     </feature>
@@ -102,7 +104,7 @@
     </feature>
 
     <feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
-        <feature version="${project.version}">activemq</feature>
+        <feature version="${project.version}">activemq-broker</feature>
         <feature version="${camel-version-range}">camel-jms</feature>
         <bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
     </feature>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1433970&r1=1433969&r2=1433970&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Jan 16 15:05:53 2013
@@ -1444,7 +1444,6 @@
     <profile>
       <id>unstable</id>
       <modules>
-        <module>activemq-karaf-itest</module>
       </modules>
     </profile>
     <profile>



Mime
View raw message