You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2015/04/01 02:24:05 UTC

[23/50] [abbrv] maven git commit: updated parent pom, cleanup and updated m-checkstyle-p

updated parent pom, cleanup and updated m-checkstyle-p

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

Branch: refs/heads/slf4j-log4j2
Commit: cf33545c2efe4f765007c4baaf242aaf8000df73
Parents: eecdc9a
Author: Hervé Boutemy <hb...@apache.org>
Authored: Wed Mar 4 03:19:03 2015 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Wed Mar 4 03:19:03 2015 +0100

----------------------------------------------------------------------
 pom.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/cf33545c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b1c214c..2bb83b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>25</version>
+    <version>26</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -451,13 +451,6 @@
           <configuration>
             <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.5</version>
-            </dependency>
-          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -501,6 +494,11 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
+        <plugin><!-- TODO remove when upgrading parent to 27 -->
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.14</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -549,8 +547,6 @@
             <exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
             <exclude>.maven/spy.log</exclude> <!-- hudson maven3 integration log -->
           </excludes>
-          <!-- maven-parent:24 sets ignore errors, but core is ahead -->
-          <ignoreErrors>false</ignoreErrors>
         </configuration>
       </plugin>
     </plugins>
@@ -615,6 +611,11 @@
               </reportSet>
             </reportSets>
           </plugin>
+          <plugin><!-- TODO remove when upgrading parent to 27 -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>2.13</version>
+          </plugin>
         </plugins>
       </reporting>
     </profile>