servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r671524 - in /servicemix/smx4/features/trunk: assembly/pom.xml assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/windows-bin.xml pom.xml
Date Wed, 25 Jun 2008 12:16:52 GMT
Author: gertv
Date: Wed Jun 25 05:16:52 2008
New Revision: 671524

URL: http://svn.apache.org/viewvc?rev=671524&view=rev
Log:
SMX4-30, SMX4-35: Fixing the ServiceMix 4 assemblies

Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=671524&r1=671523&r2=671524&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Jun 25 05:16:52 2008
@@ -518,147 +518,147 @@
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-http</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-jms</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-drools</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-eip</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-script</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-scripting</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-validation</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-file</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-ftp</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-xmpp</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-saxon</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-quartz</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-jsr181</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-mail</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-osworkflow</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-bean</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>                
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-truezip</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>                
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-cxf-se</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>                
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-cxf-bc</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>                
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-camel</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>                
                       <artifactItem>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>servicemix-shared-compat</artifactId>
-                        <version>${servicemix3.version}</version>
+                        <version>${components.version}</version>
                         <classifier>installer</classifier>
                         <type>zip</type>
                       </artifactItem>
@@ -766,7 +766,6 @@
                                 <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
                             </descriptors>
                             <finalName>${pom.artifactId}-${pom.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
                             <tarLongFileMode>gnu</tarLongFileMode>
                         </configuration>
                     </execution>
@@ -781,7 +780,6 @@
                                 <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
                             </descriptors>
                             <finalName>${pom.artifactId}-${pom.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
                     </execution>
                     <execution>
@@ -822,7 +820,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.1</version>
+                        <version>2.2-beta-2</version>
                         <executions>
                             <execution>
                                 <id>unix-src</id>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=671524&r1=671523&r2=671524&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Jun 25 05:16:52
2008
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <assembly>
-    <id>unix-bin</id>
+    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301
-->
     <formats>
         <format>tar.gz</format>
     </formats>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=671524&r1=671523&r2=671524&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Jun 25
05:16:52 2008
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <assembly>
-    <id>windows-bin</id>
+    <id></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301
-->
     <formats>
         <format>zip</format>
     </formats>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=671524&r1=671523&r2=671524&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Jun 25 05:16:52 2008
@@ -70,6 +70,7 @@
       <camel.version>1.4-SNAPSHOT</camel.version>
       <commons.logging.version>1.1</commons.logging.version>
       <commons.pool.version>1.4</commons.pool.version>
+      <components.version>4.0-SNAPSHOT</components.version>
       <cxf.version>2.1.1</cxf.version>
       <felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
       <felix.compendium.version>1.0.0</felix.compendium.version>



Mime
View raw message