maven-surefire git commit: [SUREFIRE] removed unnecessary dependencies - transitive d. present
Repository: maven-surefire
Updated Branches:
refs/heads/master 3a48c083d -> 9b7ca5a2b
[SUREFIRE] removed unnecessary dependencies - transitive d. present
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9b7ca5a2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9b7ca5a2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9b7ca5a2
Branch: refs/heads/master
Commit: 9b7ca5a2bb214da1e36a86eb4a64bb1194e697e2
Parents: 3a48c08
Author: Tibor17
Authored: Mon Jan 19 01:41:56 2015 +0100
Committer: Tibor17
Committed: Mon Jan 19 01:41:56 2015 +0100
--
surefire-providers/common-junit4/pom.xml | 5 +
surefire-providers/surefire-junit4/pom.xml | 5 -
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b7ca5a2/surefire-providers/common-junit4/pom.xml
--
diff --git a/surefire-providers/common-junit4/pom.xml
b/surefire-providers/common-junit4/pom.xml
index ea836fa..5c39af3 100644
--- a/surefire-providers/common-junit4/pom.xml
+++ b/surefire-providers/common-junit4/pom.xml
@@ -48,5 +48,10 @@
common-java5
${project.version}
+
+ org.apache.maven.shared
+ maven-shared-utils
+ compile
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b7ca5a2/surefire-providers/surefire-junit4/pom.xml
--
diff --git a/surefire-providers/surefire-junit4/pom.xml
b/surefire-providers/surefire-junit4/pom.xml
index 721f915..4a03783 100644
--- a/surefire-providers/surefire-junit4/pom.xml
+++ b/surefire-providers/surefire-junit4/pom.xml
@@ -43,11 +43,6 @@
common-junit4
${project.version}
-
- org.apache.maven.surefire
- common-java5
- ${project.version}
-
svn commit: r1652862 - in /maven/plugins/trunk/maven-checkstyle-plugin: pom.xml src/site/apt/index.apt.vm
Author: hboutemy
Date: Sun Jan 18 22:08:16 2015
New Revision: 1652862
URL: http://svn.apache.org/r1652862
Log:
removed configuration already inherited from parent
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1652862&r1=1652861&r2=1652862&view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Sun Jan 18 22:08:16 2015
@@ -264,10 +264,6 @@ under the License.
-
- maven-site-plugin
- ${sitePluginVersion}
-
@@ -303,18 +299,6 @@ under the License.
-
-org.apache.rat
-apache-rat-plugin
-
-
-check
-
- check
-
-
-
-
@@ -325,8 +309,6 @@ under the License.
maven-invoker-plugin
-
-1.8
clean
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm?rev=1652862&r1=1652861&r2=1652862&view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm Sun
Jan 18 22:08:16 2015
@@ -75,6 +75,8 @@ ${project.name}
The following examples show how to use the Checkstyle Plugin in more
advanced usecases:
+ * {{{./examples/upgrading-checkstyle.html}Upgrading Checkstyle at Runtime}}
+
* {{{./examples/inline-checker-config.html}Using an 'Inline' Checkstyle
Checker Configuration}}
* {{{./examples/custom-checker-config.html}Using a Custom Checkstyle
Checker Configuration}}
svn commit: r1652861 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/it: MCHECKSTYLE-169/pom.xml check-fail/pom.xml turbine-checks/pom.xml
Author: hboutemy Date: Sun Jan 18 21:48:36 2015 New Revision: 1652861 URL: http://svn.apache.org/r1652861 Log: [MCHECKSTYLE-249] updated ITs to not fail when distribution created on Unix and ITs run on Windows Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-169/pom.xml maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-fail/pom.xml maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-169/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-169/pom.xml?rev=1652861&r1=1652860&r2=1652861&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-169/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-169/pom.xml Sun Jan 18 21:48:36 2015 @@ -21,16 +21,20 @@ under the License. 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/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + com.company parent pom 1.0.0 + UTF-8 @project.version@ + NewlineAtEndOfFile + Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-fail/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-fail/pom.xml?rev=1652861&r1=1652860&r2=1652861&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-fail/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-fail/pom.xml Sun Jan 18 21:48:36 2015 @@ -32,6 +32,7 @@ UTF-8 + NewlineAtEndOfFile Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml?rev=1652861&r1=1652860&r2=1652861&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/pom.xml Sun Jan 18 21:48:36 2015 @@ -20,7 +20,7 @@ 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/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 org.apache.maven.plugins.checkstyle @@ -32,6 +32,7 @@ UTF-8 + NewlineAtEndOfFile
svn commit: r1652857 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java test/plugin-configs/custom-plugin-config.xml
Author: hboutemy
Date: Sun Jan 18 21:40:14 2015
New Revision: 1652857
URL: http://svn.apache.org/r1652857
Log:
[MCHECKSTYLE-281] fail if deprecated parameters are used and display update
instructions
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=1652857&r1=1652856&r2=1652857&view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Sun Jan 18 21:40:14 2015
@@ -239,14 +239,19 @@ public class CheckstyleReport
/**
* Merge in the deprecated parameters to the new ones, unless the new
* parameters have values.
+ * @throws MavenReportException
*
* @deprecated Remove when deprecated params are removed.
*/
private void mergeDeprecatedInfo()
+throws MavenReportException
{
if ( "config/sun_checks.xml".equals( configLocation ) &&
!"sun".equals( format ) )
{
configLocation = FORMAT_TO_CONFIG_LOCATION.get( format );
+
+throw new MavenReportException( "'format' parameter is deprecated:
please replace with "
++ configLocation + "." );
}
if ( StringUtils.isEmpty( propertiesLocation ) )
@@ -254,10 +259,16 @@ public class CheckstyleReport
if ( propertiesFile != null )
{
propertiesLocation = propertiesFile.getPath();
+
+throw new MavenReportException( "'propertiesFile' parameter is
deprecated: please replace with "
++ "" + propertiesLocation +
"." );
}
else if ( propertiesURL != null )
{
propertiesLocation = propertiesURL.toExternalForm();
+
+throw new MavenReportException( "'propertiesURL' parameter is
deprecated: please replace with "
++ "" + propertiesLocation
+ "." );
}
}
@@ -273,11 +284,23 @@ public class CheckstyleReport
if ( StringUtils.isEmpty( suppressionsLocation ) )
{
suppressionsLocation = suppressionsFile;
+
+if ( StringUtils.isNotEmpty( suppressionsFile ) )
+{
+throw new MavenReportException( "'suppressionsFile' parameter
is deprecated: please replace with "
++ "" + suppressionsLocation +
"." );
+}
}
if ( StringUtils.isEmpty( packageNamesLocation ) )
{
packageNamesLocation = packageNamesFile;
+
+if ( StringUtils.isNotEmpty( packageNamesFile ) )
+{
+throw new MavenReportException( "'packageNamesFile' parameter
is deprecated: please replace with "
++ "" + suppressionsLocation +
"." );
+}
}
}
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml?rev=1652857&r1=1652856&r2=1652857&view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml
Sun Jan 18 21:40:14 2015
@@ -29,8 +29,7 @@ under the License.
true
true
**/*.java
- config/sun_checks.xml
- maven
+ config/maven_checks.xml
LICENSE.txt
${basedir}/src/test/test-sources/LICENSE.txt
${basedir}/target/test-harness/checkstyle/custom/checkstyle-cachefile
svn commit: r1652846 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/site: apt/examples/upgrading-checkstyle.apt.vm apt/index.apt.vm site.xml
Author: hboutemy
Date: Sun Jan 18 20:10:34 2015
New Revision: 1652846
URL: http://svn.apache.org/r1652846
Log:
[MCHECKSTYLE-280] added documentation on upgrading Checkstyle at runtime
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/upgrading-checkstyle.apt.vm
(with props)
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
maven/plugins/trunk/maven-checkstyle-plugin/src/site/site.xml
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/upgrading-checkstyle.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/upgrading-checkstyle.apt.vm?rev=1652846&view=auto
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/upgrading-checkstyle.apt.vm
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/upgrading-checkstyle.apt.vm
Sun Jan 18 20:10:34 2015
@@ -0,0 +1,59 @@
+ --
+ Upgrading Checkstyle at Runtime
+ --
+ 2015-01-18
+ --
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+Upgrading Checkstyle at Runtime
+
+ Maven Checkstyle plugin comes with a default Checkstyle version: for
<<>>,
+ Checkstyle ${checkstyleVersion} is used by default.
+
+ Given Checkstyle generally keeps good compatibility between versions, you
can override the version used at runtime to
+ benefit from
{{{http://checkstyle.sourceforge.net/releasenotes.html}Checkstyle latest
bugfixes}}:
+
++-+
+
+ ...
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${project.version}
+
+
+ com.puppycrawl.tools
+ checkstyle
+ ...choose your version...
+
+
+
+
+
+
+ ...
+
++-+
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/upgrading-checkstyle.apt.vm
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/upgrading-checkstyle.apt.vm
--
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm?rev=1652846&r1=1652845&r2=1652846&view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm Sun
Jan 18 20:10:34 2015
@@ -31,7 +31,9 @@ ${project.name}
The Checkstyle Plugin generates a report regarding the code style used by
the developers. For more information about Checkstyle,
see
{{{http://checkstyle.sourceforge.net/}http://checkstyle.sourceforge.net/}}.
- This version of the plugin uses Checkstyle ${checkstyleVersion} and requires
Java ${javaVersion}.
+
+ This version of the plugin uses Checkstyle ${checkstyleVersion} by default
and requires Java ${javaVersion}. But you can
+ {{{./examples/upgrading-checkstyle.html}upgrade the version used at
runtime}}.
The plugin can be configured in the project's POM. Predefined rulesets are
included with the plugin, these are:
{{{./config/sun_checks.html}<<>>}},
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/site.xml?rev=1652846&r1=1652845&r2=1652846&view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/site.xml Sun Jan 18
20:10:34 2015
@@ -31,6 +31,7 @@ under the License.
+
svn commit: r936683 [3/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/web
Modified: websites/staging/maven/trunk/content/guides/mini/guide-central-repository-upload.html == --- websites/staging/maven/trunk/content/guides/mini/guide-central-repository-upload.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-central-repository-upload.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -15,7 +15,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -45,7 +45,7 @@ Brian Fox" /> Guide to uploading artifacts to the Central Repository -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/guides/mini/guide-configuring-maven.html == --- websites/staging/maven/trunk/content/guides/mini/guide-configuring-maven.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-configuring-maven.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Guide to Configuring Maven -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/guides/mini/guide-configuring-plugins.html == --- websites/staging/maven/trunk/content/guides/mini/guide-configuring-plugins.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-configuring-plugins.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -15,7 +15,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -45,7 +45,7 @@ Vincent Siveton" /> Guide to Configuring Plug-ins -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/guides/mini/guide-coping-with-sun-jars.html == --- websites/staging/maven/trunk/content/guides/mini/guide-coping-with-sun-jars.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-coping-with-sun-jars.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Guide to Coping with Sun JARs -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/guides/mini/guide-creating-archetypes.html == --- websites/staging/maven/trunk/content/guides/mini/guide-creating-archetypes.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-creating-archetypes.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Guide to Creating Archetypes -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/guides/mini/guide-default-execution-ids.html == --- websites/staging/maven/trunk/content/guides/mini/guide-default-execution-ids.html (original) +++ websites/staging/mav
svn commit: r936683 [2/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/web
Modified: websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html == --- websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html (original) +++ websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Release Notes - Maven 3.0-alpha-6 -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html == --- websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html (original) +++ websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Release Notes - Maven 3.0-alpha-7 -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html == --- websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html (original) +++ websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Release Notes - Maven 3.0-beta-1 -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html == --- websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html (original) +++ websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Release Notes - Maven 3.0-beta-2 -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html == --- websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html (original) +++ websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Release Notes - Maven 3.0-beta-3 -Last Published: 2015-01-15 +Last Published: 2015-01-18 Modified: websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html == --- websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html (original) +++ websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html Sun Jan 18 20:11:01 2015 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7
svn commit: r1652845 - /maven/site/trunk/content/apt/guides/getting-started/index.apt
Author: michaelo
Date: Sun Jan 18 20:10:21 2015
New Revision: 1652845
URL: http://svn.apache.org/r1652845
Log:
[MNGSITE-221] Broken link in maven site
Remove link to document which was removed in r1650255 because it was horribly
outdated.
Modified:
maven/site/trunk/content/apt/guides/getting-started/index.apt
Modified: maven/site/trunk/content/apt/guides/getting-started/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/getting-started/index.apt?rev=1652845&r1=1652844&r2=1652845&view=diff
==
--- maven/site/trunk/content/apt/guides/getting-started/index.apt (original)
+++ maven/site/trunk/content/apt/guides/getting-started/index.apt Sun Jan 18
20:10:21 2015
@@ -86,8 +86,7 @@ Sections
* {How can Maven benefit my development process?}
Maven can provide benefits for your build process by employing standard
conventions and practices to accelerate your development
- cycle while at the same time helping you achieve a higher rate of success.
For a more detailed look at how
- Maven can help you with your development process please refer to
{{{../../benefits-of-using-maven.html}The Benefits of Using Maven}}.
+ cycle while at the same time helping you achieve a higher rate of success.
Now that we have covered a little bit of the history and purpose of Maven
let's get into some real examples to
get you up and running with Maven!
svn commit: r1652817 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/resources/config/maven_checks.xml main/resources/config/turbine_checks.xml site/apt/config/turbine_checks.apt.vm
Author: hboutemy
Date: Sun Jan 18 17:58:37 2015
New Revision: 1652817
URL: http://svn.apache.org/r1652817
Log:
improved comments
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/turbine_checks.apt.vm
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml?rev=1652817&r1=1652816&r2=1652817&view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml
Sun Jan 18 17:58:37 2015
@@ -24,6 +24,7 @@ under the License.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml?rev=1652817&r1=1652816&r2=1652817&view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml
Sun Jan 18 17:58:37 2015
@@ -19,34 +19,12 @@ under the License.
-->
http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+"http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/turbine_checks.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/turbine_checks.apt.vm?rev=1652817&r1=1652816&r2=1652817&view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/turbine_checks.apt.vm
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/turbine_checks.apt.vm
Sun Jan 18 17:58:37 2015
@@ -29,6 +29,7 @@
<<>> Predefined Ruleset
- Maven Checkstyle plugin contains <<>> predefined
ruleset for Turbine coding conventions:
+ Maven Checkstyle plugin contains <<>> predefined
ruleset for
+ {{{http://turbine.apache.org/common/code-standards.html}Turbine coding
conventions}}:
%{snippet|file=${project.basedir}/src/main/resources/config/turbine_checks.xml}
svn commit: r1652813 - /maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
Author: hboutemy
Date: Sun Jan 18 17:41:10 2015
New Revision: 1652813
URL: http://svn.apache.org/r1652813
Log:
fixed typo
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm?rev=1652813&r1=1652812&r2=1652813&view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm Sun
Jan 18 17:41:10 2015
@@ -34,9 +34,9 @@ ${project.name}
This version of the plugin uses Checkstyle ${checkstyleVersion} and requires
Java ${javaVersion}.
The plugin can be configured in the project's POM. Predefined rulesets are
included with the plugin, these are:
- {{{./config/sun_checks.xml}<<>>}},
- {{{./config/turbine_checks.xml}<<>>}} and
- {{{./config/maven_checks.xml}<<>>}}. You can also use a
custom ruleset by
+ {{{./config/sun_checks.html}<<>>}},
+ {{{./config/turbine_checks.html}<<>>}} and
+ {{{./config/maven_checks.html}<<>>}}. You can also use a
custom ruleset by
specifying it in the plugin configuration.
* Goals Overview
svn commit: r1652807 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt: config/ config/index.apt config/maven_checks.apt.vm config/sun_checks.apt.vm config/turbine_checks.apt.vm index.apt
Author: hboutemy
Date: Sun Jan 18 17:30:52 2015
New Revision: 1652807
URL: http://svn.apache.org/r1652807
Log:
[MCHECKSTYLE-257] display predefined rulesets content
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/maven_checks.apt.vm
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/sun_checks.apt.vm
(with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/turbine_checks.apt.vm
(with props)
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
Added: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt?rev=1652807&view=auto
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt
(added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt
Sun Jan 18 17:30:52 2015
@@ -0,0 +1,40 @@
+ --
+ Predefined Rulesets
+ --
+ Hervé Boutemy
+ --
+ 2015-01-18
+ --
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+Predefined Rulesets
+
+ Maven Checkstyle plugin contains predefined rulesets:
+
+ * {{{./sun_checks.html}<<>>}},
+
+ * {{{./maven_checks.html}<<>>}},
+
+ * {{{./turbine_checks.html}<<>>}}.
+
+ []
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/maven_checks.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/maven_checks.apt.vm?rev=1652807&view=auto
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/maven_checks.apt.vm
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/maven_checks.apt.vm
Sun Jan 18 17:30:52 2015
@@ -0,0 +1,35 @@
+ --
+ config/maven_checks.xml Predefined Ruleset
+ --
+ Hervé Boutemy
+ --
+ 2015-01-18
+ --
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+<<>> Predefined Ruleset
+
+ Maven Checkstyle plugin contains <<>> predefined
ruleset for
+ {{{/developers/conventions/code.html}Maven coding conventions}}:
+
+%{snippet|file=${project.basedir}/src/main/resources/config/maven_checks.xml}
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/maven_checks.apt.vm
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/maven_
svn commit: r1652792 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/exec/ site/apt/ site/apt/examples/
Author: hboutemy Date: Sun Jan 18 16:57:34 2015 New Revision: 1652792 URL: http://svn.apache.org/r1652792 Log: fixed date format Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutor.java maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-property-expansion.apt.vm maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt.vm maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/usage.apt.vm Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutor.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutor.java?rev=1652792&r1=1652791&r2=1652792&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutor.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutor.java Sun Jan 18 16:57:34 2015 @@ -20,6 +20,7 @@ package org.apache.maven.plugin.checksty */ import com.puppycrawl.tools.checkstyle.api.CheckstyleException; +import com.puppycrawl.tools.checkstyle.api.Configuration; /** * @author Olivier Lamy @@ -37,4 +38,7 @@ public interface CheckstyleExecutor */ CheckstyleResults executeCheckstyle( CheckstyleExecutorRequest request ) throws CheckstyleExecutorException, CheckstyleException; + +Configuration getConfiguration( CheckstyleExecutorRequest request ) +throws CheckstyleExecutorException; } Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm?rev=1652792&r1=1652791&r2=1652792&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm Sun Jan 18 16:57:34 2015 @@ -1,7 +1,7 @@ -- Using a Custom Checkstyle Checker Configuration -- - July 2006 + 2006-07-21 -- ~~ Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-property-expansion.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-property-expansion.apt.vm?rev=1652792&r1=1652791&r2=1652792&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-property-expansion.apt.vm (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-property-expansion.apt.vm Sun Jan 18 16:57:34 2015 @@ -1,7 +1,7 @@ -- Using Custom Checkstyle Property Expansion Definitions -- - July 2006 + 2006-07-21 -- ~~ Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm?rev=1652792&r1=1652791&r2=1652792&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm Sun Jan 18 16:57:34 2015 @@ -1,7 +1,7 @@ -- Using an 'inlined' Checkstyle Checker Configuration -- - Feb 2014 + 2014-02-14 -- ~~ Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt.vm?rev=1652792&r1=1652791&r2=1652792&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt.vm (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/suppressions-filter.apt.vm Sun Jan 18 16:57:34 2015 @@ -1,7 +1,7 @@ -- Using a Sup
svn commit: r1652790 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle: ./ exec/
Author: hboutemy Date: Sun Jan 18 16:41:01 2015 New Revision: 1652790 URL: http://svn.apache.org/r1652790 Log: use injected log Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleExecutorRequest.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java?rev=1652790&r1=1652789&r2=1652790&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java Sun Jan 18 16:41:01 2015 @@ -70,7 +70,7 @@ public class CheckstyleAggregateReport .setResourceIncludes( resourceIncludes ) .setResourceExcludes( resourceExcludes ) .setIncludeTestSourceDirectory( includeTestSourceDirectory ).setListener( getListener() ) -.setLog( getLog() ).setProject( project ).setSourceDirectories( getSourceDirectories() ) +.setProject( project ).setSourceDirectories( getSourceDirectories() ) .setResources( resources ).setTestResources( testResources ) .setStringOutputStream( stringOutputStream ).setSuppressionsLocation( suppressionsLocation ) .setTestSourceDirectories( getTestSourceDirectories() ).setConfigLocation( configLocation ) Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=1652790&r1=1652789&r2=1652790&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Sun Jan 18 16:41:01 2015 @@ -170,7 +170,7 @@ public class CheckstyleReport .setIncludeResources( includeResources ) .setIncludeTestResources( includeTestResources ) .setIncludeTestSourceDirectory( includeTestSourceDirectory ).setListener( getListener() ) -.setLog( getLog() ).setProject( project ).setSourceDirectories( getSourceDirectories() ) +.setProject( project ).setSourceDirectories( getSourceDirectories() ) .setResources( resources ) .setStringOutputStream( stringOutputStream ).setSuppressionsLocation( suppressionsLocation ) .setTestSourceDirectories( getTestSourceDirectories() ).setConfigLocation( configLocation ) Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java?rev=1652790&r1=1652789&r2=1652790&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java Sun Jan 18 16:41:01 2015 @@ -520,7 +520,7 @@ public class CheckstyleViolationCheckMoj .setIncludeResources( includeResources ) .setIncludeTestResources( includeTestResources ) .setIncludeTestSourceDirectory( includeTestSourceDirectory ).setListener( getListener() ) -.setLog( getLog() ).setProject( project ).setSourceDirectories( getSourceDirectories() ) +.setProject( project ).setSourceDirectories( getSourceDirectories() ) .setResources( resources ) .setStringOutputStream( stringOutputStream ).setSuppressionsL
maven git commit: [MNG-5755] Access toolchains without maven-toolchain-plugin Added List getToolchains( MavenSession session, String type, Map requirements ) to ToolchainMan
Repository: maven
Updated Branches:
refs/heads/master b6ae8ef8a -> 4b263106d
[MNG-5755] Access toolchains without maven-toolchain-plugin
Added List getToolchains( MavenSession session, String type,
Map requirements ) to ToolchainManager
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4b263106
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4b263106
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4b263106
Branch: refs/heads/master
Commit: 4b263106db043f5c1d7c314237ab2bc8708c0538
Parents: b6ae8ef
Author: Robert Scholte
Authored: Sun Jan 18 16:53:56 2015 +0100
Committer: Robert Scholte
Committed: Sun Jan 18 16:53:56 2015 +0100
--
.../toolchain/DefaultToolchainManager.java | 68 +++--
.../maven/toolchain/ToolchainManager.java | 15 ++
.../maven/toolchain/ToolchainPrivate.java | 6 +-
.../toolchain/DefaultToolchainManagerTest.java | 153 +++
4 files changed, 225 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/4b263106/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
index 591afd8..b852f1c 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
@@ -19,7 +19,10 @@ package org.apache.maven.toolchain;
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.maven.execution.MavenSession;
@@ -42,7 +45,8 @@ public class DefaultToolchainManager
@Requirement( role = ToolchainFactory.class )
Map factories;
-
+
+@Override
public Toolchain getToolchainFromBuildContext( String type, MavenSession
session )
{
Map context = retrieveContext( session );
@@ -51,28 +55,60 @@ public class DefaultToolchainManager
if ( model != null )
{
-try
-{
-ToolchainFactory fact = factories.get( type );
-if ( fact != null )
-{
-return fact.createToolchain( model );
-}
-else
-{
-logger.error( "Missing toolchain factory for type: " + type
-+ ". Possibly caused by misconfigured project." );
-}
-}
-catch ( MisconfiguredToolchainException ex )
+List toolchains = selectToolchains(
Collections.singletonList( model ), type, null );
+
+if ( !toolchains.isEmpty() )
{
-logger.error( "Misconfigured toolchain.", ex );
+return toolchains.get( 0 );
}
}
return null;
}
+@Override
+public List getToolchains( MavenSession session, String type,
Map requirements )
+{
+List models =
session.getRequest().getToolchains().get( type );
+
+return selectToolchains( models, type, requirements );
+}
+
+private List selectToolchains( List models,
String type, Map requirements )
+{
+List toolchains = new ArrayList();
+
+if ( models != null )
+{
+ToolchainFactory fact = factories.get( type );
+
+if ( fact == null )
+{
+logger.error( "Missing toolchain factory for type: " + type
++ ". Possibly caused by misconfigured project." );
+}
+else
+{
+for ( ToolchainModel model : models )
+{
+try
+{
+ToolchainPrivate toolchain = fact.createToolchain(
model );
+if ( requirements == null ||
toolchain.matchesRequirements( requirements ) )
+{
+toolchains.add( toolchain );
+}
+}
+catch ( MisconfiguredToolchainException ex )
+{
+logger.error( "Misconfigured toolchain.", ex );
+}
+}
+}
+}
+return toolchains;
+}
+
Map retrieveContext( MavenSession session )
{
Map context = null;
http://git-wip-us.apache.org/repos/asf/maven/blob/4b263106/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
-
svn commit: r1652772 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/ site/apt/examples/
Author: dennisl Date: Sun Jan 18 15:01:39 2015 New Revision: 1652772 URL: http://svn.apache.org/r1652772 Log: [MCHECKSTYLE-274] removed Avalon configuration since the Avalon project is retired Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=1652772&r1=1652771&r2=1652772&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Sun Jan 18 15:01:39 2015 @@ -67,7 +67,7 @@ public class CheckstyleReport /** * Specifies what predefined check set to use. Available sets are "sun" (for - * the Sun coding conventions), "turbine", and "avalon". + * the Sun coding conventions), and "turbine". * * @deprecated Use configLocation instead. */ Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java?rev=1652772&r1=1652771&r2=1652772&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java Sun Jan 18 15:01:39 2015 @@ -190,13 +190,12 @@ public class CheckstyleViolationCheckMoj * * * - * There are 4 predefined rulesets. + * There are 3 predefined rulesets. * * * * config/sun_checks.xml: Sun Checks. * config/turbine_checks.xml: Turbine Checks. - * config/avalon_checks.xml: Avalon Checks. * config/maven_checks.xml: Maven Source Checks. * * Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm?rev=1652772&r1=1652771&r2=1652772&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm Sun Jan 18 15:01:39 2015 @@ -63,5 +63,3 @@ Using a Custom Checkstyle Checker Config * <> - Maven Development Definitions. * <> - Turbine Development Definitions. - - * <> - Avalon Development Definitions. \ No newline at end of file
svn commit: r1652771 - in /maven/plugins/trunk/maven-checkstyle-plugin: pom.xml src/site/apt/index.apt.vm
Author: dennisl
Date: Sun Jan 18 14:59:07 2015
New Revision: 1652771
URL: http://svn.apache.org/r1652771
Log:
Document and enforce the version of Java that the plugin requires.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1652771&r1=1652770&r2=1652771&view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Sun Jan 18 14:59:07 2015
@@ -58,6 +58,7 @@ under the License.
+1.5
2.2.1
5.8
1.4
@@ -271,6 +272,27 @@ under the License.
+org.codehaus.mojo
+animal-sniffer-maven-plugin
+1.13
+
+
+org.codehaus.mojo.signature
+java15
+1.0
+
+
+
+
+check-java-1.5-compat
+process-classes
+
+ check
+
+
+
+
+
org.codehaus.plexus
plexus-component-metadata
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm?rev=1652771&r1=1652770&r2=1652771&view=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm Sun
Jan 18 14:59:07 2015
@@ -31,7 +31,7 @@ ${project.name}
The Checkstyle Plugin generates a report regarding the code style used by
the developers. For more information about Checkstyle,
see
{{{http://checkstyle.sourceforge.net/}http://checkstyle.sourceforge.net/}}.
- This version of the plugin uses Checkstyle ${checkstyleVersion} by default.
+ This version of the plugin uses Checkstyle ${checkstyleVersion} and requires
Java ${javaVersion}.
The plugin can be configured in the project's POM. Predefined rulesets are
included with the plugin, these are:
<<>>, <<>> and <<>>.
You can also use a custom ruleset by
svn commit: r1652765 - /maven/plugins/trunk/maven-doap-plugin/pom.xml
Author: khmarbaise Date: Sun Jan 18 14:46:15 2015 New Revision: 1652765 URL: http://svn.apache.org/r1652765 Log: [MDOAP-45] Upgrade plexus-i18n to 1.0-beta-10 Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/pom.xml?rev=1652765&r1=1652764&r2=1652765&view=diff == --- maven/plugins/trunk/maven-doap-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-doap-plugin/pom.xml Sun Jan 18 14:46:15 2015 @@ -130,7 +130,7 @@ under the License. org.codehaus.plexus plexus-i18n - 1.0-beta-7 + 1.0-beta-10 org.codehaus.plexus
svn commit: r1652763 - /maven/plugins/trunk/maven-doap-plugin/pom.xml
Author: khmarbaise Date: Sun Jan 18 14:44:08 2015 New Revision: 1652763 URL: http://svn.apache.org/r1652763 Log: [MDOAP-44] Upgrade plexus-utils to 3.0.20 Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/pom.xml?rev=1652763&r1=1652762&r2=1652763&view=diff == --- maven/plugins/trunk/maven-doap-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-doap-plugin/pom.xml Sun Jan 18 14:44:08 2015 @@ -120,7 +120,7 @@ under the License. org.codehaus.plexus plexus-utils - 3.0.18 + 3.0.20 org.codehaus.plexus
svn commit: r1652762 - /maven/plugins/trunk/maven-doap-plugin/pom.xml
Author: khmarbaise Date: Sun Jan 18 14:41:39 2015 New Revision: 1652762 URL: http://svn.apache.org/r1652762 Log: [MDOAP-43] Upgrade to scm 1.9.2 Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/pom.xml?rev=1652762&r1=1652761&r2=1652762&view=diff == --- maven/plugins/trunk/maven-doap-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-doap-plugin/pom.xml Sun Jan 18 14:41:39 2015 @@ -58,7 +58,7 @@ under the License. 2.2.1 -1.9.1 +1.9.2
svn commit: r1652760 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
Author: dennisl Date: Sun Jan 18 14:24:49 2015 New Revision: 1652760 URL: http://svn.apache.org/r1652760 Log: [MCHECKSTYLE-253] Upgrade to checkstyle 5.9 for Java 8 compatibility - Revert the upgrade of Checkstyle that was done in r1632982. The Checkstyle version used by the plugin is now 5.8. Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1652760&r1=1652759&r2=1652760&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Sun Jan 18 14:24:49 2015 @@ -59,7 +59,7 @@ under the License. 2.2.1 -5.9 +5.8 1.4 3.4
svn commit: r1652757 - /maven/shared/tags/maven-dependency-analyzer-1.6/
Author: khmarbaise Date: Sun Jan 18 14:16:31 2015 New Revision: 1652757 URL: http://svn.apache.org/r1652757 Log: [maven-release-plugin] copy for tag maven-dependency-analyzer-1.6 Added: maven/shared/tags/maven-dependency-analyzer-1.6/ - copied from r1652756, maven/shared/trunk/maven-dependency-analyzer/
svn commit: r1652756 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: khmarbaise Date: Sun Jan 18 14:16:17 2015 New Revision: 1652756 URL: http://svn.apache.org/r1652756 Log: [maven-release-plugin] prepare release maven-dependency-analyzer-1.6 Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1652756&r1=1652755&r2=1652756&view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Sun Jan 18 14:16:17 2015 @@ -30,7 +30,7 @@ maven-dependency-analyzer jar - 1.6-SNAPSHOT + 1.6 Apache Maven Dependency Analyzer @@ -38,9 +38,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer - http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.6 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.6 + http://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-analyzer-1.6 jira
svn commit: r1652758 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: khmarbaise Date: Sun Jan 18 14:16:34 2015 New Revision: 1652758 URL: http://svn.apache.org/r1652758 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1652758&r1=1652757&r2=1652758&view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Sun Jan 18 14:16:34 2015 @@ -30,7 +30,7 @@ maven-dependency-analyzer jar - 1.6 + 1.7-SNAPSHOT Apache Maven Dependency Analyzer @@ -38,9 +38,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.6 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.6 - http://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-analyzer-1.6 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer + http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer jira
svn commit: r1652717 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: khmarbaise Date: Sun Jan 18 09:34:55 2015 New Revision: 1652717 URL: http://svn.apache.org/r1652717 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1652717&r1=1652716&r2=1652717&view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Sun Jan 18 09:34:55 2015 @@ -28,7 +28,7 @@ maven-jarsigner - 1.4 + 1.5-SNAPSHOT Apache Maven Jarsigner A component to assist in signing jars. @@ -38,9 +38,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.4 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.4 - http://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.4 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner +http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner jira
svn commit: r1652716 - /maven/shared/tags/maven-jarsigner-1.4/
Author: khmarbaise Date: Sun Jan 18 09:34:52 2015 New Revision: 1652716 URL: http://svn.apache.org/r1652716 Log: [maven-release-plugin] copy for tag maven-jarsigner-1.4 Added: maven/shared/tags/maven-jarsigner-1.4/ - copied from r1652715, maven/shared/trunk/maven-jarsigner/
svn commit: r1652715 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: khmarbaise Date: Sun Jan 18 09:34:38 2015 New Revision: 1652715 URL: http://svn.apache.org/r1652715 Log: [maven-release-plugin] prepare release maven-jarsigner-1.4 Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1652715&r1=1652714&r2=1652715&view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Sun Jan 18 09:34:38 2015 @@ -28,7 +28,7 @@ maven-jarsigner - 1.4-SNAPSHOT + 1.4 Apache Maven Jarsigner A component to assist in signing jars. @@ -38,9 +38,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner -http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.4 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-jarsigner-1.4 + http://svn.apache.org/viewvc/maven/shared/tags/maven-jarsigner-1.4 jira
svn commit: r1652714 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: khmarbaise Date: Sun Jan 18 09:29:44 2015 New Revision: 1652714 URL: http://svn.apache.org/r1652714 Log: Upgrade junit from 4.9 to 4.11 Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1652714&r1=1652713&r2=1652714&view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Sun Jan 18 09:29:44 2015 @@ -79,7 +79,7 @@ junit junit - 4.9 + 4.11 test
svn commit: r1652713 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: khmarbaise
Date: Sun Jan 18 09:25:28 2015
New Revision: 1652713
URL: http://svn.apache.org/r1652713
Log:
[MSHARED-398] Removed dependency plexus-container-default:1.0-alpha-9-stable-1
Modified:
maven/shared/trunk/maven-jarsigner/pom.xml
Modified: maven/shared/trunk/maven-jarsigner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1652713&r1=1652712&r2=1652713&view=diff
==
--- maven/shared/trunk/maven-jarsigner/pom.xml (original)
+++ maven/shared/trunk/maven-jarsigner/pom.xml Sun Jan 18 09:25:28 2015
@@ -71,11 +71,6 @@
- org.codehaus.plexus
- plexus-container-default
- 1.0-alpha-9-stable-1
-
-
org.apache.maven
maven-toolchain
${mavenVersion}
svn commit: r1652712 - /maven/shared/trunk/maven-jarsigner/pom.xml
Author: khmarbaise Date: Sun Jan 18 09:16:39 2015 New Revision: 1652712 URL: http://svn.apache.org/r1652712 Log: [MSHARED-397] Upgrade maven-shared-utils to 0.7 Modified: maven/shared/trunk/maven-jarsigner/pom.xml Modified: maven/shared/trunk/maven-jarsigner/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1652712&r1=1652711&r2=1652712&view=diff == --- maven/shared/trunk/maven-jarsigner/pom.xml (original) +++ maven/shared/trunk/maven-jarsigner/pom.xml Sun Jan 18 09:16:39 2015 @@ -61,7 +61,7 @@ org.apache.maven.shared maven-shared-utils - 0.6 + 0.7
