You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/02/10 10:47:51 UTC

[7/7] maven git commit: upgraded parent pom to version 31

upgraded parent pom to version 31

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

Branch: refs/heads/master
Commit: 40cf506220cd3121fdca8b8bb8a9b9f47faad421
Parents: 0dc70cc
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Feb 8 22:46:22 2018 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Feb 10 11:42:33 2018 +0100

----------------------------------------------------------------------
 pom.xml | 53 +----------------------------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/40cf5062/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f540aa3..66b9d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>27</version>
+    <version>31</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -497,22 +497,6 @@ under the License.
           <version>1.4</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.7</version>
-          <configuration>
-            <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</topSiteURL>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.1</version>
-          <configuration>
-            <serverId>apache.releases.https</serverId>
-          </configuration>
-        </plugin>
-        <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
@@ -549,16 +533,6 @@ under the License.
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>findbugs-maven-plugin</artifactId>
-          <version>3.0.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -604,32 +578,10 @@ under the License.
           <excludes combine.children="append">
             <exclude>bootstrap/**</exclude>
             <exclude>README.bootstrap.txt</exclude>
-            <exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
-            <exclude>.maven/spy.log</exclude> <!-- hudson maven3 integration log -->
-            <exclude>.java-version</exclude>
             <exclude>README.md</exclude>
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>${maven.version}</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -660,10 +612,7 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.0.0-M1</version>
             <configuration>
-              <!-- TODO Remove when we upgrade to maven-parent 31 -->
-              <locale>en</locale>
               <tags>
                 <tag>
                   <name>provisional</name>