Author: brett
Date: Tue Jan 23 19:35:53 2007
New Revision: 499234
URL: http://svn.apache.org/viewvc?view=rev&rev=499234
Log:
ditch the surrogate parent. It was getting out of date with everything copied
from maven.
Go the other way and make reporting stuff in maven optional, and retain normal
inheritence.
If we decide to make reporting compulsory again, it should be another parent
pom between maven and the project (which the
plugins won't be able to use due to the circular dependency problem)
Removed:
maven/pom/trunk/maven-plugin-surrogate-parent/
Modified:
maven/plugins/trunk/pom.xml
maven/pom/trunk/maven/pom.xml
Modified: maven/plugins/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?view=diff&rev=499234&r1=499233&r2=499234
==============================================================================
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Tue Jan 23 19:35:53 2007
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-surrogate-parent</artifactId>
- <version>6-SNAPSHOT</version>
- <relativePath>../pom/maven-plugin-surrogate-parent/pom.xml</relativePath>
+ <artifactId>maven-parent</artifactId>
+ <version>5-SNAPSHOT</version>
+ <relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
@@ -203,49 +203,13 @@
</plugins>
</build>
</profile>
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- We want to sign the artifact, the POM, and all attached
artifacts -->
- <plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <configuration>
- <passphrase>${gpg.passphrase}</passphrase>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- We want to package up license resources in the JARs produced -->
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/pom/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?view=diff&rev=499234&r1=499233&r2=499234
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Tue Jan 23 19:35:53 2007
@@ -286,60 +286,107 @@
</plugins>
</build>
</profile>
- </profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+
<configLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml</configLocation>
+
<headerLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+
<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+ <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+
<link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+
<link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/pool/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>
+ </plugins>
+ </reporting>
+ </profile>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
-
<configLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml</configLocation>
-
<headerLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt</headerLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2ee/1.4/docs/api</link>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-
<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
- <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
- <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
- <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://jakarta.apache.org/commons/pool/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>
- </plugins>
- </reporting>
+ <profile>
+ <id>release-profile</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <!-- We want to sign the artifact, the POM, and all attached
artifacts -->
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <configuration>
+ <passphrase>${gpg.passphrase}</passphrase>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- We want to package up license resources in the JARs produced -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven</connection>
