svn commit: r1653380 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/main: java/org/apache/maven/plugin/checkstyle/ resources/
Author: hboutemy Date: Tue Jan 20 21:51:36 2015 New Revision: 1653380 URL: http://svn.apache.org/r1653380 Log: [MCHECKSTYLE-282] added info on ruleset used in report intro Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_fr.properties maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_pt_BR.properties Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java?rev=1653380&r1=1653379&r2=1653380&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java Tue Jan 20 21:51:36 2015 @@ -670,7 +670,7 @@ public abstract class AbstractCheckstyle private void generateMainReport( CheckstyleResults results, ResourceBundle bundle ) { CheckstyleReportGenerator generator = -new CheckstyleReportGenerator( getSink(), bundle, project.getBasedir(), siteTool ); +new CheckstyleReportGenerator( getSink(), bundle, project.getBasedir(), siteTool, configLocation ); generator.setLog( getLog() ); generator.setEnableRulesSummary( enableRulesSummary ); Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?rev=1653380&r1=1653379&r2=1653380&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Tue Jan 20 21:51:36 2015 @@ -75,7 +75,10 @@ public class CheckstyleReportGenerator private final IconTool iconTool; -public CheckstyleReportGenerator( Sink sink, ResourceBundle bundle, File basedir, SiteTool siteTool ) +private final String ruleset; + +public CheckstyleReportGenerator( Sink sink, ResourceBundle bundle, File basedir, SiteTool siteTool, + String ruleset ) { this.bundle = bundle; @@ -85,6 +88,8 @@ public class CheckstyleReportGenerator this.siteTool = siteTool; +this.ruleset = ruleset; + this.enableRulesSummary = true; this.enableSeveritySummary = true; this.enableFilesSummary = true; @@ -176,6 +181,8 @@ public class CheckstyleReportGenerator sink.text( " " ); sink.text( version ); } +sink.text( " " ); +sink.text( String.format( bundle.getString( "report.checkstyle.ruleset" ), ruleset ) ); sink.text( "." ); if ( enableRSS ) Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties?rev=1653380&r1=1653379&r2=1653380&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties [ISO-8859-1] (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties [ISO-8859-1] Tue Jan 20 21:51:36 2015 @@ -39,6 +39,7 @@ report.checkstyle.details=Details report.checkstyle.summary=Summary report.checkstyle.rule=Rule report.checkstyle.rules=Rules +report.checkstyle.ruleset=with %s ruleset report.checkstyle.rule.category=Category report.checkstyle.severity_title=Checkstyle errors in severity report.checkstyle.norule=No rules found Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties?rev=1
svn commit: r1653360 - /maven/shared/trunk/maven-shared-incremental/pom.xml
Author: khmarbaise Date: Tue Jan 20 20:18:23 2015 New Revision: 1653360 URL: http://svn.apache.org/r1653360 Log: [MSHARED-406] Upgrade maven-shared-utils to 0.7 Modified: maven/shared/trunk/maven-shared-incremental/pom.xml Modified: maven/shared/trunk/maven-shared-incremental/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-incremental/pom.xml?rev=1653360&r1=1653359&r2=1653360&view=diff == --- maven/shared/trunk/maven-shared-incremental/pom.xml (original) +++ maven/shared/trunk/maven-shared-incremental/pom.xml Tue Jan 20 20:18:23 2015 @@ -107,7 +107,7 @@ org.apache.maven.shared maven-shared-utils - 0.1 + 0.7
svn commit: r1653350 [1/2] - in /maven/plugins/trunk/maven-pmd-plugin/src: it/empty-rulesets/src/main/java/com/mycompany/app/ it/mpmd-138/mod-3/ it/mpmd-138/mod-4/ it/mpmd-142/ it/mpmd-168-empty-repor
Author: dantran Date: Tue Jan 20 19:54:03 2015 New Revision: 1653350 URL: http://svn.apache.org/r1653350 Log: Code format Modified: maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/App.java maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/Foo.java maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-4/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-142/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168-empty-report/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/pom.xml maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/rules/DummyRule.java maven/plugins/trunk/maven-pmd-plugin/src/main/resources/rulesets/maven.xml maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojoTest.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java Modified: maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/App.java?rev=1653350&r1=1653349&r2=1653350&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/App.java (original) +++ maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/App.java Tue Jan 20 19:54:03 2015 @@ -19,8 +19,7 @@ package com.mycompany.app; * under the License. */ -public class App +public class App { - } Modified: maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/Foo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/Foo.java?rev=1653350&r1=1653349&r2=1653350&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/Foo.java (original) +++ maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/src/main/java/com/mycompany/app/Foo.java Tue Jan 20 19:54:03 2015 @@ -18,10 +18,11 @@ */ import java.util.ArrayList; + public class Foo { -public Foo(final ArrayList foo) +public Foo( final ArrayList foo ) { } - + } Modified: maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/pom.xml?rev=1653350&r1=1653349&r2=1653350&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-138/mod-3/pom.xml Tue Jan 20 19:54:03 2015 @@ -31,7 +31,7 @@ under the
svn commit: r1653350 [2/2] - in /maven/plugins/trunk/maven-pmd-plugin/src: it/empty-rulesets/src/main/java/com/mycompany/app/ it/mpmd-138/mod-3/ it/mpmd-138/mod-4/ it/mpmd-142/ it/mpmd-168-empty-repor
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java?rev=1653350&r1=1653349&r2=1653350&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java (original) +++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.java Tue Jan 20 19:54:03 2015 @@ -19,11 +19,11 @@ package org.apache.maven.plugin.pmd; * under the License. */ +import java.io.File; + import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import java.io.File; - /** * @author mailto:och...@apache.org";>Maria Odea Ching * @version $Id$ @@ -46,8 +46,9 @@ public class PmdViolationCheckMojoTest { try { -final File testPom = new File( getBasedir(), - "src/test/resources/unit/default-configuration/pmd-check-default-configuration-plugin-config.xml" ); +final File testPom = +new File( getBasedir(), + "src/test/resources/unit/default-configuration/pmd-check-default-configuration-plugin-config.xml" ); final PmdViolationCheckMojo mojo = (PmdViolationCheckMojo) lookupMojo( "check", testPom ); mojo.execute(); @@ -62,13 +63,15 @@ public class PmdViolationCheckMojoTest public void testNotFailOnViolation() throws Exception { -File testPom = new File( getBasedir(), - "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ); +File testPom = +new File( getBasedir(), + "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ); final PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom ); mojo.execute(); -testPom = new File( getBasedir(), - "src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml" ); +testPom = +new File( getBasedir(), + "src/test/resources/unit/default-configuration/pmd-check-notfailonviolation-plugin-config.xml" ); final PmdViolationCheckMojo pmdViolationMojo = (PmdViolationCheckMojo) lookupMojo( "check", testPom ); pmdViolationMojo.execute(); @@ -78,18 +81,21 @@ public class PmdViolationCheckMojoTest public void testFailurePriority() throws Exception { -File testPom = new File( getBasedir(), - "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ); +File testPom = +new File( getBasedir(), + "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ); final PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom ); mojo.execute(); -testPom = new File( getBasedir(), - "src/test/resources/unit/default-configuration/pmd-check-failonpriority-plugin-config.xml" ); +testPom = +new File( getBasedir(), + "src/test/resources/unit/default-configuration/pmd-check-failonpriority-plugin-config.xml" ); PmdViolationCheckMojo pmdViolationMojo = (PmdViolationCheckMojo) lookupMojo( "check", testPom ); pmdViolationMojo.execute(); -testPom = new File( getBasedir(), - "src/test/resources/unit/default-configuration/pmd-check-failandwarnonpriority-plugin-config.xml" ); +testPom = +new File( getBasedir(), + "src/test/resources/unit/default-configuration/pmd-check-failandwarnonpriority-plugin-config.xml" ); pmdViolationMojo = (PmdViolationCheckMojo) lookupMojo( "check", testPom ); try { @@ -99,13 +105,15 @@ public class PmdViolationCheckMojoTest catch ( final MojoFailureException e ) { String message = e.getMessage(); -if ( message.contains( "You have 5 PMD violations and 3 warnings." ) ) { +if ( message.contains( "You have 5 PMD violations and 3 warnings." ) ) +{ System.out.println( "Caught expected message: " + e.getMessage() );// expected -} +} else { -throw new AssertionError( "Expected: '" + message + "' to contain 'You have 5 PMD violations and 3 warnings.'" ); -} +throw new AssertionError( "Expected: '" + message +
maven-surefire git commit: SUREFIRE-1136 Current working directory propagation in forked mode
Repository: maven-surefire Updated Branches: refs/heads/master 9b7ca5a2b -> cebce291f SUREFIRE-1136 Current working directory propagation in forked mode Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cebce291 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cebce291 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cebce291 Branch: refs/heads/master Commit: cebce291f454fd5df528a8da37b4e81e407b1082 Parents: 9b7ca5a Author: Norbert Wnuk Authored: Tue Jan 20 00:59:22 2015 +0100 Committer: Norbert Wnuk Committed: Tue Jan 20 01:08:21 2015 +0100 -- .../plugin/surefire/AbstractSurefireMojo.java | 7 ++ .../booterclient/ForkConfiguration.java | 18 - .../booterclient/ForkConfigurationTest.java | 81 ++- ...urefire1136CwdPropagationInForkedModeIT.java | 40 ++ .../pom.xml | 83 ...CurrentWorkingDirectoryInForkedModeTest.java | 46 +++ 6 files changed, 272 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cebce291/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index 2999a8e..5205b95 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -2199,6 +2199,13 @@ public abstract class AbstractSurefireMojo throw new MojoFailureException( "workingDirectory cannot be null" ); } +if ( isForking() ) +{ +// Postpone directory creation till forked JVM creation +// see ForkConfiguration.createCommandLine +return; +} + if ( !getWorkingDirectory().exists() ) { if ( !getWorkingDirectory().mkdirs() ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cebce291/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java index 5843428..e5c8a42 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java @@ -201,11 +201,27 @@ public class ForkConfiguration cli.createArg().setValue( shadefire ? new Relocator().relocate( forkedBooter ) : forkedBooter ); } -cli.setWorkingDirectory( workingDirectory.getAbsolutePath() ); +cli.setWorkingDirectory( getWorkingDirectory( threadNumber ).getAbsolutePath() ); return cli; } +private File getWorkingDirectory( int threadNumber ) +throws SurefireBooterForkException +{ +File cwd = new File( replaceThreadNumberPlaceholder( workingDirectory.getAbsolutePath(), threadNumber ) ); +if ( !cwd.exists() && !cwd.mkdirs() ) +{ +throw new SurefireBooterForkException( "Cannot create workingDirectory " + cwd.getAbsolutePath() ); +} +if ( !cwd.isDirectory() ) +{ +throw new SurefireBooterForkException( +"WorkingDirectory " + cwd.getAbsolutePath() + " exists and is not a directory" ); +} +return cwd; +} + private String replaceThreadNumberPlaceholder( String argLine, int threadNumber ) { return argLine.replace( AbstractSurefireMojo.THREAD_NUMBER_PLACEHOLDER, http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cebce291/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java -- diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java index 5944ec8..32eaa61 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java +++ b/maven-surefire-commo
maven git commit: MNG-5757 aether 1.0.2.v20150114
Repository: maven Updated Branches: refs/heads/master 4b263106d -> 3db19368a MNG-5757 aether 1.0.2.v20150114 Signed-off-by: Igor Fedorenko Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3db19368 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3db19368 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3db19368 Branch: refs/heads/master Commit: 3db19368aac10fad6b61346946cdcbe998c54117 Parents: 4b26310 Author: Igor Fedorenko Authored: Tue Jan 20 09:21:38 2015 -0500 Committer: Igor Fedorenko Committed: Tue Jan 20 09:22:54 2015 -0500 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/3db19368/pom.xml -- diff --git a/pom.xml b/pom.xml index 68475ac..b993398 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 1.7 1.8.1 1.3 -1.0.0.v20140518 +1.0.2.v20150114 1.7.5 true