You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/10/30 07:20:23 UTC

svn commit: r709098 - in /servicemix/smx3/trunk: pom.xml samples/camel/src/main/assembly/kit_camel_example_pom.xml samples/camel/src/main/assembly/src.xml

Author: ffang
Date: Wed Oct 29 23:20:23 2008
New Revision: 709098

URL: http://svn.apache.org/viewvc?rev=709098&view=rev
Log:
[SM-1659]should filter the version for kit_camel_example_pom.xml which is used in kit

Modified:
    servicemix/smx3/trunk/pom.xml
    servicemix/smx3/trunk/samples/camel/src/main/assembly/kit_camel_example_pom.xml
    servicemix/smx3/trunk/samples/camel/src/main/assembly/src.xml

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=709098&r1=709097&r2=709098&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Wed Oct 29 23:20:23 2008
@@ -89,7 +89,7 @@
         <jencks-version>2.1</jencks-version>
         <jetty-version>6.1.12rc1</jetty-version>
         <geronimo-version>2.0.1</geronimo-version>
-        <servicemix-version>3.3-SNAPSHOT</servicemix-version>
+        <servicemix-version>3.3.1-SNAPSHOT</servicemix-version>
         <wsdl4j-version>1.6.2</wsdl4j-version>
         <commons-beanutils-version>1.7.0</commons-beanutils-version>
         <commons-fileupload-version>1.1.1</commons-fileupload-version>

Modified: servicemix/smx3/trunk/samples/camel/src/main/assembly/kit_camel_example_pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/src/main/assembly/kit_camel_example_pom.xml?rev=709098&r1=709097&r2=709098&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/camel/src/main/assembly/kit_camel_example_pom.xml (original)
+++ servicemix/smx3/trunk/samples/camel/src/main/assembly/kit_camel_example_pom.xml Wed Oct 29 23:20:23 2008
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix</groupId>
         <artifactId>samples</artifactId>
-        <version>3.3-SNAPSHOT</version>
+        <version>${servicemix.version}</version>
     </parent>
 
     <groupId>org.apache.servicemix.samples</groupId>
@@ -90,26 +90,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <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>
-            <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>jbi-maven-plugin</artifactId>
                 <extensions>true</extensions>

Modified: servicemix/smx3/trunk/samples/camel/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/camel/src/main/assembly/src.xml?rev=709098&r1=709097&r2=709098&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/camel/src/main/assembly/src.xml (original)
+++ servicemix/smx3/trunk/samples/camel/src/main/assembly/src.xml Wed Oct 29 23:20:23 2008
@@ -48,6 +48,7 @@
     <file>
       <source>${basedir}/src/main/assembly/kit_camel_example_pom.xml</source>
       <outputDirectory>./</outputDirectory>
+      <filtered>true</filtered>
       <destName>pom.xml</destName>
       <fileMode>0777</fileMode>
     </file>