You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2008/06/23 21:01:54 UTC

svn commit: r670711 - in /servicemix/smx3/trunk: ./ archetypes/ build/ common/ common/servicemix-beanflow/ common/servicemix-common/ common/servicemix-soap/ common/servicemix-soap2/ core/ core/servicemix-audit/ core/servicemix-core/ deployables/ deploy...

Author: chirino
Date: Mon Jun 23 12:01:52 2008
New Revision: 670711

URL: http://svn.apache.org/viewvc?rev=670711&view=rev
Log:
Updated build to use the new independently released components. See: 
http://cwiki.apache.org/SM/discussion-forums.html#nabble-td15844936s12049



Removed:
    servicemix/smx3/trunk/archetypes/
    servicemix/smx3/trunk/build/
    servicemix/smx3/trunk/common/servicemix-beanflow/
    servicemix/smx3/trunk/common/servicemix-common/
    servicemix/smx3/trunk/common/servicemix-soap/
    servicemix/smx3/trunk/common/servicemix-soap2/
    servicemix/smx3/trunk/deployables/bindingcomponents/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-bean/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-camel/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-drools/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-eip/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-jsr181/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-osworkflow/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-quartz/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-saxon/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-script/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-scripting/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-validation/
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-wsn2005/
    servicemix/smx3/trunk/deployables/sharedlibraries/
    servicemix/smx3/trunk/tooling/
Modified:
    servicemix/smx3/trunk/common/pom.xml
    servicemix/smx3/trunk/core/pom.xml
    servicemix/smx3/trunk/core/servicemix-audit/pom.xml
    servicemix/smx3/trunk/core/servicemix-core/pom.xml
    servicemix/smx3/trunk/deployables/pom.xml
    servicemix/smx3/trunk/deployables/serviceengines/pom.xml
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java
    servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
    servicemix/smx3/trunk/distributions/pom.xml
    servicemix/smx3/trunk/parent/pom.xml
    servicemix/smx3/trunk/platforms/pom.xml
    servicemix/smx3/trunk/pom.xml
    servicemix/smx3/trunk/samples/bridge/bridge-eip-su/pom.xml
    servicemix/smx3/trunk/samples/bridge/bridge-http-su/pom.xml
    servicemix/smx3/trunk/samples/bridge/bridge-jms-su/pom.xml
    servicemix/smx3/trunk/samples/bridge/bridge-xslt-su/pom.xml
    servicemix/smx3/trunk/samples/camel/pom.xml
    servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml
    servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
    servicemix/smx3/trunk/samples/loan-broker/loan-broker-bean-su/pom.xml
    servicemix/smx3/trunk/samples/loan-broker/loan-broker-drools-su/pom.xml
    servicemix/smx3/trunk/samples/loan-broker/loan-broker-jms-su/pom.xml
    servicemix/smx3/trunk/samples/pom.xml
    servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml
    servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml
    servicemix/smx3/trunk/servicemix-itests/pom.xml
    servicemix/smx3/trunk/web/pom.xml

Modified: servicemix/smx3/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/pom.xml (original)
+++ servicemix/smx3/trunk/common/pom.xml Mon Jun 23 12:01:52 2008
@@ -34,19 +34,15 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>servicemix-common</module>
         <module>servicemix-components</module>
-        <module>servicemix-soap</module>
-        <module>servicemix-soap2</module>
-        <module>servicemix-beanflow</module>
     </modules>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -61,8 +57,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/smx3/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/pom.xml (original)
+++ servicemix/smx3/trunk/core/pom.xml Mon Jun 23 12:01:52 2008
@@ -44,8 +44,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -60,8 +60,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/smx3/trunk/core/servicemix-audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-audit/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-audit/pom.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-audit/pom.xml Mon Jun 23 12:01:52 2008
@@ -57,7 +57,8 @@
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
+        <artifactId>servicemix-build</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <goals>

Modified: servicemix/smx3/trunk/core/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/pom.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/pom.xml Mon Jun 23 12:01:52 2008
@@ -319,7 +319,8 @@
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
+        <artifactId>servicemix-build</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <goals>

Modified: servicemix/smx3/trunk/deployables/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/pom.xml Mon Jun 23 12:01:52 2008
@@ -34,9 +34,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>sharedlibraries</module>
         <module>serviceengines</module>
-        <module>bindingcomponents</module>
     </modules>
 
     <build>

