You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2009/11/22 08:05:00 UTC

svn commit: r883044 - in /servicemix/smx3/trunk: distributions/apache-servicemix/pom.xml pom.xml

Author: jbonofre
Date: Sun Nov 22 07:04:58 2009
New Revision: 883044

URL: http://svn.apache.org/viewvc?rev=883044&view=rev
Log:
Upgrade to components set 2009.02-SNAPSHOT and use the latest released servicemix-pom and servicemix-utils,
Upgrade to ActiveMQ 5.3.

Modified:
    servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
    servicemix/smx3/trunk/pom.xml

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=883044&r1=883043&r2=883044&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Sun Nov 22 07:04:58 2009
@@ -149,15 +149,13 @@
       <artifactId>servicemix-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-components</artifactId>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-exec</artifactId>
     </dependency>
-    <!--
     <dependency>
       <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-beanflow</artifactId>
+      <artifactId>servicemix-components</artifactId>
     </dependency>
-    -->
     <dependency>
       <groupId>org.apache.servicemix.samples</groupId>
       <artifactId>servicemix-web</artifactId>
@@ -524,7 +522,14 @@
                   <version>${servicemix-camel-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>
-                </artifactItem>                
+                </artifactItem>
+                <artifactItem>
+                    <groupId>org.apache.servicemix</groupId>
+                    <artifactId>servicemix-exec</artifactId>
+                    <version>${servicemix-exec-version}</version>
+                    <classifier>installer</classifier>
+                    <type>zip</type>
+                </artifactItem>            
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-shared</artifactId>

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=883044&r1=883043&r2=883044&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Sun Nov 22 07:04:58 2009
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix</groupId>
         <artifactId>servicemix-pom</artifactId>
-        <version>3</version>
+        <version>4</version>
     </parent>
 
     <groupId>org.apache.servicemix</groupId>
@@ -49,34 +49,35 @@
     </scm>
 
     <properties>
-        <servicemix-utils-version>1.1.0</servicemix-utils-version>
+        <servicemix-utils-version>1.2.0</servicemix-utils-version>
         <servicemix-specs-version>1.1.0</servicemix-specs-version>
-        <servicemix-common-version>2009.01</servicemix-common-version>
+        <servicemix-common-version>2009.02-SNAPSHOT</servicemix-common-version>
         <servicemix-shared-version>2009.02-SNAPSHOT</servicemix-shared-version>
-        <servicemix-quartz-version>2009.01</servicemix-quartz-version>  
-        <servicemix-jms-version>2009.01</servicemix-jms-version>
-        <servicemix-jsr181-version>2009.01</servicemix-jsr181-version>
-        <servicemix-http-version>2009.01</servicemix-http-version>
-        <servicemix-mail-version>2009.01</servicemix-mail-version>
-        <servicemix-osworkflow-version>2009.01</servicemix-osworkflow-version>
-        <servicemix-wsn2005-version>2009.01</servicemix-wsn2005-version>
+        <servicemix-quartz-version>2009.02-SNAPSHOT</servicemix-quartz-version>  
+        <servicemix-jms-version>2009.02-SNAPSHOT</servicemix-jms-version>
+        <servicemix-jsr181-version>2009.02-SNAPSHOT</servicemix-jsr181-version>
+        <servicemix-http-version>2009.02-SNAPSHOT</servicemix-http-version>
+        <servicemix-mail-version>2009.02-SNAPSHOT</servicemix-mail-version>
+        <servicemix-osworkflow-version>2009.02-SNAPSHOT</servicemix-osworkflow-version>
+        <servicemix-wsn2005-version>2009.02-SNAPSHOT</servicemix-wsn2005-version>
         <servicemix-lwcontainer-version>3.3.2-SNAPSHOT</servicemix-lwcontainer-version>
-        <servicemix-bean-version>2009.01</servicemix-bean-version>
-        <servicemix-eip-version>2009.01</servicemix-eip-version>
-        <servicemix-script-version>2009.01</servicemix-script-version>
-        <servicemix-scripting-version>2009.01</servicemix-scripting-version>
-        <servicemix-validation-version>2009.01</servicemix-validation-version>
-        <servicemix-ftp-version>2009.01</servicemix-ftp-version>
-        <servicemix-xmpp-version>2009.01</servicemix-xmpp-version>
-        <servicemix-saxon-version>2009.01</servicemix-saxon-version>
-        <servicemix-truezip-version>2009.01</servicemix-truezip-version>
-        <servicemix-camel-version>2009.01</servicemix-camel-version>
+        <servicemix-bean-version>2009.02-SNAPSHOT</servicemix-bean-version>
+        <servicemix-eip-version>2009.02-SNAPSHOT</servicemix-eip-version>
+        <servicemix-script-version>2009.02-SNAPSHOT</servicemix-script-version>
+        <servicemix-scripting-version>2009.02-SNAPSHOT</servicemix-scripting-version>
+        <servicemix-validation-version>2009.02-SNAPSHOT</servicemix-validation-version>
+        <servicemix-ftp-version>2009.02-SNAPSHOT</servicemix-ftp-version>
+        <servicemix-xmpp-version>2009.02-SNAPSHOT</servicemix-xmpp-version>
+        <servicemix-saxon-version>2009.02-SNAPSHOT</servicemix-saxon-version>
+        <servicemix-truezip-version>2009.02-SNAPSHOT</servicemix-truezip-version>
+        <servicemix-camel-version>2009.02-SNAPSHOT</servicemix-camel-version>
         <servicemix-cxf-bc-version>2009.02-SNAPSHOT</servicemix-cxf-bc-version>
         <servicemix-cxf-se-version>2009.02-SNAPSHOT</servicemix-cxf-se-version>
         <servicemix-drools-version>2009.01</servicemix-drools-version>
-        <servicemix-file-version>2009.01</servicemix-file-version>
-        <servicemix-snmp-version>2009.01</servicemix-snmp-version>
-        <servicemix-smpp-version>2009.01</servicemix-smpp-version>
+        <servicemix-file-version>2009.02-SNAPSHOT</servicemix-file-version>
+        <servicemix-snmp-version>2009.02-SNAPSHOT</servicemix-snmp-version>
+        <servicemix-smpp-version>2009.02-SNAPSHOT</servicemix-smpp-version>
+        <servicemix-exec-version>2009.02-SNAPSHOT</servicemix-exec-version>
         <res-maven-plugin-version>4.0</res-maven-plugin-version>
         <servicemix-build-version>1.0</servicemix-build-version>
         
@@ -85,9 +86,9 @@
         <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
         <xbean-version>3.4.3</xbean-version>
         <spring-version>2.5.6</spring-version>
-        <activemq-version>5.2.0</activemq-version>
+        <activemq-version>5.3.0</activemq-version>
         <activeio-version>3.1.0</activeio-version>
-        <camel-version>1.6.0</camel-version>
+        <camel-version>2.0.0</camel-version>
         <jencks-version>2.2</jencks-version>
         <jetty-version>6.1.14</jetty-version>
         <geronimo-version>2.0.2</geronimo-version>
@@ -109,19 +110,6 @@
         <previous.releases>3.1.2,3.2,3.2.1,3.2.2,3.2.3,3.3,3.3.1</previous.releases>
     </properties>
 
-    <!-- TODO: remove after the release of the new ServiceMix parent POM -->
-    <repositories>
-      <repository>
-        <id>apache.snapshots</id>
-        <name>Apache Snapshot Repository</name>
-
-        <url>http://repository.apache.org/snapshots</url>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-      </repository>
-    </repositories>
-
     <profiles>
         <profile>
             <id>all</id>
@@ -471,13 +459,6 @@
                 <artifactId>servicemix-console</artifactId>
                 <version>3.3.2-SNAPSHOT</version>
             </dependency>
-            <!--
-            <dependency>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>servicemix-gbean</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
-            </dependency>
-          -->
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jms</artifactId>
@@ -513,13 +494,6 @@
                 <artifactId>servicemix-osworkflow</artifactId>
                 <version>${servicemix-osworkflow-version}</version>
             </dependency>
-            <!--
-            <dependency>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>servicemix-sca</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
-            </dependency>
-          -->
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap</artifactId>
@@ -621,6 +595,11 @@
                 <version>${servicemix-drools-version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.servicemix</groupId>
+                <artifactId>servicemix-exec</artifactId>
+                <version>${servicemix-exec-version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.servicemix.samples</groupId>
                 <artifactId>servicemix-web</artifactId>
                 <version>3.3.2-SNAPSHOT</version>