activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1239540 - in /activemq/trunk/activemq-karaf: pom.xml src/main/resources/features-2.1.xml src/main/resources/features.xml
Date Thu, 02 Feb 2012 11:14:30 GMT
Author: dejanb
Date: Thu Feb  2 11:14:30 2012
New Revision: 1239540

URL: http://svn.apache.org/viewvc?rev=1239540&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3606 - schema for karaf features xml

Removed:
    activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml
Modified:
    activemq/trunk/activemq-karaf/pom.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=1239540&r1=1239539&r2=1239540&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Thu Feb  2 11:14:30 2012
@@ -195,11 +195,6 @@
                      <type>xml</type>
                      <classifier>features</classifier>
                    </artifact>
-                  <artifact>
-                    <file>target/classes/features-2.1.xml</file>
-                     <type>xml</type>
-                     <classifier>features-2.1</classifier>
-                   </artifact>
                  </artifacts>
                </configuration>
              </execution>

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=1239540&r1=1239539&r2=1239540&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Thu Feb  2 11:14:30 2012
@@ -17,7 +17,7 @@
 
 -->
 
-<features name="activemq-${activemq-version}">
+<features name="activemq-${activemq-version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
     <feature name="activemq" version="${activemq-version}" resolver="(obr)">
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>

@@ -62,7 +62,7 @@
 
     <feature name="activemq-optional" version="${activemq-version}" resolver="(obr)">
         <feature version="${activemq-version}">activemq-blueprint</feature>
-        <feature varesion="[7.0,8.0)">jetty</feature>
+        <feature version="[7.0,8.0)">jetty</feature>
         <bundle>mvn:org.apache.activemq/activemq-optional/${activemq-version}</bundle>
     </feature>
 



Mime
View raw message