Modified: servicemix/smx3/trunk/deployables/serviceengines/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/pom.xml Mon Jun 23 12:01:52 2008
@@ -34,27 +34,14 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>servicemix-bean</module>
-    <module>servicemix-camel</module>
-    <module>servicemix-cxf-se</module>
-    <module>servicemix-drools</module>
-    <module>servicemix-eip</module>
-    <module>servicemix-jsr181</module>
-    <module>servicemix-quartz</module>
     <module>servicemix-lwcontainer</module>
-    <module>servicemix-osworkflow</module>
-    <module>servicemix-saxon</module>
-    <module>servicemix-script</module>
-    <module>servicemix-scripting</module>
-    <module>servicemix-wsn2005</module>
-    <module>servicemix-validation</module>
   </modules>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
+        <artifactId>servicemix-build</artifactId>
         <executions>
           <execution>
             <goals>
@@ -66,4 +53,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml Mon Jun 23 12:01:52 2008
@@ -49,8 +49,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>quartz</groupId>
-      <artifactId>quartz</artifactId>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-quartz</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -66,6 +66,26 @@
           <component>org.apache.servicemix.lwcontainer.LwContainerComponent</component>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>log4j.configuration</name>
+              <value>log4j-tests.properties</value>
+            </property>
+            <property>
+              <name>servicemix-shared-version</name>
+              <value>${servicemix-shared-version}</value>
+            </property>
+            <property>
+              <name>servicemix-quartz-version</name>
+              <value>${servicemix-quartz-version}</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/src/test/java/org/apache/servicemix/lwcontainer/LwContainerComponentTest.java Mon Jun 23 12:01:52 2008
@@ -111,14 +111,14 @@
         InstallSharedLibrary isl = new InstallSharedLibrary();
         isl.setGroupId("org.apache.servicemix");
         isl.setArtifactId("servicemix-shared");
-        isl.setVersion(getServiceMixVersion());
+        isl.setVersion(System.getProperty("servicemix-shared-version", "3.2.1"));
         isl.afterPropertiesSet();
         isl.deploy(container);
 
         InstallComponent ic = new InstallComponent();
         ic.setGroupId("org.apache.servicemix");
         ic.setArtifactId("servicemix-quartz");
-        ic.setVersion(getServiceMixVersion());
+        ic.setVersion(System.getProperty("servicemix-quartz-version", "3.2.1"));
         ic.afterPropertiesSet();
         ic.deploy(container);
 

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Mon Jun 23 12:01:52 2008
@@ -144,10 +144,12 @@
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-components</artifactId>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-beanflow</artifactId>
     </dependency>
+    -->
     <dependency>
       <groupId>org.apache.servicemix.samples</groupId>
       <artifactId>servicemix-web</artifactId>
