svn commit: r1231490 - in /maven/surefire/trunk: surefire-api/src/main/java/org/apache/maven/surefire/booter/ surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/ surefire-int
Author: krosenvold
Date: Sat Jan 14 12:19:42 2012
New Revision: 1231490
URL: http://svn.apache.org/viewvc?rev=1231490view=rev
Log:
[SUREFIRE-818] NPE in reporting causes ignoring of subsequent tests
Test-project submitted by Cyril Vidal, fixed with integration test.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java
(with props)
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java?rev=1231490r1=1231489r2=1231490view=diff
==
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
Sat Jan 14 12:19:42 2012
@@ -291,7 +291,7 @@ public class ForkingRunListener
private ForkingRunListener nullableEncoding( StringBuffer stringBuffer,
String source )
{
-if ( source == null || source.length() == 0)
+if ( source == null || source.length() == 0 )
{
stringBuffer.append( null );
}
@@ -311,7 +311,7 @@ public class ForkingRunListener
final Throwable throwable = stackTraceWriter.getThrowable();
if ( throwable != null )
{
-String message = throwable.getLocalizedMessage();
+String message = safeGetLocalizedMessage( throwable );
nullableEncoding( stringBuffer, message );
}
comma( stringBuffer );
@@ -321,4 +321,16 @@ public class ForkingRunListener
: stackTraceWriter.writeTraceToString() );
}
}
+
+private String safeGetLocalizedMessage( Throwable throwable )
+{
+try
+{
+return throwable.getLocalizedMessage();
+}
+catch ( Throwable t )
+{
+return t.getLocalizedMessage();
+}
+}
}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java?rev=1231490view=auto
==
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
Sat Jan 14 12:19:42 2012
@@ -0,0 +1,36 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ *
svn commit: r1231503 - /maven/doxia/doxia/trunk/doxia-test-docs/
Author: hboutemy Date: Sat Jan 14 14:02:53 2012 New Revision: 1231503 URL: http://svn.apache.org/viewvc?rev=1231503view=rev Log: updated svn:ignore Modified: maven/doxia/doxia/trunk/doxia-test-docs/ (props changed) Propchange: maven/doxia/doxia/trunk/doxia-test-docs/ -- --- svn:ignore (original) +++ svn:ignore Sat Jan 14 14:02:53 2012 @@ -1,7 +1,8 @@ target +bin .settings .classpath .project -doxia-test-docs.iml -doxia-test-docs.ipr -doxia-test-docs.iws +*.iml +*.ipr +*.iws
svn commit: r1231504 - in /maven/doxia/doxia-ide/trunk/eclipse: doxia-osgi/ doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/ eclipse-plugins/
Author: hboutemy Date: Sat Jan 14 14:11:05 2012 New Revision: 1231504 URL: http://svn.apache.org/viewvc?rev=1231504view=rev Log: udated svn:ignore Modified: maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/ (props changed) maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/ (props changed) maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/ (props changed) Propchange: maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/ -- --- svn:ignore (original) +++ svn:ignore Sat Jan 14 14:11:05 2012 @@ -1 +1,8 @@ target +*.iws +*.ipr +*.iml +.classpath +.project +.settings +bin Propchange: maven/doxia/doxia-ide/trunk/eclipse/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/ -- --- svn:ignore (original) +++ svn:ignore Sat Jan 14 14:11:05 2012 @@ -1 +1,8 @@ target +*.iws +*.ipr +*.iml +.classpath +.project +.settings +bin Propchange: maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/ -- --- svn:ignore (original) +++ svn:ignore Sat Jan 14 14:11:05 2012 @@ -1 +1,9 @@ target +*.iws +*.ipr +*.iml +.classpath +.project +.settings +bin +
svn commit: r1231523 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd: AbstractPmdReport.java AbstractPmdViolationCheckMojo.java
Author: rfscholte
Date: Sat Jan 14 16:36:56 2012
New Revision: 1231523
URL: http://svn.apache.org/viewvc?rev=1231523view=rev
Log:
Add generics
Modified:
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
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=1231523r1=1231522r2=1231523view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
Sat Jan 14 16:36:56 2012
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.pmd;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -127,7 +126,7 @@ public abstract class AbstractPmdReport
* @parameter
* @since 2.2
*/
-private String[] excludes;
+private ListString excludes;
/**
* A list of files to include from checking. Can contain Ant-style
wildcards and double wildcards.
@@ -136,7 +135,7 @@ public abstract class AbstractPmdReport
* @parameter
* @since 2.2
*/
-private String[] includes;
+private ListString includes;
/**
* The directories containing the sources to be compiled.
@@ -145,7 +144,7 @@ public abstract class AbstractPmdReport
* @required
* @readonly
*/
-private List compileSourceRoots;
+private ListString compileSourceRoots;
/**
* The directories containing the test-sources to be compiled.
@@ -154,7 +153,7 @@ public abstract class AbstractPmdReport
* @required
* @readonly
*/
-private List testSourceRoots;
+private ListString testSourceRoots;
/**
* The project source directories that should be excluded.
@@ -162,7 +161,7 @@ public abstract class AbstractPmdReport
* @parameter
* @since 2.2
*/
-private File[] excludeRoots;
+private ListFile excludeRoots;
/**
* Run PMD on the tests.
@@ -202,7 +201,7 @@ public abstract class AbstractPmdReport
* @parameter expression=${reactorProjects}
* @readonly
*/
-protected List reactorProjects;
+protected ListMavenProject reactorProjects;
/** {@inheritDoc} */
protected MavenProject getProject()
@@ -238,10 +237,10 @@ public abstract class AbstractPmdReport
else
{
// Not yet generated - check if the report is on its way
-for ( Iterator reports =
project.getReportPlugins().iterator(); reports.hasNext(); )
+@SuppressWarnings( unchecked )
+ListReportPlugin reportPlugins = project.getReportPlugins();
+for ( ReportPlugin plugin : reportPlugins )
{
-ReportPlugin plugin = (ReportPlugin) reports.next();
-
String artifactId = plugin.getArtifactId();
if ( maven-jxr-plugin.equals( artifactId ) ||
jxr-maven-plugin.equals( artifactId ) )
{
@@ -264,7 +263,7 @@ public abstract class AbstractPmdReport
* @return a List of the files where the PMD tool will be executed
* @throws java.io.IOException
*/
-protected Map getFilesToProcess()
+protected MapFile, PmdFileInfo getFilesToProcess()
throws IOException
{
String sourceXref = constructXRefLocation( false );
@@ -272,18 +271,18 @@ public abstract class AbstractPmdReport
if ( aggregate !project.isExecutionRoot() )
{
-return Collections.EMPTY_MAP;
+return Collections.emptyMap();
}
if ( excludeRoots == null )
{
-excludeRoots = new File[0];
+excludeRoots = Collections.emptyList();
}
-CollectionFile excludeRootFiles = new HashSetFile(
excludeRoots.length );
+
+CollectionFile excludeRootFiles = new HashSetFile(
excludeRoots.size() );
-for ( int i = 0; i excludeRoots.length; i++ )
+for ( File file : excludeRoots )
{
-File file = excludeRoots[i];
if ( file.isDirectory() )
{
excludeRootFiles.add( file );
@@ -295,9 +294,8 @@ public abstract class AbstractPmdReport
if ( compileSourceRoots != null )
{
-for ( Iterator i = compileSourceRoots.iterator(); i.hasNext(); )
+for ( String root : compileSourceRoots
svn commit: r1231525 - in /maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd: PmdFileInfo.java PmdReport.java PmdReportListener.java PmdViolationCheckMojo.java
Author: rfscholte
Date: Sat Jan 14 16:54:12 2012
New Revision: 1231525
URL: http://svn.apache.org/viewvc?rev=1231525view=rev
Log:
Add more generics
Modified:
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/PmdReportListener.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java?rev=1231525r1=1231524r2=1231525view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdFileInfo.java
Sat Jan 14 16:54:12 2012
@@ -33,7 +33,6 @@ public class PmdFileInfo
private File sourceDir;
private String xref;
-
public PmdFileInfo( MavenProject project,
File dir,
String x )
@@ -50,7 +49,6 @@ public class PmdFileInfo
this.xref = x;
}
-
public String getXrefLocation()
{
return xref;
@@ -66,5 +64,4 @@ public class PmdFileInfo
return project;
}
-
-}
+}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1231525r1=1231524r2=1231525view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Sat Jan 14 16:54:12 2012
@@ -19,6 +19,20 @@ package org.apache.maven.plugin.pmd;
* under the License.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
import net.sourceforge.pmd.IRuleViolation;
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.PMDException;
@@ -33,6 +47,7 @@ import net.sourceforge.pmd.renderers.HTM
import net.sourceforge.pmd.renderers.Renderer;
import net.sourceforge.pmd.renderers.TextRenderer;
import net.sourceforge.pmd.renderers.XMLRenderer;
+
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.resource.ResourceManager;
@@ -44,21 +59,6 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
/**
* Creates a PMD report.
*
@@ -243,7 +243,7 @@ public class PmdReport
throw new MavenReportException( e.getMessage(), e );
}
-Map files;
+MapFile, PmdFileInfo files;
try
{
files = getFilesToProcess();
@@ -259,11 +259,10 @@ public class PmdReport
+ , i.e. build is platform dependent! );
}
-for ( Iterator i = files.entrySet().iterator(); i.hasNext(); )
+for ( Map.EntryFile, PmdFileInfo entry : files.entrySet() )
{
-Map.Entry entry = (Map.Entry) i.next();
-File file = (File) entry.getKey();
-PmdFileInfo fileInfo = (PmdFileInfo) entry.getValue();
+File file = entry.getKey();
+PmdFileInfo fileInfo = entry.getValue();
// TODO: lazily call beginFile in case there are no rules
@@ -611,4 +610,4 @@ public class PmdReport
return null;
}
}
-}
+}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
URL:
svn commit: r1231534 - /maven/shared/trunk/maven-archiver/pom.xml
Author: krosenvold Date: Sat Jan 14 17:31:11 2012 New Revision: 1231534 URL: http://svn.apache.org/viewvc?rev=1231534view=rev Log: o Updated to latest plexus versions Modified: maven/shared/trunk/maven-archiver/pom.xml Modified: maven/shared/trunk/maven-archiver/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=1231534r1=1231533r2=1231534view=diff == --- maven/shared/trunk/maven-archiver/pom.xml (original) +++ maven/shared/trunk/maven-archiver/pom.xml Sat Jan 14 17:31:11 2012 @@ -77,7 +77,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.0.1/version + version2.0.2/version /dependency dependency groupIdorg.codehaus.plexus/groupId @@ -87,7 +87,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-interpolation/artifactId - version1.13/version + version1.15/version /dependency dependency groupIdjunit/groupId
svn commit: r1231541 - /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
Author: hboutemy Date: Sat Jan 14 18:04:18 2012 New Revision: 1231541 URL: http://svn.apache.org/viewvc?rev=1231541view=rev Log: code formatting Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java?rev=1231541r1=1231540r2=1231541view=diff == --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java Sat Jan 14
svn commit: r1231549 - in /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency: AbstractResolveMojo.java AnalyzeDepMgt.java AnalyzeReportMojo.java BuildClasspa
Author: hboutemy
Date: Sat Jan 14 18:23:49 2012
New Revision: 1231549
URL: http://svn.apache.org/viewvc?rev=1231549view=rev
Log:
code formatting
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java?rev=1231549r1=1231548r2=1231549view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
Sat Jan 14 18:23:49 2012
@@ -109,8 +109,9 @@ public abstract class AbstractResolveMoj
throws ArtifactResolutionException, ArtifactNotFoundException,
ProjectBuildingException,
InvalidDependencyVersionException
{
-Artifact pomArtifact = this.factory.createArtifact(
artifact.getGroupId(), artifact.getArtifactId(), artifact
-.getVersion(), , pom );
+Artifact pomArtifact =
+this.factory.createArtifact( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(), ,
+ pom );
MavenProject pomProject = mavenProjectBuilder.buildFromRepository(
pomArtifact, this.remoteRepos, this.getLocal() );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java?rev=1231549r1=1231548r2=1231549view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
Sat Jan 14 18:23:49 2012
@@ -292,7 +292,7 @@ public class AnalyzeDepMgt
+ dependencyFromDepMgt );
}
-getLog().info( \tDependency: +
StringUtils.stripEnd(dependencyFromDepMgt.getManagementKey(),:) );
+getLog().info( \tDependency: + StringUtils.stripEnd(
dependencyFromDepMgt.getManagementKey(), : ) );
getLog().info( \t\tDepMgt : + dependencyFromDepMgt.getVersion() );
getLog().info( \t\tResolved: + dependencyArtifact.getBaseVersion()
);
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java?rev=1231549r1=1231548r2=1231549view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Sat Jan 14 18:23:49 2012
@@ -97,7 +97,8 @@ public class AnalyzeReportMojo
/*
* @see org.apache.maven.plugin.Mojo#execute()
*/
-public void executeReport( Locale locale ) throws MavenReportException
+public void executeReport( Locale locale )
+throws MavenReportException
{
// Step 0: Checking pom availability
if ( pom.equals( project.getPackaging() ) )
@@ -138,7 +139,9 @@ public class AnalyzeReportMojo
}
}
-ProjectDependencyAnalysis analysisTemp = new
ProjectDependencyAnalysis(analysis.getUsedDeclaredArtifacts(),analysis.getUsedUndeclaredArtifacts(),filteredUnusedDeclared);
+ProjectDependencyAnalysis analysisTemp =
+new ProjectDependencyAnalysis(
analysis.getUsedDeclaredArtifacts(),
+
analysis.getUsedUndeclaredArtifacts(), filteredUnusedDeclared );
analysis = analysisTemp;
}
Modified:
