geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1084493 - in /geronimo/genesis/trunk: genesis-default-flava/pom.xml pom.xml
Date Wed, 23 Mar 2011 07:55:03 GMT
Author: djencks
Date: Wed Mar 23 07:55:03 2011
New Revision: 1084493

URL: http://svn.apache.org/viewvc?rev=1084493&view=rev
Log:
update parent and plugin versions.  Minor cleanup

Modified:
    geronimo/genesis/trunk/genesis-default-flava/pom.xml
    geronimo/genesis/trunk/pom.xml

Modified: geronimo/genesis/trunk/genesis-default-flava/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-default-flava/pom.xml?rev=1084493&r1=1084492&r2=1084493&view=diff
==============================================================================
--- geronimo/genesis/trunk/genesis-default-flava/pom.xml (original)
+++ geronimo/genesis/trunk/genesis-default-flava/pom.xml Wed Mar 23 07:55:03 2011
@@ -258,23 +258,6 @@
                 </dependencies>
             </plugin>
 
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-remote-resources-plugin</artifactId>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<goals>-->
-                            <!--<goal>process</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<resourceBundles>-->
-                                <!--<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>-->
-                            <!--</resourceBundles>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>ianal-maven-plugin</artifactId>
@@ -381,13 +364,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>2.8</version>
             </plugin>
 
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.4</version>
                 <configuration>
                     <quiet>true</quiet>
                 </configuration>
@@ -396,30 +379,6 @@
     </reporting>
 
     <profiles>
-        <!--<profile>-->
-            <!--<id>apache-release</id>-->
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>apache-release</name>-->
-                <!--</property>-->
-            <!--</activation>-->
-            <!--<build>-->
-                <!--<plugins>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.geronimo.genesis</groupId>-->
-                        <!--<artifactId>genesis-maven-plugin</artifactId>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<goals>-->
-                                    <!--<goal>validate-release-configuration</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-                <!--</plugins>-->
-            <!--</build>-->
-        <!--</profile>-->
-
         <profile>
             <id>license-check</id>
 
@@ -442,7 +401,6 @@
                     <plugin>
                         <groupId>com.google.code.maven-license-plugin</groupId>
                         <artifactId>maven-license-plugin</artifactId>
-                        <version>1.4.0</version>
                         <executions>
                             <execution>
                                 <goals>

Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=1084493&r1=1084492&r2=1084493&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Wed Mar 23 07:55:03 2011
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>7</version>
+        <version>9</version>
     </parent>
 
     <groupId>org.apache.geronimo.genesis</groupId>
@@ -107,6 +107,10 @@
 
     </mailingLists>
 
+    <prerequisites>
+        <maven>3.0.3</maven>
+    </prerequisites>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <siteId>genesis</siteId>
@@ -116,27 +120,10 @@
     <distributionManagement>
         <site>
             <id>apache-website</id>
-            <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+            <url>${site.deploy.url}/maven/${siteId}/${project.version}</url>
         </site>
     </distributionManagement>
 
-    <!--<repositories>-->
-        <!--<repository>-->
-            <!--<id>codehaus.snapshots</id>-->
-            <!--<name>Codehaus Snapshots Repository</name>-->
-            <!--<url>http://snapshots.repository.codehaus.org</url>-->
-            <!--<layout>default</layout>-->
-            <!--<snapshots>-->
-                <!--<enabled>true</enabled>-->
-                <!--<updatePolicy>daily</updatePolicy>-->
-                <!--<checksumPolicy>ignore</checksumPolicy>-->
-            <!--</snapshots>-->
-            <!--<releases>-->
-                <!--<enabled>false</enabled>-->
-            <!--</releases>-->
-        <!--</repository>-->
-    <!--</repositories>-->
-
     <pluginRepositories>
 
         <pluginRepository>
@@ -154,28 +141,12 @@
             </releases>
         </pluginRepository>
 
-        <!--<pluginRepository>-->
-            <!--<id>codehaus.snapshots</id>-->
-            <!--<name>Codehaus Snapshots Repository</name>-->
-            <!--<url>http://snapshots.repository.codehaus.org</url>-->
-            <!--<layout>default</layout>-->
-            <!--<snapshots>-->
-                <!--<enabled>true</enabled>-->
-                <!--<updatePolicy>daily</updatePolicy>-->
-                <!--<checksumPolicy>ignore</checksumPolicy>-->
-            <!--</snapshots>-->
-            <!--<releases>-->
-                <!--<enabled>false</enabled>-->
-            <!--</releases>-->
-        <!--</pluginRepository>-->
     </pluginRepositories>
 
     <modules>
         <module>apache-source-release-assembly-descriptor</module>