@@ -326,161 +328,161 @@
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-http</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-http-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-jms</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-jms-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-wsn2005</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-wsn2005-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-drools</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-drools-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-eip</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-eip-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-script</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-script-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-scripting</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-scripting-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-validation</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-validation-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-file</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-file-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-ftp</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-ftp-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-xmpp</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-xmpp-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-saxon</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-saxon-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-quartz</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-quartz-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-jsr181</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-jsr181-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-mail</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-mail-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-osworkflow</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-osworkflow-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-lwcontainer</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-lwcontainer-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>                
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-bean</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-bean-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>                
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-truezip</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-truezip-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>                
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-cxf-se</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-cxf-se-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>                
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-cxf-bc</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-cxf-bc-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>                
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-camel</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-camel-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>                
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-shared</artifactId>
-                  <version>${servicemix-version}</version>
+                  <version>${servicemix-shared-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
                 </artifactItem>

Modified: servicemix/smx3/trunk/distributions/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/pom.xml Mon Jun 23 12:01:52 2008
@@ -42,8 +42,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -58,8 +58,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -69,8 +69,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>${project.version}</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
                 <executions>

Modified: servicemix/smx3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/parent/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/parent/pom.xml (original)
+++ servicemix/smx3/trunk/parent/pom.xml Mon Jun 23 12:01:52 2008
@@ -58,8 +58,8 @@
               <dependencies>
                 <dependency>
                   <groupId>org.apache.servicemix</groupId>
-                  <artifactId>build</artifactId>
-                  <version>${project.version}</version>
+                  <artifactId>servicemix-build</artifactId>
+                  <version>1.0</version>
                 </dependency>
               </dependencies>
               <executions>
@@ -87,8 +87,8 @@
               <dependencies>
                 <dependency>
                   <groupId>org.apache.servicemix</groupId>
-                  <artifactId>build</artifactId>
-                  <version>${project.version}</version>
+                  <artifactId>servicemix-build</artifactId>
+                  <version>1.0</version>
                 </dependency>
               </dependencies>
               <configuration>
@@ -141,8 +141,8 @@
                       <dependencies>
                           <dependency>
                               <groupId>org.apache.servicemix</groupId>
-                              <artifactId>build</artifactId>
-                              <version>${project.version}</version>
+                              <artifactId>servicemix-build</artifactId>
+                              <version>1.0</version>
                           </dependency>
                       </dependencies>
                       <executions>
@@ -180,8 +180,8 @@
           <dependencies>
               <dependency>
                   <groupId>org.apache.servicemix</groupId>
-                  <artifactId>build</artifactId>
-                  <version>${project.version}</version>
+                  <artifactId>servicemix-build</artifactId>
+                  <version>1.0</version>
               </dependency>
           </dependencies>
           <executions>

Modified: servicemix/smx3/trunk/platforms/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/pom.xml Mon Jun 23 12:01:52 2008
@@ -41,8 +41,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -57,8 +57,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Mon Jun 23 12:01:52 2008
@@ -22,190 +22,57 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache</groupId>
-        <artifactId>apache</artifactId>
-        <version>1</version>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-pom</artifactId>
+        <version>1.0</version>
     </parent>
 
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix</artifactId>
+    <version>3.3-SNAPSHOT</version>
     <packaging>pom</packaging>
+
     <name>ServiceMix</name>
-    <version>3.3-SNAPSHOT</version>
     <description>
     ServiceMix is an open source ESB based on the Java Business
     Integration framework - JSR-208 
     </description>
-    <url>http://servicemix.apache.org/</url>
+    
     <prerequisites>
         <maven>2.0.6</maven>
     </prerequisites>
-    <inceptionYear>2005</inceptionYear>
-
-    <issueManagement>
-        <system>jira</system>
-        <url>http://issues.apache.org/activemq/browse/SM</url>
-    </issueManagement>
-
-    <ciManagement>
-        <system>continuum</system>
-        <notifiers>
-            <!--notifier>
-                <type>mail</type>
-                <configuration>
-                    <address>servicemix-commits@geronimo.apache.org</address>
-                </configuration>
-                <sendOnSuccess>false</sendOnSuccess>
-            </notifier>
-            <notifier>
-              <type>irc</type>
-              <configuration>
-                <host>irc.codehaus.org</host>
-                <port>6667</port>
-                <channel>#servicemix</channel>
-              </configuration>
-              <sendOnSuccess>false</sendOnSuccess>
-            </notifier-->
-        </notifiers>
-    </ciManagement>
-
-    <mailingLists>
-        <mailingList>
-            <name>ServiceMix Developer List</name>
-            <subscribe>servicemix-dev-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>servicemix-dev-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>servicemix-dev@geronimo.apache.org</post>
-            <archive>http://www.nabble.com/ServiceMix---Dev-f12051.html</archive>
-            <otherArchives>
-                <otherArchive>http://dir.gmane.org/gmane.comp.java.servicemix.devel</otherArchive>
-                <otherArchive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-dev/</otherArchive>
-            </otherArchives>
-        </mailingList>
-        <mailingList>
-            <name>ServiceMix User List</name>
-            <subscribe>servicemix-users-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>servicemix-users-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>servicemix-users@geronimo.apache.org</post>
-            <archive>http://www.nabble.com/ServiceMix---User-f12050.html</archive>
-            <otherArchives>
-                <otherArchive>http://dir.gmane.org/gmane.comp.java.servicemix.user</otherArchive>
-                <otherArchive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-users/</otherArchive>
-            </otherArchives>
-        </mailingList>
-        <mailingList>
-            <name>ServiceMix SCM List</name>
-            <subscribe>servicemix-commits-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>servicemix-commits-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>servicemix-commits@geronimo.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-servicemix-commits/</archive>
-        </mailingList>
-    </mailingLists>
-
-    <developers>
-        <developer>
-            <id>rajdavies</id>
-            <name>Rob Davies</name>
-            <email>rajdavies@gmail.com</email>
-            <organization>Exist Labs</organization>
-        </developer>
-        <developer>
-            <id>jstrachan</id>
-            <name>James Strachan</name>
-            <email>jstrachan@logicblaze.com</email>
-            <organization>LogicBlaze</organization>
-            <organizationUrl>http://www.logicblaze.com/</organizationUrl>
-        </developer>
-        <developer>
-            <id>chirino</id>
-            <name>Hiram Chirino</name>
-            <email>hiram@logicblaze.com</email>
-            <organization>LogicBlaze</organization>
-            <organizationUrl>http://www.logicblaze.com/</organizationUrl>
-        </developer>
-        <developer>
-            <id>dandiep</id>
-            <name>Dan Diephouse</name>
-            <email>dandiep@codehaus.org</email>
-            <organization>dandiep</organization>
-        </developer>
-        <developer>
-            <id>pdodds</id>
-            <name>Philip Dodds</name>
-            <email>philip.dodds@gmail.com</email>
-            <organization>Five Clouds</organization>
-        </developer>
-        <developer>
-            <id>jlim</id>
-            <name>Jonas Lim</name>
-            <email>jlim@exist.com</email>
-            <organization>Exist Labs</organization>
-        </developer>
-        <developer>
-            <id>ffang</id>
-            <name>Freeman Fang</name>
-            <email>freeman.fang@gmail.com</email>
-            <organization>IONA</organization>
-        </developer>
-        <developer>
-            <id>foconer</id>
-            <name>Frederick Oconer</name>
-            <email>foconer@exist.com</email>
-            <organization>Exist Labs</organization>
-        </developer>
-        <developer>
-            <id>jgapuz</id>
-            <name>Joseph Gapuz</name>
-            <email>jgapuz@exist.com</email>
-            <organization>Exist Labs</organization>
-        </developer>
-        <developer>
-            <id>pvillacorta</id>
-            <name>Patrick Villacorta</name>
-            <email>pvillacorta@exist.com</email>
-            <organization>Exist Labs</organization>
-        </developer>
-        <developer>
-            <id>dflores</id>
-            <name>Darwin Flores</name>
-            <email>dflores@exist.com</email>
-            <organization>Exist Labs</organization>
-        </developer>
-        <developer>
-            <id>myap</id>
-            <name>Merwin Yap</name>
-            <email>myap@exist.com</email>
-            <organization>Exist Labs</organization>
-        </developer>
-        <developer>
-            <id>gnt</id>
-            <name>Guillaume Nodet</name>
-            <email>gnodet@logicblaze.com</email>
-            <organization>LogicBlaze</organization>
-            <organizationUrl>http://www.logicblaze.com/</organizationUrl>
-            <timezone>+1</timezone>
-        </developer>
-        <developer>
-            <id>gastaldi</id>
-            <name>George Gastaldi</name>
-            <email>gastaldi@apache.org</email>
-        </developer>
-        <developer>
-            <id>lhein</id>
-            <name>Lars Heinemann</name>
-            <email>lhein@apache.org</email>
-            <organization>Compart Systemhaus GmbH</organization>
-            <organizationUrl>http://www.compart.net/</organizationUrl>
-            <timezone>+1</timezone>
-        </developer>
-    </developers>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/trunk</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/smx3/trunk/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/smx3/trunk/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/servicemix/smx3/trunk/</url>
     </scm>
 
     <properties>
+        <servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
+        <servicemix-quartz-version>4.0-SNAPSHOT</servicemix-quartz-version>  
+        <servicemix-jms-version>4.0-SNAPSHOT</servicemix-jms-version>
+        <servicemix-jsr181-version>4.0-SNAPSHOT</servicemix-jsr181-version>
+        <servicemix-http-version>4.0-SNAPSHOT</servicemix-http-version>
+        <servicemix-mail-version>4.0-SNAPSHOT</servicemix-mail-version>
+        <servicemix-osworkflow-version>4.0-SNAPSHOT</servicemix-osworkflow-version>
+        <servicemix-wsn2005-version>4.0-SNAPSHOT</servicemix-wsn2005-version>
+        <servicemix-lwcontainer-version>3.3-SNAPSHOT</servicemix-lwcontainer-version>
+        <servicemix-bean-version>4.0-SNAPSHOT</servicemix-bean-version>
+        <servicemix-eip-version>4.0-SNAPSHOT</servicemix-eip-version>
+        <servicemix-script-version>4.0-SNAPSHOT</servicemix-script-version>
+        <servicemix-scripting-version>4.0-SNAPSHOT</servicemix-scripting-version>
+        <servicemix-validation-version>4.0-SNAPSHOT</servicemix-validation-version>
+        <servicemix-ftp-version>4.0-SNAPSHOT</servicemix-ftp-version>
+        <servicemix-xmpp-version>4.0-SNAPSHOT</servicemix-xmpp-version>
+        <servicemix-saxon-version>4.0-SNAPSHOT</servicemix-saxon-version>
+        <servicemix-truezip-version>4.0-SNAPSHOT</servicemix-truezip-version>
+        <servicemix-camel-version>4.0-SNAPSHOT</servicemix-camel-version>
+        <servicemix-cxf-bc-version>4.0-SNAPSHOT</servicemix-cxf-bc-version>
+        <servicemix-cxf-se-version>4.0-SNAPSHOT</servicemix-cxf-se-version>
+        <servicemix-drools-version>4.0-SNAPSHOT</servicemix-drools-version>
+        <servicemix-file-version>4.0-SNAPSHOT</servicemix-file-version>
+        
         <xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
         <xfire-version>1.2.5</xfire-version>
         <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
@@ -238,7 +105,7 @@
         <snapshots-repo-id>apache.snapshots</snapshots-repo-id>
         <snapshots-repo-name>Apache Snapshots Repository</snapshots-repo-name>
         <snapshots-repo-url>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo-url>
-        <previous.releases>3.1.2,3.2,3.2.1</previous.releases>  
+        <previous.releases>3.1.2,3.2,3.2.1</previous.releases>
     </properties>
 
     <profiles>
@@ -248,13 +115,10 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>build</module>
                 <module>parent</module>
                 <module>core</module>
-                <module>common</module>
-                <module>tooling</module>
                 <module>deployables</module>
-                <module>archetypes</module>
+                <module>common</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -271,11 +135,9 @@
                 </property>
             </activation>
             <modules>
-                <module>build</module>
                 <module>parent</module>
                 <module>core</module>
                 <module>common</module>
-                <module>tooling</module>
             </modules>
         </profile>
         <profile>
@@ -287,8 +149,6 @@
                 </property>
             </activation>
             <modules>
-                <module>deployables</module>
-                <module>archetypes</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -333,12 +193,8 @@
         <profile>
             <id>deploy</id>
             <modules>
-                <module>build</module>
                 <module>core</module>
                 <module>common</module>
-                <module>tooling</module>
-                <module>deployables</module>
-                <module>archetypes</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -385,13 +241,9 @@
            <profile>
 	          <id>setup.eclipse</id>
             <modules>
-                <module>build</module>
                 <module>parent</module>
                 <module>core</module>
                 <module>common</module>
-                <module>tooling</module>
-                <module>deployables</module>
-                <module>archetypes</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -428,8 +280,8 @@
 	                    <dependencies>
 							<dependency>
 								<groupId>org.apache.servicemix</groupId>
-								<artifactId>build</artifactId>
-								<version>${servicemix-version}</version>
+								<artifactId>servicemix-build</artifactId>
+								<version>1.0</version>
 							</dependency>
 	                        <dependency>
 	                            <groupId>ant</groupId>
@@ -719,142 +571,151 @@
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-common</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-shared-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-console</artifactId>
                 <version>3.3-SNAPSHOT</version>
             </dependency>
+            <!--
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-gbean</artifactId>
                 <version>3.3-SNAPSHOT</version>
             </dependency>
+          -->
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jms</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-jms-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jsr181</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-jsr181-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-http</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-http-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-mail</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-mail-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-osworkflow</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-osworkflow-version}</version>
             </dependency>
