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 2006/06/20 00:38:53 UTC

svn commit: r415445 - in /incubator/servicemix/trunk: ./ apache-servicemix/ geronimo-1.0/ geronimo-1.1/ samples/ samples/wsdl-first/ samples/wsdl-first/http-su/ samples/wsdl-first/jsr181-su/ samples/wsdl-first/sa/ servicemix-beanflow/ servicemix-bpe/ s...

Author: gnodet
Date: Mon Jun 19 15:38:51 2006
New Revision: 415445

URL: http://svn.apache.org/viewvc?rev=415445&view=rev
Log:
Prepare 3.0-M2-incubating release

Modified:
    incubator/servicemix/trunk/apache-servicemix/pom.xml
    incubator/servicemix/trunk/geronimo-1.0/project.xml
    incubator/servicemix/trunk/geronimo-1.1/project.xml
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/samples/pom.xml
    incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml
    incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml
    incubator/servicemix/trunk/samples/wsdl-first/pom.xml
    incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml
    incubator/servicemix/trunk/servicemix-beanflow/pom.xml
    incubator/servicemix/trunk/servicemix-bpe/pom.xml
    incubator/servicemix/trunk/servicemix-common/pom.xml
    incubator/servicemix/trunk/servicemix-components/pom.xml
    incubator/servicemix/trunk/servicemix-console/pom.xml
    incubator/servicemix/trunk/servicemix-core/pom.xml
    incubator/servicemix/trunk/servicemix-eip/pom.xml
    incubator/servicemix/trunk/servicemix-http/pom.xml
    incubator/servicemix/trunk/servicemix-itests/pom.xml
    incubator/servicemix/trunk/servicemix-jbi/pom.xml
    incubator/servicemix/trunk/servicemix-jms/pom.xml
    incubator/servicemix/trunk/servicemix-jsr181/pom.xml
    incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
    incubator/servicemix/trunk/servicemix-sca/pom.xml
    incubator/servicemix/trunk/servicemix-services/pom.xml
    incubator/servicemix/trunk/servicemix-soap/pom.xml
    incubator/servicemix/trunk/servicemix-web/pom.xml
    incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
    incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml
    incubator/servicemix/trunk/tooling/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-binding-component/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml
    incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml

Modified: incubator/servicemix/trunk/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/pom.xml Mon Jun 19 15:38:51 2006
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>apache-servicemix</artifactId>
@@ -103,6 +103,7 @@
     <dependency>
       <groupId>org.apache.servicemix.samples</groupId>
       <artifactId>wsdl-first</artifactId>
+      <type>pom</type>
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>

Modified: incubator/servicemix/trunk/geronimo-1.0/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.0/project.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.0/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.0/project.xml Mon Jun 19 15:38:51 2006
@@ -24,6 +24,6 @@
   <name>ServiceMix</name>
   <id>servicemix-geronimo-1.0</id>
   <groupId>org.apache.servicemix</groupId>
-  <currentVersion>3.0-SNAPSHOT</currentVersion>
+  <currentVersion>3.0-M2-incubating</currentVersion>
 
 </project>

Modified: incubator/servicemix/trunk/geronimo-1.1/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/project.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/project.xml Mon Jun 19 15:38:51 2006
@@ -24,5 +24,6 @@
   <id>servicemix-geronimo-1.1</id>
   <groupId>org.apache.servicemix</groupId>
   <name>ServiceMix configuration</name>
+  <currentVersion>3.0-M2-incubating</currentVersion>
 
 </project>

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Jun 19 15:38:51 2006
@@ -33,7 +33,7 @@
   <artifactId>servicemix</artifactId>
   <packaging>pom</packaging>
   <name>ServiceMix</name>
-  <version>3.0-SNAPSHOT</version>
+  <version>3.0-M2-incubating</version>
   <description>
     ServiceMix is an open source ESB based on the Java Business
     Integration framework - JSR-208 
@@ -307,93 +307,94 @@
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-jbi</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-services</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-core</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-components</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-common</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-console</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-gbean</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-jms</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-jsr181</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-http</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-sca</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-soap</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-wsn2005</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-lwcontainer</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-eip</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-web</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.samples</groupId>
         <artifactId>wsdl-first</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
+        <type>pom</type>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>servicemix-beanflow</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
  
       <dependency>
@@ -1744,7 +1745,7 @@
         <plugin>
           <groupId>org.apache.servicemix.tooling</groupId>
           <artifactId>jbi-maven-plugin</artifactId>
