geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1043329 - in /geronimo/devtools/eclipse-plugin/branches/2.2: assembly/src/main/assembly/deployable.xml assembly/src/main/assembly/updatesite.xml features/pom.xml plugins/pom.xml pom.xml testsuite/pom.xml
Date Wed, 08 Dec 2010 08:11:29 GMT
Author: hanhongfang
Date: Wed Dec  8 08:11:29 2010
New Revision: 1043329

URL: http://svn.apache.org/viewvc?rev=1043329&view=rev
Log:
GERONIMODEVTOOLS-648 Source release assembly contains temporary files generated in build process

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/branches/2.2/features/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/deployable.xml?rev=1043329&r1=1043328&r2=1043329&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/deployable.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/deployable.xml
Wed Dec  8 08:11:29 2010
@@ -51,7 +51,7 @@
          |
          -->
         <dependencySet>
-            <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
             <outputDirectory>eclipse/plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
@@ -83,8 +83,7 @@
          |
          -->
         <dependencySet>
-            <outputFileNameMapping>${artifactId}_${version}</outputFileNameMapping>
-            <outputDirectory>eclipse/features/</outputDirectory>
+            <outputDirectory>eclipse/features/${artifact.artifactId}_${artifact.version}/</outputDirectory>
             <unpack>true</unpack>
             <includes>
                 <!-- include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include
-->

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/updatesite.xml?rev=1043329&r1=1043328&r2=1043329&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/updatesite.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/assembly/src/main/assembly/updatesite.xml
Wed Dec  8 08:11:29 2010
@@ -55,7 +55,7 @@
          |
          -->
         <dependencySet>
-            <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
@@ -87,7 +87,7 @@
          |
          -->
         <dependencySet>
-            <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>
             <includes>
                 <!-- include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include
-->

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/features/pom.xml?rev=1043329&r1=1043328&r2=1043329&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/features/pom.xml Wed Dec  8 08:11:29 2010
@@ -28,6 +28,21 @@
         <version>2.2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    
+    <build>
+         <pluginManagement>
+            <plugins>
+               <!-- skip deploy child artifacts in release process-->
+               <plugin>
+                   <artifactId>maven-deploy-plugin</artifactId>             
+                   <configuration>
+                     <skip>true</skip>
+                  </configuration>
+               </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    
     <modules>
         <module>org.apache.geronimo.v22.feature</module>
     </modules>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/plugins/pom.xml?rev=1043329&r1=1043328&r2=1043329&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/plugins/pom.xml Wed Dec  8 08:11:29 2010
@@ -130,6 +130,13 @@
                         </filesets>
                     </configuration>
                 </plugin>
+                <!-- skip deploy child artifacts in release process-->
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>            

+                    <configuration>
+                      <skip>true</skip>
+                   </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml?rev=1043329&r1=1043328&r2=1043329&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/pom.xml Wed Dec  8 08:11:29 2010
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>5</version>
+        <version>6</version>
     </parent>
                         
     <description>Apache Geronimo Eclipse Plugin and WTP Server Adapter</description>
@@ -256,7 +256,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-1</version>
+                    <version>2.2-beta-4</version>
                 </plugin>
                 
                 <plugin>
@@ -289,15 +289,30 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-9</version>
-                    <configuration>
-                        <useReleaseProfile>false</useReleaseProfile>
+                    <configuration>                        
+                        <useReleaseProfile>false</useReleaseProfile> 
+                        <allowTimestampedSnapshots>false</allowTimestampedSnapshots>
+                        <preparationGoals>clean install</preparationGoals>  
                     
                         <goals>deploy</goals>
-                        <arguments>-Papache-release</arguments>
                     </configuration>
                 </plugin>
-
-
+                
+                 <!-- skip javadoc generation during release:prepare, which is a built-in
process from org.apache 6 -->
+                 <plugin>
+                     <groupId>org.apache.maven.plugins</groupId>
+                     <artifactId>maven-javadoc-plugin</artifactId>
+                     <version>2.5</version>
+                     <configuration>
+                         <skip>true</skip>
+                     </configuration>
+                 </plugin>
+                 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
+								
             </plugins>
         </pluginManagement>
                 
@@ -379,6 +394,17 @@
                     <validity>${keystoreValDays}</validity>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>						
+                        <configuration>							
+                            <attached>false</attached>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
         </plugins>
     </build>
                         
@@ -563,67 +589,61 @@
                 <module>testsuite</module>
             </modules>                    
         </profile>
-        		        
-            <profile>
-                      <id>apache-release</id>
-                      <build>
-                        <plugins>
-                          <!-- Create a source-release artifact that contains the fully
buildable 
-                               project directory source structure. This is the artifact which
is 
-                               the official subject of any release vote. -->
-                          <plugin>
-                            <artifactId>maven-assembly-plugin</artifactId>
-                            <dependencies>
-                              <dependency>
-                                <groupId>org.apache.apache.resources</groupId>
-                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <version>1.0.2</version>
-                              </dependency>
-                            </dependencies>
-                            <executions>
-                              <execution>
-                                <id>source-release-assembly</id>
-                                <phase>package</phase>
+
+        <!-- this profile is copied from genesis-default-flava and genesis 2.0  -->
+        <profile>
+            <id>apache-release</id>
+            <activation>
+                <property>
+                   <name>apache-release</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- waiting for release -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
                                 <goals>
-                                  <goal>single</goal>
+                                 <goal>single</goal>
                                 </goals>
+                                <phase>package</phase>
                                 <configuration>
-                                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                                  <descriptorRefs>
-                                    <descriptorRef>source-release</descriptorRef>
-                                  </descriptorRefs>
-                                  <tarLongFileFormat>gnu</tarLongFileFormat>
+                                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>source-release</descriptorRef>
+                                    </descriptorRefs>
                                 </configuration>
-                              </execution>
-                            </executions>
-                          </plugin>
-                          <!-- We want to sign the artifact, the POM, and all attached
artifacts -->
-                          <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-gpg-plugin</artifactId>
-                            <configuration>
-                              <passphrase>${gpg.passphrase}</passphrase>
-                            </configuration>
-                            <executions>
-                              <execution>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <!-- apache version not yet released -->
+                                <!--<groupId>org.apache</groupId>-->
+                                <groupId>org.apache.geronimo.genesis</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <!-- apache version not yet known -->
+                                <version>2.0</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>                
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis</groupId>
+                        <artifactId>genesis-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
                                 <goals>
-                                  <goal>sign</goal>
+                                  <goal>validate-release-configuration</goal>
                                 </goals>
-                              </execution>
-                            </executions>
-                          </plugin>
-                          <!-- We want to deploy the artifact to a staging location for
perusal -->
-                          <plugin>
-                            <inherited>true</inherited>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-deploy-plugin</artifactId>
-                            <configuration>
-                              <updateReleaseInfo>true</updateReleaseInfo>
-                            </configuration>
-                          </plugin>          
-                        </plugins>
-                      </build>
-           </profile>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
                         
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml?rev=1043329&r1=1043328&r2=1043329&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml Wed Dec  8 08:11:29 2010
@@ -248,6 +248,17 @@
                 </configuration>
             </plugin>
         </plugins>
+        <pluginManagement>
+             <plugins>
+                <!-- skip deploy child artifacts in release process-->
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>            

+                    <configuration>
+                      <skip>true</skip>
+                   </configuration>
+                </plugin>
+             </plugins>
+         </pluginManagement>        
     </build>
 
     <modules>



Mime
View raw message