Author: jdcasey
Date: Wed Jul 9 16:21:42 2008
New Revision: 675380
URL: http://svn.apache.org/viewvc?rev=675380&view=rev
Log:
consolidating clirr configuration at the maven top level pom, so we can review
it after the release.
Modified:
maven/components/branches/maven-2.0.x/maven-model/pom.xml
maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml
maven/components/branches/maven-2.0.x/maven-profile/pom.xml
maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml
maven/components/branches/maven-2.0.x/maven-settings/pom.xml
maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml
maven/components/branches/maven-2.0.x/pom.xml
Modified: maven/components/branches/maven-2.0.x/maven-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-model/pom.xml Wed Jul 9
16:21:42 2008
@@ -47,19 +47,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/apache/maven/model/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<profiles>
<profile>
Modified: maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml Wed
Jul 9 16:21:42 2008
@@ -39,19 +39,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/apache/maven/plugin/lifecycle/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
(original)
+++
maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
Wed Jul 9 16:21:42 2008
@@ -39,19 +39,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/apache/maven/usability/plugin/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
<dependency>
Modified: maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml Wed Jul
9 16:21:42 2008
@@ -38,19 +38,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/apache/maven/plugin/registry/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
<dependency>
Modified: maven/components/branches/maven-2.0.x/maven-profile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-profile/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-profile/pom.xml Wed Jul 9
16:21:42 2008
@@ -39,19 +39,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/apache/maven/profiles/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
<dependency>
Modified:
maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml Wed
Jul 9 16:21:42 2008
@@ -40,20 +40,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
- <includes>
-
<include>org/apache/maven/artifact/repository/metadata/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
<dependency>
Modified: maven/components/branches/maven-2.0.x/maven-settings/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/pom.xml Wed Jul 9
16:21:42 2008
@@ -39,19 +39,6 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/apache/maven/settings/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
<dependency>
Modified: maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml Wed Jul 9
16:21:42 2008
@@ -96,18 +96,5 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/apache/maven/toolchain/model/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=675380&r1=675379&r2=675380&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Wed Jul 9 16:21:42 2008
@@ -221,6 +221,28 @@
<configuration>
<!-- needed for release: default value "(,${project.version})" for
2.0.10 is 2.0.10-SNAPSHOT -->
<comparisonVersion>2.0.9</comparisonVersion>
+ <excludes>
+ <!-- TODO: These represent method ADDITIONS from 2.0.9, and
should be removed after
+ 2.0.10 is released. -->
+
<exclude>org/apache/maven/artifact/metadata/ArtifactMetadataSource*</exclude>
+ <exclude>org/apache/maven/project/MavenProjectBuilder*</exclude>
+
<exclude>org/apache/maven/project/ProjectBuilderConfiguration*</exclude>
+
<exclude>org/apache/maven/project/interpolation/ModelInterpolator*</exclude>
+
<exclude>org/apache/maven/project/inheritance/ModelInheritanceAssembler*</exclude>
+
<exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude>
+ <exclude>org/apache/maven/plugin/DefaultPluginManager*</exclude>
+
+ <!-- TODO: These represent method CHANGES in code generated by
modello that, frankly,
+ should be private. These should be removed after 2.0.10
release as well. -->
+ <exclude>org/apache/maven/model/io/xpp3/*</exclude>
+ <exclude>org/apache/maven/plugin/lifecycle/io/xpp3/*</exclude>
+ <exclude>org/apache/maven/usability/plugin/io/xpp3/*</exclude>
+ <exclude>org/apache/maven/plugin/registry/io/xpp3/*</exclude>
+ <exclude>org/apache/maven/profiles/io/xpp3/*</exclude>
+
<exclude>org/apache/maven/artifact/repository/metadata/io/xpp3/*</exclude>
+ <exclude>org/apache/maven/settings/io/xpp3/*</exclude>
+ <exclude>org/apache/maven/toolchain/model/io/xpp3/*</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