-          <version>1.0-SNAPSHOT</version>
+          <version>1.0-M2-incubating</version>
           <extensions>true</extensions>
         </plugin>
         <plugin>

Modified: incubator/servicemix/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/pom.xml (original)
+++ incubator/servicemix/trunk/samples/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,12 +25,11 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
   
-  <groupId>org.apache.servicemix.samples</groupId>
+  <groupId>org.apache.servicemix</groupId>
   <artifactId>samples</artifactId>
-  <version>3.0-SNAPSHOT</version>
   <name>ServiceMix :: Samples</name>
   <url>http://servicemix.org</url>
   <packaging>pom</packaging>

Modified: incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,13 +25,12 @@
 
     <parent>
         <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>samples</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <artifactId>wsdl-first</artifactId>
+        <version>3.0-M2-incubating</version>
     </parent>
 
     <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
     <artifactId>http-su</artifactId>
-    <version>3.0-SNAPSHOT</version>
     <name>ServiceMix :: Samples :: WSDL first :: HTTP</name>
 
 </project>

Modified: incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,13 +25,12 @@
 
     <parent>
         <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>samples</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <artifactId>wsdl-first</artifactId>
+        <version>3.0-M2-incubating</version>
     </parent>
 
     <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
     <artifactId>jsr181-su</artifactId>
-    <version>3.0-SNAPSHOT</version>
     <name>ServiceMix :: Samples :: WSDL first :: JSR181</name>
 
     <dependencies>

Modified: incubator/servicemix/trunk/samples/wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/pom.xml Mon Jun 19 15:38:51 2006
@@ -23,9 +23,14 @@
 
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>samples</artifactId>
+        <version>3.0-M2-incubating</version>
+    </parent>
+
     <groupId>org.apache.servicemix.samples</groupId>
     <artifactId>wsdl-first</artifactId>
-    <version>3.0-SNAPSHOT</version>
     <name>ServiceMix :: Samples :: WSDL first</name>
     <packaging>pom</packaging>
     
@@ -48,17 +53,19 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.1</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/src.xml</descriptor>
-                    </descriptors>
-                </configuration>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
+                        <id>src</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/src.xml</descriptor>
+                            </descriptors>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,13 +25,12 @@
 
     <parent>
         <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>samples</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <artifactId>wsdl-first</artifactId>
+        <version>3.0-M2-incubating</version>
     </parent>
 
     <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
     <artifactId>sa</artifactId>
-    <version>3.0-SNAPSHOT</version>
     <name>ServiceMix :: Samples :: WSDL first :: SA</name>
     <packaging>pom</packaging>
     
@@ -39,12 +38,12 @@
       <dependency>
         <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
         <artifactId>jsr181-su</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
         <artifactId>http-su</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M2-incubating</version>
       </dependency>
     </dependencies>
 
@@ -57,7 +56,7 @@
         <executions>        
           <execution>
             <id>bin</id>
-            <phase>install</phase>
+            <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>

Modified: incubator/servicemix/trunk/servicemix-beanflow/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-beanflow/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-beanflow/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-beanflow/pom.xml Mon Jun 19 15:38:51 2006
@@ -23,12 +23,11 @@
   <parent>
   <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <groupId>org.apache.servicemix</groupId>
   <artifactId>servicemix-beanflow</artifactId>
-  <version>3.0-SNAPSHOT</version>
 
   <name>ServiceMix :: BeanFlow</name>
   <description>A library for orchestrating beans and asynchronous events using regular POJOs rather than XML</description>
@@ -50,14 +49,14 @@
   </dependencies>
 
   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: incubator/servicemix/trunk/servicemix-bpe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-bpe/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-bpe</artifactId>

Modified: incubator/servicemix/trunk/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-common/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-common/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-common</artifactId>

Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-components</artifactId>

Modified: incubator/servicemix/trunk/servicemix-console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-console/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-console/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-console/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-console</artifactId>

Modified: incubator/servicemix/trunk/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-core</artifactId>

Modified: incubator/servicemix/trunk/servicemix-eip/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-eip/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-eip/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-eip</artifactId>

Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-http</artifactId>

Modified: incubator/servicemix/trunk/servicemix-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-itests/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-itests/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-itests/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-itests</artifactId>

Modified: incubator/servicemix/trunk/servicemix-jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jbi/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jbi/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jbi/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-jbi</artifactId>

Modified: incubator/servicemix/trunk/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-jms</artifactId>

Modified: incubator/servicemix/trunk/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-jsr181</artifactId>

Modified: incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-lwcontainer</artifactId>

