You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/05/25 02:11:52 UTC

svn commit: r409267 - in /geronimo/sandbox/gshell/trunk/gshell-assembly: pom.xml src/main/assembly/bin.xml

Author: jdillon
Date: Wed May 24 17:11:51 2006
New Revision: 409267

URL: http://svn.apache.org/viewvc?rev=409267&view=rev
Log:
Latest assembly plugin is less broken about running assembly goals as part of a build phase, so hook up the archive generation to the default build
Disable bz2 for now, it is too slow to build these

Modified:
    geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?rev=409267&r1=409266&r2=409267&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Wed May 24 17:11:51 2006
@@ -48,29 +48,27 @@
     
     <build>
         <plugins>
+            
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                    </descriptors>
-                    <finalName>gshell-${pom.version}</finalName>
-                </configuration>
-                
-                <!--
-                
-                FIXME: Stupid assembly plugin does not root itself correctly
-                
+                <version>2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
-                            <goal>directory</goal>
+                            <goal>attached</goal>
                         </goals>
                     </execution>
                 </executions>
-                -->
+                <configuration>
+                    <descriptors>
+                        <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>gshell-${pom.version}</finalName>
+                </configuration>
             </plugin>
+
         </plugins>
     </build>
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml?rev=409267&r1=409266&r2=409267&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml Wed May 24 17:11:51 2006
@@ -7,7 +7,6 @@
     
     <formats>
         <format>tar.gz</format>
-        <format>tar.bz2</format>
         <format>zip</format>
     </formats>