Author: gertv
Date: Tue Mar 29 05:45:57 2011
New Revision: 1086477
URL: http://svn.apache.org/viewvc?rev=1086477&view=rev
Log:
SMX4-787: Upgrade to ActiveMQ 5.5.0 - remove features override
Removed:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1086477&r1=1086476&r2=1086477&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Mar 29 05:45:57 2011
@@ -257,6 +257,12 @@
<groupId>org.apache.activemq</groupId>
<artifactId>kahadb</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-karaf</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
<!-- Camel -->
<dependency>
@@ -712,7 +718,7 @@
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-
<descriptor>file:${basedir}/target/classes/activemq-features.xml</descriptor>
+
<descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1086477&r1=1086476&r2=1086477&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Tue Mar 29 05:45:57 2011
@@ -179,13 +179,6 @@
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/activemq-features.xml</source>
-
<outputDirectory>system/org/apache/activemq/activemq-karaf/${activemq.version}</outputDirectory>
-
<destName>activemq-karaf-${activemq.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1086477&r1=1086476&r2=1086477&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Tue Mar 29 05:45:57 2011
@@ -161,13 +161,6 @@
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/activemq-features.xml</source>
-
<outputDirectory>system/org/apache/activemq/activemq-karaf/${activemq.version}</outputDirectory>
-
<destName>activemq-karaf-${activemq.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
