You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2010/01/29 06:13:37 UTC
svn commit: r904386 - in /maven/maven-2/branches/maven-2.2.x: ./
apache-maven/ apache-maven/src/test/ maven-core-it-runner/pom.xml
maven-integration-tests/ maven-model/src/test/ maven-settings/
maven-toolchain/ pom.xml src/site/site.xml
Author: brett
Date: Fri Jan 29 05:13:36 2010
New Revision: 904386
URL: http://svn.apache.org/viewvc?rev=904386&view=rev
Log:
Merged r791431:904379 from 2.0.11-RC branch, upgraded parent
Modified:
maven/maven-2/branches/maven-2.2.x/ (props changed)
maven/maven-2/branches/maven-2.2.x/apache-maven/ (props changed)
maven/maven-2/branches/maven-2.2.x/apache-maven/src/test/ (props changed)
maven/maven-2/branches/maven-2.2.x/maven-core-it-runner/pom.xml
maven/maven-2/branches/maven-2.2.x/maven-integration-tests/ (props changed)
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/ (props changed)
maven/maven-2/branches/maven-2.2.x/maven-settings/ (props changed)
maven/maven-2/branches/maven-2.2.x/maven-toolchain/ (props changed)
maven/maven-2/branches/maven-2.2.x/pom.xml
maven/maven-2/branches/maven-2.2.x/src/site/site.xml
Propchange: maven/maven-2/branches/maven-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 05:13:36 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
+/maven/components/branches/maven-2.0.11-RC:791431-904379
/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
Propchange: maven/maven-2/branches/maven-2.2.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 05:13:36 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:679193-679867,680477-688882,708790-728809,728834
+/maven/components/branches/maven-2.0.11-RC/apache-maven:791431-904379
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940,736543,746038
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
Propchange: maven/maven-2/branches/maven-2.2.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 05:13:36 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:728834
+/maven/components/branches/maven-2.0.11-RC/apache-maven/src/test:791431-904379
/maven/components/branches/maven-2.0.x/apache-maven/src/test:736543
/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,767628,767631,768995,769010-769011
Modified: maven/maven-2/branches/maven-2.2.x/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core-it-runner/pom.xml?rev=904386&r1=904385&r2=904386&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-core-it-runner/pom.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-core-it-runner/pom.xml Fri Jan 29 05:13:36 2010
@@ -19,9 +19,11 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven</groupId>
- <version>2.2.1-RC2-SNAPSHOT</version>
+ <parent>
+ <artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>2.2.1-RC2-SNAPSHOT</version>
+ </parent>
<artifactId>maven-core-it-runner</artifactId>
<name>Integration Test Executor</name>
Propchange: maven/maven-2/branches/maven-2.2.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 05:13:36 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:728834
+/maven/components/branches/maven-2.0.11-RC/maven-integration-tests:791431-904379
/maven/components/branches/maven-2.0.x/maven-integration-tests:736543
/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,767628,767631,768995,769010-769011
Propchange: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 05:13:36 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:728834
+/maven/components/branches/maven-2.0.11-RC/maven-model/src/test:791431-904379
/maven/components/branches/maven-2.0.x/maven-model/src/test:736543
/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,767628,767631,768995,769010-769011
Propchange: maven/maven-2/branches/maven-2.2.x/maven-settings/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 05:13:36 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/maven-settings:679193-679867,680477-688882,708790-728809,728834
+/maven/components/branches/maven-2.0.11-RC/maven-settings:791431-904379
/maven/components/branches/maven-2.0.x/maven-settings:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC/maven-settings:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/maven-settings:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
Propchange: maven/maven-2/branches/maven-2.2.x/maven-toolchain/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 05:13:36 2010
@@ -1,4 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/maven-toolchain:679193-679867,680477-688882,708790-728809,728834
+/maven/components/branches/maven-2.0.11-RC/maven-toolchain:791431-904379
/maven/components/branches/maven-2.0.x/maven-toolchain:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC/maven-toolchain:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/maven-toolchain:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
Modified: maven/maven-2/branches/maven-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/pom.xml?rev=904386&r1=904385&r2=904386&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/pom.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/pom.xml Fri Jan 29 05:13:36 2010
@@ -16,14 +16,13 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>11</version>
+ <version>15</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -126,57 +125,20 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.0</version>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/maven/maven-2/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -212,7 +174,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.2.1</version>
<configuration>
<!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
<comparisonVersion>2.2.0</comparisonVersion>
@@ -228,7 +189,6 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-4</version>
<executions>
<execution>
<id>enforce-jdk</id>
@@ -516,7 +476,7 @@
</build>
</profile>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<!-- This is here until it is enabled in the parent -->
@@ -545,11 +505,6 @@
<id>reporting</id>
<reporting>
<plugins>
- <plugin><!-- TODO: remove when upgrading parent to version 12 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
- </plugin><!-- /TODO -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
Modified: maven/maven-2/branches/maven-2.2.x/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/src/site/site.xml?rev=904386&r1=904385&r2=904386&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/src/site/site.xml (original)
+++ maven/maven-2/branches/maven-2.2.x/src/site/site.xml Fri Jan 29 05:13:36 2010
@@ -20,14 +20,8 @@
-->
<project>
- <!-- TODO remove when using Maven Parent 11+ -->
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.1</version>
- </skin>
<body>
<menu ref="modules"/>
<menu ref="reports"/>
</body>
-</project>
\ No newline at end of file
+</project>