myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r784484 - in /myfaces/tobago/trunk: build-nightly.sh example/tobago-example-assembly/pom.xml pom.xml src/site/apt/release-checklist.apt tobago-assembly/pom.xml
Date Sat, 13 Jun 2009 22:19:20 GMT
Author: bommel
Date: Sat Jun 13 22:19:20 2009
New Revision: 784484

URL: http://svn.apache.org/viewvc?rev=784484&view=rev
Log:
generate source assembly

Modified:
    myfaces/tobago/trunk/build-nightly.sh
    myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/src/site/apt/release-checklist.apt
    myfaces/tobago/trunk/tobago-assembly/pom.xml

Modified: myfaces/tobago/trunk/build-nightly.sh
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/build-nightly.sh?rev=784484&r1=784483&r2=784484&view=diff
==============================================================================
--- myfaces/tobago/trunk/build-nightly.sh (original)
+++ myfaces/tobago/trunk/build-nightly.sh Sat Jun 13 22:19:20 2009
@@ -85,8 +85,8 @@
 cd tobago
 mvn -Djava14.home=$JAVA14_HOME -Pgenerate-assembly,jdk14retro -U clean install
 cd tobago-assembly
-mvn -Pgenerate-assembly clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
+mvn -Pgenerate-assembly clean package org.apache.myfaces.maven:wagon-maven-plugin:deploy
 cd ../example/tobago-example-assembly
-mvn -Pgenerate-assembly clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
+mvn -Pgenerate-assembly clean package org.apache.myfaces.maven:wagon-maven-plugin:deploy
 
 cd ../../..

Modified: myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml?rev=784484&r1=784483&r2=784484&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml Sat Jun 13 22:19:20 2009
@@ -67,7 +67,7 @@
 
               <execution>
                 <id>copy-example</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
                 </goals>
@@ -91,6 +91,25 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <id>generate-assembly</id>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptor>src/main/assembly/dep.xml</descriptor>
+                  <finalName>myfaces-tobago-${project.version}</finalName>
+                  <outputDirectory>target/assembly/out</outputDirectory>
+                  <workDirectory>target/assembly/work</workDirectory>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=784484&r1=784483&r2=784484&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Sat Jun 13 22:19:20 2009
@@ -1019,6 +1019,7 @@
                     <descriptorRef>project</descriptorRef>
                   </descriptorRefs>
                   <tarLongFileMode>gnu</tarLongFileMode>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
                 </configuration>
               </execution>
             </executions>
@@ -1308,6 +1309,7 @@
                     <descriptorRef>project</descriptorRef>
                   </descriptorRefs>
                   <tarLongFileMode>gnu</tarLongFileMode>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
                 </configuration>
               </execution>
             </executions>

Modified: myfaces/tobago/trunk/src/site/apt/release-checklist.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/release-checklist.apt?rev=784484&r1=784483&r2=784484&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/release-checklist.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/release-checklist.apt Sat Jun 13 22:19:20 2009
@@ -56,9 +56,9 @@
 
   * Create the assemblies.\
     cd tobago-assembly\
-    mvn -Pgenerate-assembly clean assembly:assembly\
+    mvn -Pgenerate-assembly clean package\
     cd ../example/tobago-example-assembly\
-    mvn -Pgenerate-assembly clean assembly:assembly\
+    mvn -Pgenerate-assembly clean package\
 
   * Sign the assemblies.
 

Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/pom.xml?rev=784484&r1=784483&r2=784484&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Sat Jun 13 22:19:20 2009
@@ -31,17 +31,6 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptor>src/main/assembly/dep.xml</descriptor>
-          <finalName>myfaces-tobago-${project.version}</finalName>
-          <outputDirectory>target/assembly/out</outputDirectory>
-          <workDirectory>target/assembly/work</workDirectory>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.myfaces.maven</groupId>
         <artifactId>wagon-maven-plugin</artifactId>
         <version>1.0.1</version>
@@ -100,7 +89,7 @@
             <executions>
               <execution>
                 <id>copy-javadoc</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
                 </goals>
@@ -127,8 +116,38 @@
               </execution>
 
               <execution>
+                <id>copy-project</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>tobago</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>project</classifier>
+                      <type>tar.gz</type>
+                    </artifactItem>
+                     <artifactItem>
+                      <groupId>${project.groupId}</groupId>
+                      <artifactId>tobago</artifactId>
+                      <version>${project.version}</version>
+                      <classifier>project</classifier>
+                      <type>zip</type>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}/assembly/out
+                  </outputDirectory>
+                  <unpackMarkersDirectory>${project.build.directory}/project
+                  </unpackMarkersDirectory>
+                </configuration>
+              </execution>
+
+              <execution>
                 <id>copy-sandbox</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
                 </goals>
@@ -149,7 +168,7 @@
 
               <execution>
                 <id>copy-tlddoc</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
                 </goals>
@@ -180,7 +199,7 @@
 
                <execution>
                 <id>copy-tld</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
@@ -209,7 +228,7 @@
 
               <execution>
                 <id>copy-extension</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
                 </goals>
@@ -263,7 +282,7 @@
 
               <execution>
                 <id>copy-source</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
                 </goals>
@@ -344,7 +363,7 @@
 
               <execution>
                 <id>copy-jdk14retro</id>
-                <phase>package</phase>
+                <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
                 </goals>
@@ -389,6 +408,56 @@
             </executions>
           </plugin>
 
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <id>generate-assembly</id>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+
+                <configuration>
+                  <descriptor>src/main/assembly/dep.xml</descriptor>
+                  <finalName>myfaces-tobago-${project.version}</finalName>
+                  <outputDirectory>target/assembly/out</outputDirectory>
+                  <workDirectory>target/assembly/work</workDirectory>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.3</version>
+
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <id>rename-files</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <move failonerror="false"
+                        file="${project.build.directory}/assembly/out/tobago-${project.version}-project.tar.gz"
+                        toFile="${project.build.directory}/assembly/out/myfaces-tobago-${project.version}-project.tar.gz"/>
+                    <move failonerror="false"
+                        file="${project.build.directory}/assembly/out/tobago-${project.version}-project.zip"
+                        toFile="${project.build.directory}/assembly/out/myfaces-tobago-${project.version}-project.zip"/>
+
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+
+          </plugin>
+
         </plugins>
       </build>
     </profile>



Mime
View raw message