-        <!--<module>genesis-maven-plugin</module>-->
         <module>genesis-packaging</module>
         <module>genesis-default-flava</module>
-        <!--<module>genesis-skin</module>-->
         <module>genesis-enforcer-rules</module>
     </modules>
 
@@ -188,13 +159,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
+                    <version>2.0</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-4</version>
+                    <version>2.2.1</version>
                     <configuration>
                         <tarLongFileMode>gnu</tarLongFileMode>
                     </configuration>
@@ -203,55 +174,55 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-changes-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.4</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-changelog-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.6</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.5</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ejb-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.3</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-help-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.1.1</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jxr-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.5</version>
                 </plugin>
 
                 <plugin>
@@ -262,12 +233,6 @@
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-reactor-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
                     <configuration>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -279,32 +244,38 @@
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
                     <version>1.2</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>1.4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.4.3</version>
+                    <version>2.8</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-verifier-plugin</artifactId>
-                    <version>1.0-beta-1</version>
+                    <version>1.0</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.1-alpha-2</version>
+                    <version>2.1.1</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
+                    <version>2.3.4</version>
                     <extensions>true</extensions>
                 </plugin>
 
@@ -317,19 +288,19 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>1.5</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>cobertura-maven-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.4</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo.jspc</groupId>
                     <artifactId>jspc-maven-plugin</artifactId>
-                    <version>2.0-alpha-2</version>
+                    <version>2.0-alpha-3</version>
                 </plugin>
 
                 <plugin>
@@ -341,19 +312,13 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jaxb2-maven-plugin</artifactId>
-                    <version>1.2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>rat-maven-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
+                    <version>1.3</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>selenium-maven-plugin</artifactId>
-                    <version>1.0</version>
+                    <version>1.1</version>
                 </plugin>
 
                 <plugin>
@@ -365,13 +330,13 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>sql-maven-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>1.4</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
-                    <version>2.3.1</version>
+                    <version>2.3.3</version>
                 </plugin>
 
                 <plugin>
@@ -380,63 +345,11 @@
                     <version>1.3.1</version>
                 </plugin>
 
-                <!-- INTERNAL -->
-
-                <!--<plugin>-->
-                    <!--<groupId>org.apache.geronimo.genesis</groupId>-->
-                    <!--<artifactId>genesis-maven-plugin</artifactId>-->
-                    <!--<version>2.1-SNAPSHOT</version>-->
-                <!--</plugin>-->
             </plugins>
         </pluginManagement>
     </build>
 
     <profiles>
-        <!--<profile>-->
-            <!--<id>apache-release</id>-->
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>apache-release</name>-->
-                <!--</property>-->
-            <!--</activation>-->
-            <!--<build>-->
-                <!--<plugins>-->
-                    <!--&lt;!&ndash; waiting for release &ndash;&gt;-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-assembly-plugin</artifactId>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<goals>-->
-                                    <!--<goal>single</goal>-->
-                                <!--</goals>-->
-                                <!--<phase>package</phase>-->
-                                <!--<configuration>-->
-                                    <!--<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>-->
-                                    <!--<descriptorRefs>-->
-                                        <!--<descriptorRef>-->
-                                            <!--source-release-->
-                                        <!--</descriptorRef>-->
-                                    <!--</descriptorRefs>-->
-                                <!--</configuration>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                        <!--<dependencies>-->
-                            <!--<dependency>-->
-                                <!--&lt;!&ndash; apache version not yet released
&ndash;&gt;-->
-                                <!--&lt;!&ndash;<groupId>org.apache</groupId>&ndash;&gt;-->
-                                <!--<groupId>org.apache.geronimo.genesis</groupId>-->
-                                <!--<artifactId>apache-source-release-assembly-descriptor</artifactId>-->
-                                <!--&lt;!&ndash; apache version not yet known
&ndash;&gt;-->
-                                <!--<version>2.0</version>-->
-                            <!--</dependency>-->
-                        <!--</dependencies>-->
-                    <!--</plugin>-->
-
-                <!--</plugins>-->
-            <!--</build>-->
-        <!--</profile>-->
-
         <profile>
             <id>strict-enforcement</id>
             <activation>



Mime
View raw message