maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject [38/50] git commit: Merged r791431:904379 from 2.0.11-RC branch, upgraded parent
Date Sat, 01 Dec 2012 10:39:58 GMT
Merged r791431:904379 from 2.0.11-RC branch, upgraded parent


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@904386 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5374d44c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5374d44c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5374d44c

Branch: refs/heads/maven-2.2.x
Commit: 5374d44c59b01a3059d6aa7d652a8157c8979f75
Parents: 5c6e9e7
Author: Brett Leslie Porter <brett@apache.org>
Authored: Fri Jan 29 05:13:36 2010 +0000
Committer: Brett Leslie Porter <brett@apache.org>
Committed: Fri Jan 29 05:13:36 2010 +0000

----------------------------------------------------------------------
 maven-core-it-runner/pom.xml |    8 +++--
 pom.xml                      |   55 +++---------------------------------
 src/site/site.xml            |    8 +-----
 3 files changed, 11 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/5374d44c/maven-core-it-runner/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core-it-runner/pom.xml b/maven-core-it-runner/pom.xml
index d8f78fa..3665a6c 100644
--- a/maven-core-it-runner/pom.xml
+++ b/maven-core-it-runner/pom.xml
@@ -19,9 +19,11 @@ 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">
   <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>

http://git-wip-us.apache.org/repos/asf/maven/blob/5374d44c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82e4cef..0105abd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,14 +16,13 @@ software distributed under the License is distributed on an
 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 @@ under the License.
       <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 @@ under the License.
         <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 @@ under the License.
     <plugins>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0-alpha-4</version>
         <executions>
           <execution>
             <id>enforce-jdk</id>
@@ -516,7 +476,7 @@ under the License.
       </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 @@ under the License.
       <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>

http://git-wip-us.apache.org/repos/asf/maven/blob/5374d44c/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 0955715..5090f43 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,14 +20,8 @@ under the License.
 -->
 
 <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>


Mime
View raw message