Author: gnodet
Date: Thu Dec 20 12:38:33 2007
New Revision: 606020
URL: http://svn.apache.org/viewvc?rev=606020&view=rev
Log:
Change to 1.0-m1, fix repos and fix Features service
Modified:
servicemix/smx4/runtime/trunk/assembly/pom.xml
servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/runtime/trunk/bundles/ant/pom.xml
servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml
servicemix/smx4/runtime/trunk/bundles/asm/pom.xml
servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml
servicemix/smx4/runtime/trunk/bundles/junit/pom.xml
servicemix/smx4/runtime/trunk/bundles/mina/pom.xml
servicemix/smx4/runtime/trunk/bundles/pom.xml
servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml
servicemix/smx4/runtime/trunk/filemonitor/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml
servicemix/smx4/runtime/trunk/gshell/pom.xml
servicemix/smx4/runtime/trunk/main/pom.xml
servicemix/smx4/runtime/trunk/pom.xml
servicemix/smx4/runtime/trunk/testing/depends-maven-plugin/pom.xml
servicemix/smx4/runtime/trunk/testing/pom.xml
servicemix/smx4/runtime/trunk/testing/support/pom.xml
Modified: servicemix/smx4/runtime/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/assembly/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/assembly/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime</groupId>
@@ -37,12 +37,12 @@
<dependency>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>org.apache.servicemix.runtime.main</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>org.apache.servicemix.runtime.filemonitor</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -92,47 +92,47 @@
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.osgi</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.features</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.mina-${mina.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xstream-${xstream.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.aopalliance-${aopalliance.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.asm-${asm.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib-${cglib.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
---
servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++
servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Thu Dec 20 12:38:33 2007
@@ -49,6 +49,7 @@
org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
org.apache.servicemix.runtime.gshell.obr-${version}.jar=50
org.apache.servicemix.runtime.gshell.osgi-${version}.jar=50
+org.apache.servicemix.runtime.gshell.features-${version}.jar=50
#
# Start console last
Modified: servicemix/smx4/runtime/trunk/bundles/ant/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/ant/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/ant/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/ant/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml Thu Dec 20
12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/bundles/asm/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/asm/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/asm/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/asm/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/bundles/junit/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/junit/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/junit/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/junit/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/bundles/mina/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/mina/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/mina/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/mina/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/bundles/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml Thu Dec 20 12:38:33
2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.bundles</groupId>
<artifactId>bundles</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/runtime/trunk/filemonitor/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/filemonitor/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/filemonitor/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/filemonitor/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.servicemix.runtime.filemonitor</artifactId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ant-${ant.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml Thu Dec 20
12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
@@ -70,12 +70,12 @@
<dependency>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>org.apache.servicemix.runtime.main</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib-${cglib.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -225,4 +225,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml Thu Dec 20
12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -87,4 +87,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified:
servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
---
servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
(original)
+++
servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
Thu Dec 20 12:38:33 2007
@@ -18,13 +18,12 @@
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
-import org.apache.geronimo.gshell.command.Command;
import org.apache.servicemix.gshell.features.Feature;
import org.apache.servicemix.gshell.features.FeaturesService;
import org.apache.servicemix.gshell.features.Repository;
@@ -86,7 +85,8 @@
}
public Repository[] listRepositories() {
- return new Repository[0]; //To change body of implemented methods use
File | Settings | File Templates.
+ Collection<RepositoryImpl> repos = repositories.values();
+ return repos.toArray(new Repository[repos.size()]);
}
public void start() throws Exception {
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml Thu Dec 20 12:38:33
2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -81,4 +81,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml Thu Dec 20
12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -75,4 +75,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml Thu Dec 20
12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: servicemix/smx4/runtime/trunk/gshell/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.gshell</groupId>
Modified: servicemix/smx4/runtime/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/main/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/main/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/main/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.servicemix.runtime.main</artifactId>
Modified: servicemix/smx4/runtime/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/pom.xml Thu Dec 20 12:38:33 2007
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
<packaging>pom</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
<name>Apache ServiceMix Runtime</name>
<modules>
@@ -68,7 +68,7 @@
<felix.configadmin.version>0.9.0-r605854</felix.configadmin.version>
<felix.main.version>1.1.0-r605854</felix.main.version>
<felix.plugin.version>1.1.0-r605854</felix.plugin.version>
- <felix.framework.version>1.1.0-r605854</felix.framework.version>
+ <felix.framework.version>1.1.0-r605854-patched</felix.framework.version>
<felix.osgi.version>1.0.0</felix.osgi.version>
<felix.compendium.version>0.9.0-r605854</felix.compendium.version>
<felix.bundlerepository.version>1.1.0-r605854</felix.bundlerepository.version>
@@ -98,10 +98,6 @@
<name>ServiceMix Repository</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
</repository>
- <repository>
- <id>ops4j</id>
- <url>http://repository.ops4j.org/maven2</url>
- </repository>
<!-- Apache snapshot -->
<repository>
<id>apache-snapshots</id>
@@ -128,6 +124,12 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
+ </pluginRepository>
+ <!-- ServiceMix repo -->
+ <pluginRepository>
+ <id>servicemix</id>
+ <name>ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
</pluginRepository>
</pluginRepositories>
Modified: servicemix/smx4/runtime/trunk/testing/depends-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/testing/depends-maven-plugin/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/testing/depends-maven-plugin/pom.xml
(original)
+++ servicemix/smx4/runtime/trunk/testing/depends-maven-plugin/pom.xml Thu Dec
20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.testing</groupId>
<artifactId>testing</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.testing</groupId>
Modified: servicemix/smx4/runtime/trunk/testing/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/testing/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/testing/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/testing/pom.xml Thu Dec 20 12:38:33 2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime</groupId>
<artifactId>runtime</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.testing</groupId>
Modified: servicemix/smx4/runtime/trunk/testing/support/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/testing/support/pom.xml?rev=606020&r1=606019&r2=606020&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/testing/support/pom.xml Thu Dec 20 12:38:33
2007
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.servicemix.runtime.testing</groupId>
<artifactId>testing</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.runtime.testing</groupId>
@@ -119,17 +119,17 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.aopalliance-${aopalliance.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.asm-${asm.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit-${junit.version}</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-m1-SNAPSHOT</version>
</dependency>
</dependencies>