You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/11/16 22:22:15 UTC
svn commit: r880962 - in /maven/plugins/branches/maven-site-plugin-3.x:
pom.xml src/it/full-reporting/pom.xml
src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java
Author: olamy
Date: Mon Nov 16 21:22:14 2009
New Revision: 880962
URL: http://svn.apache.org/viewvc?rev=880962&view=rev
Log:
use checkstyle plugin snapshot version which fix MCHECKSTYLE-123
Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=880962&r1=880961&r2=880962&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Mon Nov 16 21:22:14 2009
@@ -163,6 +163,7 @@
<javadocPluginVersion>2.6.1</javadocPluginVersion>
<!-- previous version breaks due to use of plexusContainer.getLoggerManager() -->
<projectInfoReportsPluginVersion>2.2-SNAPSHOT</projectInfoReportsPluginVersion>
+ <checkstylePluginVersion>2.5-SNAPSHOT</checkstylePluginVersion>
</properties>
<dependencies>
@@ -407,7 +408,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -486,7 +487,6 @@
<version>${projectInfoReportsPluginVersion}</version>
</plugin>
<plugin>
- <!-- SNAPSHOT use due to MJAVADOC-251 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
@@ -528,15 +528,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
- <dependencies>
- <!-- MSHARED-125 -->
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-filtering</artifactId>
- <version>1.0-beta-4-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <version>2.4.1</version>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml?rev=880962&r1=880961&r2=880962&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml Mon Nov 16 21:22:14 2009
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>11</version>
+ <version>15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.site.its</groupId>
@@ -13,8 +13,8 @@
<name>surefire-report</name>
<url>http://maven.apache.org</url>
<properties>
- <!-- SNAPSHOT use due to MJAVADOC-251 -->
<javadocPluginVersion>@javadocPluginVersion@</javadocPluginVersion>
+ <checkstylePluginVersion>@checkstylePluginVersion@</checkstylePluginVersion>
<projectInfoReportsPluginVersion>@projectInfoReportsPluginVersion@</projectInfoReportsPluginVersion>
</properties>
<dependencies>
@@ -39,6 +39,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstylePluginVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>@projectInfoReportsPluginVersion@</version>
</plugin>
@@ -60,7 +65,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstylePluginVersion}</version>
+ </plugin>
</plugins>
</reporting>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java?rev=880962&r1=880961&r2=880962&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java Mon Nov 16 21:22:14 2009
@@ -1,5 +1,24 @@
package org.apache.maven.plugins.site.its;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
/**
* Hello world!
*