Author: jbonofre
Date: Fri Mar 5 21:03:53 2010
New Revision: 919615
URL: http://svn.apache.org/viewvc?rev=919615&view=rev
Log:
Revert my assembly changes as Chris updates to Karaf 1.4.1-SNAPSHOT which
provide the correct felix framework version.
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=919615&r1=919614&r2=919615&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Fri Mar 5 21:03:53 2010
@@ -33,12 +33,6 @@
<name>Apache ServiceMix NMR :: Assembly</name>
<dependencies>
- <!-- normaly, felix framework is provided by karaf distribution -->
- <!-- this is a temporary workaround waiting for karaf 1.4.0 -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.felix.karaf</groupId>
<artifactId>apache-felix-karaf</artifactId>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=919615&r1=919614&r2=919615&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Fri
Mar 5 21:03:53 2010
@@ -81,15 +81,6 @@
<outputDirectory>system</outputDirectory>
</fileSet>
- <!-- temporary workaround waiting for Karaf 1.4.0 which will provide
the correct felix framework version -->
- <fileSet>
- <directory>target/dependencies</directory>
- <includes>
-
<include>org.apache.felix.framework-${felix.framework.version}.jar</include>
- </includes>
-
<outputDirectory>system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}</outputDirectory>
- </fileSet>
-
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=919615&r1=919614&r2=919615&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Fri
Mar 5 21:03:53 2010
@@ -81,15 +81,6 @@
<outputDirectory>system</outputDirectory>
</fileSet>
- <!-- temporary workaround waiting for Karaf 1.4.0 which will provide
the correct Felix framework version -->
- <fileSet>
- <directory>target/dependencies</directory>
- <includes>
-
<include>org.apache.felix.framework-${felix.framework.version}.jar</include>
- </includes>
-
<outputDirectory>system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}</outputDirectory>
- </fileSet>
-
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
