Author: gnodet
Date: Mon Feb 25 02:38:38 2008
New Revision: 630796
URL: http://svn.apache.org/viewvc?rev=630796&view=rev
Log:
Use new pax url maven support
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=630796&r1=630795&r2=630796&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Mon Feb 25 02:38:38 2008
@@ -170,9 +170,9 @@
<version>${pax.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner-handler-mvn</artifactId>
- <version>${pax.runner.version}</version>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>${pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=630796&r1=630795&r2=630796&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Mon
Feb 25 02:38:38 2008
@@ -138,7 +138,7 @@
<!-- OBR + GShell command -->
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
- <include>org.ops4j.pax.runner:pax-runner-handler-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=630796&r1=630795&r2=630796&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
Mon Feb 25 02:38:38 2008
@@ -130,7 +130,7 @@
<!-- OBR + GShell command -->
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
- <include>org.ops4j.pax.runner:pax-runner-handler-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=630796&r1=630795&r2=630796&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Mon Feb 25 02:38:38 2008
@@ -48,7 +48,7 @@
spring-osgi-io-${spring.osgi.version}.jar=50
org.apache.servicemix.kernel.spring-${pom.version}.jar=50
org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
-pax-runner-handler-mvn-${pax.runner.version}.jar=50
+pax-url-mvn-${pax.url.version}.jar=50
org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=630796&r1=630795&r2=630796&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Feb 25 02:38:38 2008
@@ -81,7 +81,7 @@
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6</mina.version>
<pax.logging.version>1.0.0</pax.logging.version>
- <pax.runner.version>0.5.5</pax.runner.version>
+ <pax.url.version>0.3.0</pax.url.version>
<spring.osgi.version>1.0</spring.osgi.version>
<spring.version>2.5.1</spring.version>
<xstream.version>1.2.2</xstream.version>
