You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/06/11 01:10:47 UTC
svn commit: r783566 - in /maven/components/branches/maven-2.2.0-RC:
maven-compat/pom.xml pom.xml
Author: jdcasey
Date: Wed Jun 10 23:10:47 2009
New Revision: 783566
URL: http://svn.apache.org/viewvc?rev=783566&view=rev
Log:
modify excludes for clirr, and add a workaround clirr config to compensate for the fact that maven-compat doesn't exist in 2.1.0
Modified:
maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml
maven/components/branches/maven-2.2.0-RC/pom.xml
Modified: maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml?rev=783566&r1=783565&r2=783566&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-compat/pom.xml Wed Jun 10 23:10:47 2009
@@ -74,6 +74,29 @@
<target>1.3</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <!-- This is goofy and a little childish. :-)
+
+ We're comparing vs. maven-core from previous release (why not?). We have to do this
+ because clirr:check doesn't have a skip flag, and this module didn't exist in the last
+ release...so, without this weirdo configuration, clirr fails the build at the verify
+ stage of this module build, thereby killing the release attempt.
+ -->
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.1.0</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: maven/components/branches/maven-2.2.0-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/pom.xml?rev=783566&r1=783565&r2=783566&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/pom.xml Wed Jun 10 23:10:47 2009
@@ -215,38 +215,11 @@
<version>2.2.1</version>
<configuration>
<!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
- <comparisonVersion>2.1.0-M1</comparisonVersion>
+ <comparisonVersion>2.1.0</comparisonVersion>
<excludes>
- <exclude>org/apache/maven/artifact/Artifact*</exclude>
-
- <exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude>
-
- <exclude>org/apache/maven/plugin/PluginManagerException*</exclude>
-
- <exclude>org/apache/maven/artifact/repository/metadata/Snapshot*</exclude>
- <exclude>org/apache/maven/artifact/repository/metadata/Versioning*</exclude>
- <exclude>org/apache/maven/artifact/repository/metadata/Plugin*</exclude>
- <exclude>org/apache/maven/artifact/repository/metadata/io/xpp3/*</exclude>
-
- <exclude>org/apache/maven/model/*</exclude>
- <exclude>org/apache/maven/model/io/xpp3/*</exclude>
- <exclude>org/apache/maven/settings/*</exclude>
- <exclude>org/apache/maven/settings/io/xpp3/*</exclude>
-
- <exclude>org/apache/maven/usability/plugin/*</exclude>
- <exclude>org/apache/maven/usability/plugin/io/xpp3/*</exclude>
-
- <exclude>org/apache/maven/profiles/*</exclude>
- <exclude>org/apache/maven/profiles/io/xpp3/*</exclude>
-
- <exclude>org/apache/maven/plugin/registry/*</exclude>
- <exclude>org/apache/maven/plugin/registry/io/xpp3/*</exclude>
-
- <exclude>org/apache/maven/plugin/lifecycle/*</exclude>
- <exclude>org/apache/maven/plugin/lifecycle/io/xpp3/*</exclude>
-
- <exclude>org/apache/maven/toolchain/model/*</exclude>
- <exclude>org/apache/maven/toolchain/model/io/xpp3/*</exclude>
+ <exclude>org/apache/maven/project/artifact/ArtifactWithProject*</exclude>
+ <exclude>org/apache/maven/project/artifact/ProjectArtifactFactory*</exclude>
+ <exclude>org/apache/maven/project/artifact/VersionExpressionTransformation*</exclude>
</excludes>
</configuration>
</plugin>