Sophie

Sophie

distrib > Mageia > 2 > i586 > by-pkgid > 85cf7393e4fdba8913cefb155f3ba238 > files > 6

cargo-1.0-2.mga2.src.rpm

diff -Nru cargo-1.0/core/uberjar/pom.xml cargo-1.0-gil/core/uberjar/pom.xml
--- cargo-1.0/core/uberjar/pom.xml	2009-03-26 20:30:37.000000000 +0100
+++ cargo-1.0-gil/core/uberjar/pom.xml	2011-08-21 22:50:38.651426104 +0200
@@ -101,13 +101,15 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <finalName>${project.artifactId}-${project.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
           <descriptor>src/assemble/main.xml</descriptor>
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
+            <id>make-assembly</id>
             <goals>
-              <goal>single</goal>
+              <goal>attached</goal>
             </goals>
           </execution>
         </executions>
diff -Nru cargo-1.0/core/uberjar/src/assemble/main.xml cargo-1.0-gil/core/uberjar/src/assemble/main.xml
--- cargo-1.0/core/uberjar/src/assemble/main.xml	2009-03-03 23:11:42.000000000 +0100
+++ cargo-1.0-gil/core/uberjar/src/assemble/main.xml	2011-08-21 22:49:50.794421682 +0200
@@ -1,7 +1,9 @@
 <assembly>
+  <id>${project.artifactId}</id>
   <formats>
     <format>jar</format>
   </formats>
+  <baseDirectory>target</baseDirectory>
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
     <dependencySet>