You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/01/17 13:58:48 UTC
svn commit: r612804 - in /servicemix/smx4/features/trunk/assembly: pom.xml
src/main/descriptors/unix-bin.xml src/main/descriptors/windows-bin.xml
src/main/filtered-resources/etc/startup.properties
Author: gnodet
Date: Thu Jan 17 04:58:07 2008
New Revision: 612804
URL: http://svn.apache.org/viewvc?rev=612804&view=rev
Log:
Fix assembly
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
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=612804&r1=612803&r2=612804&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Jan 17 04:58:07 2008
@@ -55,6 +55,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>org.apache.servicemix.preferences</artifactId>
+ <version>${servicemix.nmr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.api</artifactId>
<version>${servicemix.nmr.version}</version>
</dependency>
@@ -180,7 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.1</version>
<executions>
<execution>
<id>unix-bin</id>
@@ -247,7 +252,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.1</version>
<executions>
<execution>
<id>unix-src</id>
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=612804&r1=612803&r2=612804&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 Thu Jan 17 04:58:07 2008
@@ -106,6 +106,7 @@
<includes>
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-${woodstox.version}</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.preferences</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
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=612804&r1=612803&r2=612804&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 Thu Jan 17 04:58:07 2008
@@ -96,6 +96,7 @@
<scope>runtime</scope>
<includes>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-${woodstox.version}</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.preferences</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=612804&r1=612803&r2=612804&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties Thu Jan 17 04:58:07 2008
@@ -53,6 +53,7 @@
org.apache.servicemix.runtime.gshell.osgi-${servicemix.runtime.version}.jar=50
org.apache.servicemix.runtime.gshell.features-${servicemix.runtime.version}.jar=50
+org.apache.servicemix.preferences-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.api-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.commands-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.core-${servicemix.nmr.version}.jar=50