maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject git commit: updated parent pom
Date Sun, 13 Apr 2014 14:48:08 GMT
Repository: maven-scm
Updated Branches:
  refs/heads/master 569eb02d6 -> 0e8759c3a


updated parent pom

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

Branch: refs/heads/master
Commit: 0e8759c3ad3d2d52612451e09464a821cf279d81
Parents: 569eb02
Author: Hervé Boutemy <hboutemy@apache.org>
Authored: Sun Apr 13 16:47:59 2014 +0200
Committer: Hervé Boutemy <hboutemy@apache.org>
Committed: Sun Apr 13 16:47:59 2014 +0200

----------------------------------------------------------------------
 pom.xml | 41 +++--------------------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/0e8759c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 59ab0ae..6067287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>23</version>
+    <version>24</version>
   </parent>
 
   <groupId>org.apache.maven.scm</groupId>
@@ -311,20 +311,11 @@
 
     <pluginManagement>
       <plugins>
-        <plugin>
+        <plugin><!-- TODO remove when upgrading to maven-parent 25 -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.0-beta-2</version>
           <configuration>
-            <checkinComment>Apache Maven Scm site deployment</checkinComment>
-            <content>${project.build.directory}/staging/${maven.site.path}</content>
-            <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
-            <tryUpdate>true</tryUpdate>
+            <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
           </configuration>
         </plugin>
         <plugin>
@@ -332,21 +323,6 @@
           <artifactId>modello-maven-plugin</artifactId>
           <version>1.1</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.16</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.9.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -402,16 +378,6 @@
     </contributor>
   </contributors>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.7</version>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <profiles>
 
     <profile>
@@ -421,7 +387,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
             <configuration>
               <notimestamp>true</notimestamp>
               <linksource>true</linksource>


Mime
View raw message