svn commit: r1200329 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
Author: olamy Date: Thu Nov 10 13:49:13 2011 New Revision: 1200329 URL: http://svn.apache.org/viewvc?rev=1200329view=rev Log: [MCHECKSTYLE-165] Upgrade to checkstyle 5.5. 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=1200329r1=1200328r2=1200329view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Nov 10 13:49:13 2011 @@ -60,7 +60,7 @@ under the License. properties mavenVersion2.0.6/mavenVersion -checkstyleVersion5.4/checkstyleVersion +checkstyleVersion5.5/checkstyleVersion doxiaVersion1.1.3/doxiaVersion sitePluginVersion3.0/sitePluginVersion /properties
svn commit: r1200357 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src: main/java/org/apache/maven/scm/provider/git/gitexe/command/status/ test/java/org/a
Author: olamy
Date: Thu Nov 10 14:58:30 2011
New Revision: 1200357
URL: http://svn.apache.org/viewvc?rev=1200357view=rev
Log:
[SCM-642] GitSatusConsumer does not report deleted file
Submitted by Bertrand Paquet.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java?rev=1200357r1=1200356r2=1200357view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
Thu Nov 10 14:58:30 2011
@@ -85,9 +85,9 @@ public class GitStatusConsumer
try
{
-addedRegexp= new RE( ADDED_PATTERN);
+addedRegexp = new RE( ADDED_PATTERN );
modifiedRegexp = new RE( MODIFIED_PATTERN );
-deletedRegexp = new RE( DELETED_PATTERN );
+deletedRegexp = new RE( DELETED_PATTERN );
}
catch ( RESyntaxException ex )
{
@@ -101,7 +101,9 @@ public class GitStatusConsumer
// StreamConsumer Implementation
// --
-/** {@inheritDoc} */
+/**
+ * {@inheritDoc}
+ */
public void consumeLine( String line )
{
if ( logger.isDebugEnabled() )
@@ -134,11 +136,24 @@ public class GitStatusConsumer
}
// If the file isn't a file; don't add it.
-if ( file != null )
+if ( file != null status != null )
{
-if ( workingDirectory != null !new File( workingDirectory, file
).isFile() )
+if ( workingDirectory != null )
{
-return;
+if ( status == ScmFileStatus.DELETED )
+{
+if ( new File( workingDirectory, file ).isFile() )
+{
+return;
+}
+}
+else
+{
+if ( !new File( workingDirectory, file ).isFile() )
+{
+return;
+}
+}
}
changedFiles.add( new ScmFile( file, status ) );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java?rev=1200357r1=1200356r2=1200357view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
Thu Nov 10 14:58:30 2011
@@ -23,10 +23,12 @@ import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.DefaultLog;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.util.List;
/**
@@ -35,21 +37,148 @@ import java.util.List;
public class GitStatusConsumerTest
extends PlexusTestCase
{
-
-public void testConsumerAddedFile()
+
+public void testConsumerAddedFile()
{
GitStatusConsumer consumer = new GitStatusConsumer( new DefaultLog(),
null );
-
+
consumer.consumeLine( #new file: project.xml );
-
+
ListScmFile changedFiles = consumer.getChangedFiles();
-
+
+assertNotNull(
svn commit: r1200367 - /maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTe
Author: olamy
Date: Thu Nov 10 15:11:48 2011
New Revision: 1200367
URL: http://svn.apache.org/viewvc?rev=1200367view=rev
Log:
test for SCM-629
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java?rev=1200367r1=1200366r2=1200367view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/test/java/org/apache/maven/scm/provider/git/repository/GitScmProviderRepositoryTest.java
Thu Nov 10 15:11:48 2011
@@ -160,6 +160,14 @@ public class GitScmProviderRepositoryTes
null, g...@github.com:4sh/blah.git, null, git, null,
github.com, 0 );
}
+
+// For SCM-629
+public void testGitDevUrlWithNumberedRepoAndMinus()
+throws Exception, ScmRepositoryException
+{
+testUrl( scm:git:ssh://g...@github.com/360-Innovations/FJPAQuery.git,
+ null, ssh://g...@github.com/360-Innovations/FJPAQuery.git,
null, git, null, github.com, 0 );
+}
public void testLegalGitPortUrl()
svn commit: r1200490 - /maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Author: rfscholte
Date: Thu Nov 10 19:31:18 2011
New Revision: 1200490
URL: http://svn.apache.org/viewvc?rev=1200490view=rev
Log:
Improve explanation usage of stage-parameter
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java?rev=1200490r1=1200489r2=1200490view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Thu Nov 10 19:31:18 2011
@@ -147,7 +147,7 @@ public class ScriptRunner
* to skip the script execution.
* @param contextThe key-value storage used to share
information between hook scripts, may be codenull/code.
* @param logger The logger to redirect the script output to,
may be codenull/code to use stdout/stderr.
- * @param stage The stage of the build job the script is
invoked in, must not be codenull/code.
+ * @param stage The stage of the build job the script is
invoked in, must not be codenull/code. This is for logging purpose only.
* @param failOnExceptionIf codetrue/code and the script throws an
exception, then a {@link RunFailureException}
* will be thrown, otherwise a {@link
RunErrorException} will be thrown on script exception.
* @throws org.apache.maven.plugin.MojoExecutionException
svn commit: r1200517 - /maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
Author: rfscholte
Date: Thu Nov 10 20:11:06 2011
New Revision: 1200517
URL: http://svn.apache.org/viewvc?rev=1200517view=rev
Log:
Add javadoc to ExecutionLogger
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java?rev=1200517r1=1200516r2=1200517view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ExecutionLogger.java
Thu Nov 10 20:11:06 2011
@@ -26,7 +26,17 @@ import java.io.PrintStream;
*/
public interface ExecutionLogger
{
+/**
+ * The stream which will catch the output of the {@link ScriptRunner}.
+ *
+ * @return the output stream
+ */
PrintStream getPrintStream();
+/**
+ * Consume logging from this component.
+ *
+ * @param line the line to consume
+ */
void consumeLine( String line );
}
svn commit: r1200541 - in /maven/surefire/trunk: maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ surefire-integration-tests/src/test/java/org/apache/maven/surefire/i
Author: krosenvold
Date: Thu Nov 10 20:52:07 2011
New Revision: 1200541
URL: http://svn.apache.org/viewvc?rev=1200541view=rev
Log:
[SUREFIRE-786] @Category not taken into account for forkMode=always
Testcase and initial patch by nkeywal. Extended fix to cover method-level
categories in 'always' forks too.
This also fixes a quite serious issue of custom provider properties
not making it into the provider upon forkMode=always, which
should close quite a few other issues too
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1200541r1=1200540r2=1200541view=diff
==
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
Thu Nov 10 20:52:07 2011
@@ -99,7 +99,7 @@ public class ForkStarter
}
else if ( ForkConfiguration.FORK_ALWAYS.equals( requestedForkMode
) )
{
-result = runSuitesForkPerTestSet( fileReporterFactory );
+result = runSuitesForkPerTestSet( fileReporterFactory,
providerConfiguration.getProviderProperties() );
}
else
{
@@ -113,15 +113,13 @@ public class ForkStarter
return result;
}
-private RunResult runSuitesForkPerTestSet( FileReporterFactory
fileReporterFactory )
+private RunResult runSuitesForkPerTestSet( FileReporterFactory
fileReporterFactory, Properties properties )
throws SurefireBooterForkException
{
RunResult globalResult = new RunResult( 0, 0, 0, 0 );
final Iterator suites = getSuitesIterator();
-Properties properties = new Properties();
-
while ( suites.hasNext() )
{
Object testSet = suites.next();
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java?rev=1200541r1=1200540r2=1200541view=diff
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
Thu Nov 10 20:52:07 2011
@@ -19,6 +19,8 @@ package org.apache.maven.surefire.its;
*/
+import org.apache.maven.it.VerificationException;
+
/**
* Test project using groups support
*
@@ -35,6 +37,19 @@ public class JUnit48TestCategoriesIT
public void testCategoriesAB()
throws Exception
{
+runAB();
+}
+
+public void testCategoriesABForkAlways()
+throws Exception
+{
+forkAlways();
+runAB();
+}
+
+private void runAB()
+throws VerificationException
+{
executeTest();
verifyErrorFreeLog();
assertTestSuiteResults( 2, 0, 0, 0 );
@@ -47,6 +62,20 @@ public class JUnit48TestCategoriesIT
public void testCategoriesAC()
throws Exception
{
+runAC();
+}
+
+public void testCategoriesACForkAlways()
+throws Exception
+{
+forkAlways();
+runAC();
+}
+
+
+private void runAC()
+throws Exception
+{
addGoal( -Dgroups=junit4.CategoryA,junit4.CategoryC );
executeTest();
verifyErrorFreeLog();
@@ -60,4 +89,5 @@ public class JUnit48TestCategoriesIT
verifyTextInLog(mC: 1);
verifyTextInLog(CatNone: 1);
}
+
}
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java?rev=1200541r1=1200540r2=1200541view=diff
==
---
svn commit: r1200663 - /maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/get-test/plugin-config.xml
Author: carlos Date: Fri Nov 11 00:41:23 2011 New Revision: 1200663 URL: http://svn.apache.org/viewvc?rev=1200663view=rev Log: Remove deprecated config Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/get-test/plugin-config.xml Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/get-test/plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/get-test/plugin-config.xml?rev=1200663r1=1200662r2=1200663view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/get-test/plugin-config.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/get-test/plugin-config.xml Fri Nov 11 00:41:23 2011 @@ -23,7 +23,6 @@ plugin artifactIdmaven-dependency-plugin/artifactId configuration - repositoryUrlhttp://repo1.maven.org/maven2/repositoryUrl groupIdorg.apache.maven/groupId artifactIdmaven-model/artifactId version2.0.9/version
svn commit: r1200664 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
Author: carlos Date: Fri Nov 11 00:42:16 2011 New Revision: 1200664 URL: http://svn.apache.org/viewvc?rev=1200664view=rev Log: [MDEP-336] Add warning about always downloading from central Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java?rev=1200664r1=1200663r2=1200664view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java Fri Nov 11 00:42:16 2011 @@ -45,11 +45,11 @@ import org.apache.maven.plugin.MojoFailu import org.codehaus.plexus.util.StringUtils; /** - * Downloads a single artifact transitively from a specified remote repository. - * + * Downloads a single artifact transitively from the specified remote repositories. Caveat: will always check the + * central repository defined in the super pom. You could use a mirror entry in your settings.xml + * * @goal get * @requiresProject false - * */ public class GetMojo extends AbstractMojo
