geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r924837 - /geronimo/server/branches/2.1/pom.xml
Date Thu, 18 Mar 2010 14:40:51 GMT
Author: rwonly
Date: Thu Mar 18 14:40:51 2010
New Revision: 924837

URL: http://svn.apache.org/viewvc?rev=924837&view=rev
Log:
remove the duplicated definition of maven plugins in server root pom

Modified:
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=924837&r1=924836&r2=924837&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Mar 18 14:40:51 2010
@@ -2108,53 +2108,14 @@
 
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                    <artifactId>buildsupport-maven-plugin</artifactId>
-                    <version>${version}</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                    <artifactId>car-maven-plugin</artifactId>
-                    <version>${version}</version>
-                    <extensions>true</extensions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <!--<version>1.0-alpha-3</version>   1.0-beta-1 -->
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <!--<version>2.2-beta-1</version>	2.2-beta-4 -->
-                </plugin>
-
-                <!--<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.3</version>    2.5
-                    <configuration>
-                        <source>1.5</source>
-                    </configuration>
-                </plugin>-->
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <!-- The 2.0 level doesn't handle the dojo tgz correctly -->
+                    <!-- The 2.0/2.1 doesn't handle the dojo tgz correctly -->
                     <version>2.0-alpha-4</version>  
                 </plugin>
 
-                <!--<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>-->
-
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>selenium-maven-plugin</artifactId>
@@ -2164,7 +2125,6 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
-                    <!--<version>2.3.1</version>-->
                     <executions>
                         <execution>
                             <goals>
@@ -2179,21 +2139,8 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.codehaus.groovy.maven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <!--<version>1.0-rc-2</version> 1.0-rc-3 -->
-                </plugin>
-
-                <!--<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-plugin-plugin</artifactId>
-                    <version>2.3</version>   2.5
-                </plugin>-->
-
-                <plugin>
                     <groupId>org.codehaus.mojo.jspc</groupId>
                     <artifactId>jspc-maven-plugin</artifactId>
-                    <!--<version>2.0-alpha-2</version>-->
                     <executions>
                         <execution>
                             <goals>
@@ -2229,18 +2176,6 @@
                     </dependencies>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>sql-maven-plugin</artifactId>
-                    <!--<version>1.0</version> 1.1   -->
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>jaxb2-maven-plugin</artifactId>
-                    <!--<version>1.2</version>-->
-                </plugin>
-
                 <!--
                 FIXME: Should not configure war to assume jsp by default
                 -->
@@ -2280,7 +2215,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
-                    <!--<version>2.3</version>-->
                     <configuration>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
@@ -2292,7 +2226,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-rar-plugin</artifactId>
-                    <!--<version>2.2</version>-->
                     <configuration>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
@@ -2304,7 +2237,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <!--<version>2.1</version>-->
                     <configuration>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
@@ -2316,7 +2248,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ejb-plugin</artifactId>
-                    <!--<version>2.1</version>-->
                     <configuration>
                         <ejbVersion>3.0</ejbVersion>
                         <archive>
@@ -2329,7 +2260,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <!--version>2.3</version2.4.3-->
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <failIfNoTests>false</failIfNoTests>
@@ -2337,6 +2267,44 @@
                 </plugin>
 
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <inherited>true</inherited>
+                    <configuration>
+                        <updateReleaseInfo>true</updateReleaseInfo>
+                        <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <configuration>
+                        <passphrase>${gpg.passphrase}</passphrase>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>sign</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>buildsupport-maven-plugin</artifactId>
+                    <version>${version}</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>car-maven-plugin</artifactId>
+                    <version>${version}</version>
+                    <extensions>true</extensions>
+                </plugin>
+                
+                <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
                     <version>${version}</version>
@@ -2412,49 +2380,11 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>shitty-maven-plugin</artifactId>
-                    <!--<version>1.0-alpha-2</version>   alpha-3 -->
-                </plugin>
-
-                <plugin>
                     <groupId>org.apache.geronimo.gshell</groupId>
                     <artifactId>gshell-maven-plugin</artifactId>
                     <version>1.0-alpha-1</version>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <!--<version>2.3</version>  2.4-->
-                    <inherited>true</inherited>
-                    <configuration>
-                        <updateReleaseInfo>true</updateReleaseInfo>
-                        <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <!--<version>1.0-alpha-3</version>   alpha-4 -->
-                    <configuration>
-                        <passphrase>${gpg.passphrase}</passphrase>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>sign</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <!--version>2.0-beta-6</version-->
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -2519,7 +2449,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <!--<version>2.3</version>-->
                 <configuration>
                     <breakiterator>true</breakiterator>
                     <quiet>true</quiet>
@@ -2536,7 +2465,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <!--<version>2.2</version>-->
                 <configuration>
                     <targetJdk>1.5</targetJdk>
                 </configuration>
@@ -2544,44 +2472,6 @@
         </plugins>
     </reporting>
 
-    <repositories>
-        <!--
-        NOTE: The default repositories are picked up by Genesis.
-              We need the apache-snapshot repo, since it isn't defined by Genesis 1.3.1.

-        -->
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://repository.apache.org/snapshots/</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-   <pluginRepositories>
-        <pluginRepository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
     <distributionManagement>
         <site>
             <id>geronimo-website</id>
@@ -2623,7 +2513,7 @@
 
         <profile>
             <id>all-subprojects</id>
-
+            <!-- mvn release:prepare -DdryRun=true -Pall-subprojects -Papache-release
-Dtest=false -->
             <modules>
                 <module>repository</module>
                 <module>buildsupport</module>
@@ -2804,60 +2694,7 @@
             </build>
         </profile>
 
-        <profile>
-            <id>staging</id>
 
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                        <configuration>
-                            <useReleaseProfile>false</useReleaseProfile>
-                            <goals>deploy</goals>
-                            <arguments>-Prelease</arguments>
-                        </configuration>
-                    </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>
-                        <inherited>true</inherited>
-                        <configuration>
-                            <passphrase>${gpg.passphrase}</passphrase>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- We want to deploy the artifact to a staging location for perusal
-->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <inherited>true</inherited>
-                        <configuration>
-                            <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <modules>
-                <module>repository</module>
-                <module>buildsupport</module>
-                <module>testsupport</module>
-                <module>framework</module>
-                <module>plugins</module>
-                <module>assemblies</module>
-            </modules>
-        </profile>
     </profiles>
 
 </project>



Mime
View raw message