servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r773040 - in /servicemix/smx3/trunk: ./ deployables/serviceengines/servicemix-lwcontainer/ samples/bridge-camel/ samples/bridge-camel/bridge-camel-sa/ samples/bridge-camel/bridge-camel-su/ samples/camel/camel-sa-itest/ samples/camel/camel-s...
Date Fri, 08 May 2009 16:03:04 GMT
Author: gertv
Date: Fri May  8 16:03:04 2009
New Revision: 773040

URL: http://svn.apache.org/viewvc?rev=773040&view=rev
Log:
Aligning versions with components and getting rid of snapshots to prepare for release

Modified:
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml
    servicemix/smx3/trunk/pom.xml
    servicemix/smx3/trunk/samples/bridge-camel/   (props changed)
    servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-sa/   (props changed)
    servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-su/   (props changed)
    servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml
    servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml

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=773040&r1=773039&r2=773040&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-lwcontainer/pom.xml Fri May
 8 16:03:04 2009
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-shared</artifactId>
-      <version>2008.01</version>
+      <version>${servicemix-shared-version}</version>
       <classifier>installer</classifier>
       <type>zip</type>
     </dependency>
@@ -55,7 +55,7 @@
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-quartz</artifactId>
       <scope>test</scope>
-      <version>2008.01</version>
+      <version>${servicemix-quartz-version}</version>
       <classifier>installer</classifier>
       <type>zip</type>
     </dependency>

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=773040&r1=773039&r2=773040&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Fri May  8 16:03:04 2009
@@ -49,7 +49,7 @@
     </scm>
 
     <properties>
-        <servicemix-utils-version>1.2.0-SNAPSHOT</servicemix-utils-version>
+        <servicemix-utils-version>1.1.0</servicemix-utils-version>
         <servicemix-specs-version>1.1.0</servicemix-specs-version>
         <servicemix-common-version>2009.01</servicemix-common-version>
         <servicemix-shared-version>2009.01</servicemix-shared-version>
@@ -87,9 +87,9 @@
         <spring-version>2.5.5</spring-version>
         <activemq-version>5.2.0</activemq-version>
         <activeio-version>3.1.0</activeio-version>
-        <camel-version>1.5.0</camel-version>
+        <camel-version>1.6.0</camel-version>
         <jencks-version>2.1</jencks-version>
-        <jetty-version>6.1.12rc1</jetty-version>
+        <jetty-version>6.1.14</jetty-version>
         <geronimo-version>2.0.1</geronimo-version>
         <servicemix-version>3.3.1-SNAPSHOT</servicemix-version>
         <wsdl4j-version>1.6.2</wsdl4j-version>
@@ -100,7 +100,7 @@
         <oro-version>2.0.8</oro-version>
         <sitemesh-version>2.2.1</sitemesh-version>
         <woden-version>1.0.0M6</woden-version>
-        <cxf-version>2.2.1-SNAPSHOT</cxf-version>
+        <cxf-version>2.1.4</cxf-version>
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.6</jaxb.impl.version>
         <jaxb.xjc.version>2.1.6</jaxb.xjc.version>
@@ -109,6 +109,19 @@
         <previous.releases>3.1.2,3.2,3.2.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>

Propchange: servicemix/smx3/trunk/samples/bridge-camel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May  8 16:03:04 2009
@@ -0,0 +1 @@
+target

Propchange: servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-sa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May  8 16:03:04 2009
@@ -0,0 +1 @@
+target

Propchange: servicemix/smx3/trunk/samples/bridge-camel/bridge-camel-su/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May  8 16:03:04 2009
@@ -0,0 +1 @@
+target

Modified: servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml?rev=773040&r1=773039&r2=773040&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml (original)
+++ servicemix/smx3/trunk/samples/camel/camel-sa-itest/pom.xml Fri May  8 16:03:04 2009
@@ -52,7 +52,7 @@
        <artifactId>servicemix-camel</artifactId>
        <classifier>installer</classifier>
        <type>zip</type>
-       <version>2008.01</version>
+       <version>${servicemix-camel-version}</version>
        <scope>test</scope>
     </dependency>
     <dependency>
@@ -60,7 +60,7 @@
        <artifactId>servicemix-shared</artifactId>
        <classifier>installer</classifier>
        <type>zip</type>
-       <version>2008.01</version>
+       <version>${servicemix-shared-version}</version>
        <scope>test</scope>
     </dependency>
     <dependency>
@@ -81,6 +81,12 @@
   </dependencies>
 
   <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
     <plugins>
 
       <!--

Modified: servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml?rev=773040&r1=773039&r2=773040&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml (original)
+++ servicemix/smx3/trunk/samples/camel/camel-sa-itest/src/test/resources/test1.xml Fri May
 8 16:03:04 2009
@@ -27,9 +27,9 @@
   <sm:container generateRootDir="true">
 
     <sm:deployments>
-      <sm:installSharedLibrary groupId="org.apache.servicemix" artifactId="servicemix-shared"
version="2008.01"/>
-      <sm:installComponent groupId="org.apache.servicemix" artifactId="servicemix-camel"
version="2008.01"/>
-      <sm:deployServiceAssembly groupId="org.apache.servicemix.samples" artifactId="camel-sa"
version="3.3.1-SNAPSHOT"/>
+      <sm:installSharedLibrary groupId="org.apache.servicemix" artifactId="servicemix-shared"
version="${servicemix-shared-version}"/>
+      <sm:installComponent groupId="org.apache.servicemix" artifactId="servicemix-camel"
version="${servicemix-camel-version}"/>
+      <sm:deployServiceAssembly groupId="org.apache.servicemix.samples" artifactId="camel-sa"
version="${pom.version}"/>
     </sm:deployments>
 
   </sm:container>



Mime
View raw message