+            <!--
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-sca</artifactId>
                 <version>3.3-SNAPSHOT</version>
             </dependency>
+          -->
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-shared-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap2</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-shared-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-shared</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-shared-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-wsn2005</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-wsn2005-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-lwcontainer</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-lwcontainer-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-bean</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-bean-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-eip</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-eip-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-script</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-script-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-scripting</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-scripting-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-validation</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-validation-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-file</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-file-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-ftp</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-ftp-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-xmpp</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-xmpp-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-quartz</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-quartz-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-saxon</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-saxon-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-truezip</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-truezip-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-cxf-bc</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-cxf-bc-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-cxf-se</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-cxf-se-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-camel</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-camel-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix</groupId>
+                <artifactId>servicemix-drools</artifactId>
+                <version>${servicemix-drools-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.samples</groupId>
@@ -893,11 +754,13 @@
                 <version>3.3-SNAPSHOT</version>
                 <type>pom</type>
             </dependency>
+            <!--
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-beanflow</artifactId>
                 <version>3.3-SNAPSHOT</version>
             </dependency>
+          -->
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-web-console</artifactId>
@@ -2024,7 +1887,7 @@
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
                     <artifactId>jbi-maven-plugin</artifactId>
-                    <version>3.3-SNAPSHOT</version>
+                    <version>3.2.1</version>
                     <extensions>true</extensions>
                 </plugin>
                 <plugin>

Modified: servicemix/smx3/trunk/samples/bridge/bridge-eip-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-eip-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/bridge/bridge-eip-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/bridge/bridge-eip-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-eip</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/bridge/bridge-http-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-http-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/bridge/bridge-http-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/bridge/bridge-http-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-http</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/bridge/bridge-jms-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-jms-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/bridge/bridge-jms-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/bridge/bridge-jms-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jms</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/bridge/bridge-xslt-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-xslt-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/bridge/bridge-xslt-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/bridge/bridge-xslt-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-saxon</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/camel/pom.xml (original)
+++ servicemix/smx3/trunk/samples/camel/pom.xml Mon Jun 23 12:01:52 2008
@@ -88,22 +88,6 @@
       </repository>
     </repositories>
 
-    <dependencyManagement>
-    <dependencies>    
-     <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-camel</artifactId>
-      <version>3.3-SNAPSHOT</version>
-     </dependency>
-
-     <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>3.3-SNAPSHOT</version>      
-     </dependency>  
-    </dependencies>
-  </dependencyManagement> 
-
     <build>
         <plugins>
             <plugin>

Modified: servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-cxf-bc</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-cxf-se</artifactId>
-            <version>${servicemix-version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.ws</groupId>
@@ -113,7 +112,6 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx3/trunk/samples/loan-broker/loan-broker-bean-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/loan-broker/loan-broker-bean-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/loan-broker/loan-broker-bean-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/loan-broker/loan-broker-bean-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,13 +36,11 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-bean</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
             <version>3.3-SNAPSHOT</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/loan-broker/loan-broker-drools-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/loan-broker/loan-broker-drools-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/loan-broker/loan-broker-drools-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/loan-broker/loan-broker-drools-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,18 +36,15 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-drools</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
-            <version>3.3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-common</artifactId>
-            <version>3.3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: servicemix/smx3/trunk/samples/loan-broker/loan-broker-jms-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/loan-broker/loan-broker-jms-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/loan-broker/loan-broker-jms-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/loan-broker/loan-broker-jms-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jms</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/pom.xml (original)
+++ servicemix/smx3/trunk/samples/pom.xml Mon Jun 23 12:01:52 2008
@@ -51,8 +51,8 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -67,8 +67,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-http</artifactId>
-            <version>3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml Mon Jun 23 12:01:52 2008
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-jsr181</artifactId>
-            <version>${servicemix-version}</version>
         </dependency>
     </dependencies>
 
@@ -52,7 +51,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>xfire-maven-plugin</artifactId>
-                <version>${servicemix-version}</version>
+                <version>4.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -72,7 +71,6 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
-                <version>${servicemix-version}</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

Modified: servicemix/smx3/trunk/servicemix-itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/servicemix-itests/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/servicemix-itests/pom.xml (original)
+++ servicemix/smx3/trunk/servicemix-itests/pom.xml Mon Jun 23 12:01:52 2008
@@ -124,8 +124,8 @@
       </plugin>
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
-        <version>${servicemix-version}</version>
+        <artifactId>servicemix-build</artifactId>
+        <version>1.0</version>
         <executions>
             <execution>
                 <goals>
@@ -140,8 +140,8 @@
         <dependencies>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
             </dependency>
         </dependencies>
       </plugin>

Modified: servicemix/smx3/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/web/pom.xml?rev=670711&r1=670710&r2=670711&view=diff
==============================================================================
--- servicemix/smx3/trunk/web/pom.xml (original)
+++ servicemix/smx3/trunk/web/pom.xml Mon Jun 23 12:01:52 2008
@@ -42,8 +42,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -58,8 +58,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>