servicemix-commits mailing list archives

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

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

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

Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=671522&r1=671521&r2=671522&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Wed Jun 25 05:15:42 2008
@@ -252,6 +252,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-2</version>
                 <executions>
                     <execution>
                         <id>unix-bin</id>
@@ -264,7 +265,6 @@
                                 <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
                             </descriptors>
                             <finalName>${pom.artifactId}-${pom.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
                             <tarLongFileMode>gnu</tarLongFileMode>
                         </configuration>
                     </execution>
@@ -279,7 +279,8 @@
                                 <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
                             </descriptors>
                             <finalName>${pom.artifactId}-${pom.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <assemblyId></assemblyId>
                         </configuration>
                     </execution>
                     <execution>
@@ -293,7 +294,7 @@
                                 <descriptor>src/main/descriptors/unix-src.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
+                        </configuration	>
                     </execution>
                     <execution>
                         <id>windows-src</id>
@@ -326,7 +327,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/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=671522&r1=671521&r2=671522&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Jun 25 05:15:42
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/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=671522&r1=671521&r2=671522&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Jun 25
05:15:42 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>



Mime
View raw message