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 2007/09/08 10:11:26 UTC
svn commit: r573798 - in /geronimo/server/trunk/maven-plugins:
car-maven-plugin/pom.xml geronimo-maven-plugin/pom.xml pom.xml
testsuite-maven-plugin/pom.xml
Author: jdillon
Date: Sat Sep 8 01:11:25 2007
New Revision: 573798
URL: http://svn.apache.org/viewvc?rev=573798&view=rev
Log:
Dropped configuration of the goalPrefix for plugins, this is not needed since we follow one of the 2 supported automated styles for detection
Drop the javadoc reporting muck, use that from the top-level pom
Make sure we use the latest plugin plugin for the reports
Modified:
geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml
geronimo/server/trunk/maven-plugins/pom.xml
geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/pom.xml
Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml?rev=573798&r1=573797&r2=573798&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml Sat Sep 8 01:11:25 2007
@@ -131,12 +131,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>car</goalPrefix>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>shitty-maven-plugin</artifactId>
<version>1.0-alpha-1-SNAPSHOT</version>
Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml?rev=573798&r1=573797&r2=573798&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml Sat Sep 8 01:11:25 2007
@@ -63,16 +63,5 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>geronimo</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: geronimo/server/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/pom.xml?rev=573798&r1=573797&r2=573798&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/pom.xml Sat Sep 8 01:11:25 2007
@@ -51,18 +51,6 @@
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<modules>
<module>car-maven-plugin</module>
<module>geronimo-maven-plugin</module>
@@ -74,81 +62,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>512</maxmemory>
- <breakiterator>true</breakiterator>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <source>1.4</source>
- <!--
- FIXME: This worked in m1, but m2 complains about it being an invalid flag
-
- <additionalparam>-J-Djava.awt.headless=true</additionalparam>
- -->
- <linksource>true</linksource>
- <links>
- <!-- J2SE -->
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://java.sun.com/j2se/1.3/docs/api/</link>
-
- <!-- JavaEE -->
- <link>http://java.sun.com/javaee/5/docs/api/</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
-
- <!-- Libraries -->
- <link>http://jakarta.apache.org/commons/collections/apidocs</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://www.junit.org/junit/javadoc/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://jakarta.apache.org/regexp/apidocs/</link>
- <link>http://jakarta.apache.org/velocity/api/</link>
- </links>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <!-- Pulled as resource from checkstyle-config plugin -->
- <configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
</plugins>
</reporting>
Modified: geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/pom.xml?rev=573798&r1=573797&r2=573798&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/pom.xml Sat Sep 8 01:11:25 2007
@@ -64,17 +64,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>testsuite</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<repositories>
<repository>
<id>jtidy.sourceforge</id>