Modified: incubator/servicemix/trunk/servicemix-sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-sca/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-sca</artifactId>

Modified: incubator/servicemix/trunk/servicemix-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-services/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-services/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-services/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-services</artifactId>

Modified: incubator/servicemix/trunk/servicemix-soap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-soap/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-soap/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-soap/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-soap</artifactId>

Modified: incubator/servicemix/trunk/servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-web/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-web/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-web/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-web</artifactId>

Modified: incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-wsn2005/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-wsn2005</artifactId>

Modified: incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml Mon Jun 19 15:38:51 2006
@@ -26,7 +26,7 @@
 	<parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-		<version>1.0-SNAPSHOT</version>
+    <version>1.0-M2-incubating</version>
 	</parent>
 
 	<artifactId>jbi-maven-plugin</artifactId>
@@ -44,11 +44,6 @@
 		</url>
 	</scm>
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.servicemix</groupId>
-			<artifactId>servicemix-core</artifactId>
-			<version>3.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>

Modified: incubator/servicemix/trunk/tooling/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/pom.xml Mon Jun 19 15:38:51 2006
@@ -25,12 +25,12 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-M2-incubating</version>
   </parent>
   
   <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>tooling</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0-M2-incubating</version>
   <name>ServiceMix :: Tooling</name>
   <url>http://servicemix.org</url>
   <packaging>pom</packaging>

Modified: incubator/servicemix/trunk/tooling/servicemix-binding-component/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-binding-component/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-binding-component/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-binding-component/pom.xml Mon Jun 19 15:38:51 2006
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-binding-component</artifactId>

Modified: incubator/servicemix/trunk/tooling/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml Mon Jun 19 15:38:51 2006
@@ -39,8 +39,8 @@
     </repository>
   </repositories>
   <properties>
-    <servicemixVersion>3.0-SNAPSHOT</servicemixVersion>
-    <servicemixJbiPluginVersion>1.0-SNAPSHOT</servicemixJbiPluginVersion>
+    <servicemixVersion>3.0-M2-incubating</servicemixVersion>
+    <servicemixJbiPluginVersion>1.0-M2-incubating</servicemixJbiPluginVersion>
     <xbeanPluginVersion>2.4</xbeanPluginVersion>
   </properties>
   <dependencies>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml Mon Jun 19 15:38:51 2006
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-service-assembly</artifactId>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml Mon Jun 19 15:38:51 2006
@@ -34,8 +34,8 @@
     </repository>
   </repositories>
   <properties>
-    <servicemixVersion>3.0-SNAPSHOT</servicemixVersion>
-    <servicemixJbiPluginVersion>1.0-SNAPSHOT</servicemixJbiPluginVersion>
+    <servicemixVersion>3.0-M2-incubating</servicemixVersion>
+    <servicemixJbiPluginVersion>1.0-M2-incubating</servicemixJbiPluginVersion>
     <xbeanPluginVersion>2.4</xbeanPluginVersion>
   </properties>
   <dependencies>    

Modified: incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml Mon Jun 19 15:38:51 2006
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-service-engine</artifactId>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml Mon Jun 19 15:38:51 2006
@@ -34,8 +34,8 @@
     </repository>
   </repositories>
   <properties>
-    <servicemixVersion>3.0-SNAPSHOT</servicemixVersion>
-    <servicemixJbiPluginVersion>1.0-SNAPSHOT</servicemixJbiPluginVersion>
+    <servicemixVersion>3.0-M2-incubating</servicemixVersion>
+    <servicemixJbiPluginVersion>1.0-M2-incubating</servicemixJbiPluginVersion>
     <xbeanPluginVersion>2.4</xbeanPluginVersion>
   </properties>
   <dependencies>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml Mon Jun 19 15:38:51 2006
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-M2-incubating</version>
   </parent>
 
   <artifactId>servicemix-service-unit</artifactId>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml?rev=415445&r1=415444&r2=415445&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml Mon Jun 19 15:38:51 2006
@@ -34,8 +34,8 @@
     </repository>
   </repositories>
   <properties>
-    <servicemixVersion>3.0-SNAPSHOT</servicemixVersion>
-    <servicemixJbiPluginVersion>1.0-SNAPSHOT</servicemixJbiPluginVersion>
+    <servicemixVersion>3.0-M2-incubating</servicemixVersion>
+    <servicemixJbiPluginVersion>1.0-M2-incubating</servicemixJbiPluginVersion>
     <xbeanPluginVersion>2.4</xbeanPluginVersion>
   </properties>
   <dependencies>