You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/11/12 19:29:56 UTC
[2/2] maven git commit: Remove trailing whitespace
Remove trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0eb1e937
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0eb1e937
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0eb1e937
Branch: refs/heads/master
Commit: 0eb1e937bf377b1c81193da3d9fca7ef344511b6
Parents: 6b0b7a9
Author: Michael Osipov <mi...@apache.org>
Authored: Sat Nov 12 20:29:20 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat Nov 12 20:29:20 2016 +0100
----------------------------------------------------------------------
apache-maven/src/conf/toolchains.xml | 40 +++++++--------
.../main/appended-resources/META-INF/LICENSE.vm | 10 ++--
.../ArtifactDescriptorReaderDelegate.java | 2 +-
.../internal/MavenRepositorySystemUtils.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 2 +-
.../apache/maven/building/ProblemCollector.java | 8 +--
.../maven/building/ProblemCollectorFactory.java | 6 +--
.../building/DefaultProblemCollectorTest.java | 8 +--
.../maven/building/DefaultProblemTest.java | 20 ++++----
.../building/ProblemCollectorFactoryTest.java | 4 +-
.../repository/legacy/DefaultWagonManager.java | 2 +-
.../DefaultLegacyArtifactCollector.java | 2 +-
.../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +-
.../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +-
.../t12scm/maven/p0/1.0/p0-1.0.pom | 4 +-
.../t12scm/maven/p1/1.0/p1-1.0.pom | 2 +-
.../org/apache/maven/ArtifactFilterManager.java | 4 +-
.../DefaultProjectDependenciesResolver.java | 2 +-
.../org/apache/maven/ProjectCycleException.java | 2 +-
.../maven/bridge/MavenRepositorySystem.java | 22 ++++-----
.../DefaultMavenExecutionRequestPopulator.java | 20 ++++----
.../maven/execution/MavenExecutionRequest.java | 20 ++++----
.../MavenExecutionRequestPopulator.java | 2 +-
.../apache/maven/execution/MavenSession.java | 28 +++++------
.../maven/extension/internal/CoreExports.java | 2 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 4 +-
.../org/apache/maven/lifecycle/Lifecycle.java | 2 +-
.../lifecycle/MojoExecutionConfigurator.java | 4 +-
.../internal/LifecycleDependencyResolver.java | 10 ++--
.../lifecycle/internal/LifecycleStarter.java | 2 +-
.../internal/ProjectArtifactFactory.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 2 +-
.../mapping/DefaultLifecycleMapping.java | 2 +-
.../maven/lifecycle/mapping/Lifecycle.java | 6 +--
.../maven/lifecycle/mapping/LifecycleMojo.java | 14 +++---
.../maven/lifecycle/mapping/LifecyclePhase.java | 26 +++++-----
.../plugin/DefaultProjectArtifactsCache.java | 32 ++++++------
.../apache/maven/plugin/MavenPluginManager.java | 2 +-
.../PluginParameterExpressionEvaluator.java | 6 +--
.../maven/plugin/ProjectArtifactsCache.java | 2 +-
.../maven/project/DefaultProjectBuilder.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../project/RepositorySessionDecorator.java | 2 +-
.../properties/internal/SystemProperties.java | 4 +-
.../maven/toolchain/DefaultToolchain.java | 10 ++--
.../toolchain/DefaultToolchainManager.java | 6 +--
.../DefaultToolchainManagerPrivate.java | 2 +-
.../toolchain/RequirementMatcherFactory.java | 4 +-
.../maven/toolchain/ToolchainManager.java | 4 +-
.../toolchain/ToolchainManagerPrivate.java | 2 +-
.../maven/toolchain/ToolchainPrivate.java | 2 +-
.../building/DefaultToolchainsBuilder.java | 16 +++---
.../DefaultToolchainsBuildingRequest.java | 2 +-
.../DefaultToolchainsBuildingResult.java | 10 ++--
.../building/ToolchainsBuildingResult.java | 2 +-
.../toolchain/java/DefaultJavaToolChain.java | 2 +-
.../toolchain/merge/MavenToolchainMerger.java | 6 +--
maven-core/src/main/mdo/toolchains.mdo | 8 +--
.../main/resources/META-INF/maven/extension.xml | 6 +--
...faultMavenExecutionRequestPopulatorTest.java | 2 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 2 +-
.../lifecycle/internal/stub/AboutTheStubs.html | 2 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 16 +++---
.../apache/maven/plugin/PluginManagerTest.java | 2 +-
.../DefaultToolchainManagerPrivateTest.java | 8 +--
.../building/DefaultToolchainsBuilderTest.java | 16 +++---
.../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +-
.../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +-
.../junit/junit/3.8.1/junit-3.8.1.pom | 2 +-
.../maven-artifact-3.0-SNAPSHOT.pom | 52 ++++++++++----------
.../test/test-extension/1/test-extension-1.pom | 6 +--
.../1/test-lifecycle-and-artifactHandler-1.pom | 4 +-
.../maven/maven-parent/5/maven-parent-5.pom | 10 ++--
.../plexus-classworlds-1.2-alpha-10.pom | 2 +-
.../1.1.6/plexus-components-1.1.6.pom | 18 +++----
.../plexus-container-default-1.0-alpha-32.pom | 4 +-
.../plexus/plexus/1.0.10/plexus-1.0.10.pom | 2 +-
.../plexus/plexus/1.0.11/plexus-1.0.11.pom | 8 +--
.../plexus/plexus/1.0.4/plexus-1.0.4.pom | 2 +-
.../plexus/plexus/1.0.8/plexus-1.0.8.pom | 4 +-
.../plexus/plexus/1.0.9/plexus-1.0.9.pom | 2 +-
.../project-caching/1/project-caching-1.pom | 4 +-
.../toolchain/model/toolchains-jdks-extend.xml | 2 +-
.../java/org/apache/maven/cli/CliRequest.java | 4 +-
.../test-maven-ext/1/test-maven-ext-1.pom | 4 +-
.../1/bad-ext-plugin-dep-ver-maven-plugin-1.pom | 2 +-
.../bad-ext-plugin-maven-ver-maven-plugin-1.pom | 4 +-
.../1/err-loading-plugin-maven-plugin-1.pom | 2 +-
.../org/apache/maven/errortest/dep/1/dep-1.pom | 2 +-
.../err-resolving-ext-plugin-maven-plugin-1.pom | 2 +-
.../org/apache/maven/errortest/dep/1/dep-1.pom | 2 +-
.../1/test-maven-ext-dep-1.pom | 2 +-
.../test-maven-ext/1/test-maven-ext-1.pom | 4 +-
...t-plugin-artifact-missing-maven-plugin-1.pom | 2 +-
.../1/ext-plugin-version-err-maven-plugin-1.pom | 2 +-
.../local-repo/org/test/bad-pom/1/bad-pom-1.pom | 2 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 8 +--
.../src/test/projects/config/.mvn/maven.config | 2 +-
.../maven/model/building/FileModelSource.java | 8 +--
.../org/apache/maven/model/building/Result.java | 2 +-
.../maven/model/building/StringModelSource.java | 2 +-
.../maven/model/building/UrlModelSource.java | 2 +-
maven-model-builder/src/site/apt/index.apt | 2 +-
.../DefaultInheritanceAssemblerTest.java | 6 +--
.../maven/model/merge/MavenModelMergerTest.java | 4 +-
.../module-path-not-artifactId-child.xml | 2 +-
.../module-path-not-artifactId-expected.xml | 2 +-
maven-model/src/main/mdo/maven.mdo | 10 ++--
.../settings/building/FileSettingsSource.java | 2 +-
.../maven/settings/building/SettingsSource.java | 2 +-
.../settings/building/StringSettingsSource.java | 2 +-
.../settings/building/UrlSettingsSource.java | 4 +-
.../validation/DefaultSettingsValidator.java | 2 +-
113 files changed, 348 insertions(+), 348 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/apache-maven/src/conf/toolchains.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/toolchains.xml b/apache-maven/src/conf/toolchains.xml
index b263072..75862b4 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -44,24 +44,24 @@ under the License.
<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
- <!--
- | With toolchains you can refer to installations on your system. This
- | way you don't have to hardcode paths in your pom.xml.
- |
- | Every toolchain consist of 3 elements:
- | * type: the type of tool. An often used value is 'jdk'. Toolchains-aware
- | plugins should document which type you must use.
- |
- | * provides: A list of key/value-pairs.
- | Based on the toolchain-configuration in the pom.xml Maven will search for
- | matching <provides/> configuration. You can decide for yourself which key-value
- | pairs to use. Often used keys are 'version', 'vendor' and 'arch'. By default
- | the version has a special meaning. If you configured in the pom.xml '1.5'
+ <!--
+ | With toolchains you can refer to installations on your system. This
+ | way you don't have to hardcode paths in your pom.xml.
+ |
+ | Every toolchain consist of 3 elements:
+ | * type: the type of tool. An often used value is 'jdk'. Toolchains-aware
+ | plugins should document which type you must use.
+ |
+ | * provides: A list of key/value-pairs.
+ | Based on the toolchain-configuration in the pom.xml Maven will search for
+ | matching <provides/> configuration. You can decide for yourself which key-value
+ | pairs to use. Often used keys are 'version', 'vendor' and 'arch'. By default
+ | the version has a special meaning. If you configured in the pom.xml '1.5'
| Maven will search for 1.5 and above.
- |
+ |
| * configuration: Additional configuration for this tool.
| Look for documentation of the toolchains-aware plugin which configuration elements
- | can be used.
+ | can be used.
|
| See also https://maven.apache.org/guides/mini/guide-using-toolchains.html
|
@@ -69,12 +69,12 @@ under the License.
<toolchain>
<type/>
- <provides>
- <version>1.0</version>
- </provides>
+ <provides>
+ <version>1.0</version>
+ </provides>
<configuration/>
</toolchain>
-
+
| JDK examples
<toolchain>
@@ -97,7 +97,7 @@ under the License.
<jdkHome>/path/to/jdk/1.6</jdkHome>
</configuration>
</toolchain>
-
+
-->
</toolchains>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
----------------------------------------------------------------------
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 390fa42..d18c638 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -17,15 +17,15 @@
## under the License.
##
-Apache Maven includes a number of components and libraries with separate
-copyright notices and license terms. Your use of those components are
-subject to the terms and conditions of the following licenses.
+Apache Maven includes a number of components and libraries with separate
+copyright notices and license terms. Your use of those components are
+subject to the terms and conditions of the following licenses.
#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
#foreach ( $project in $projects )
#foreach ( $license in $project.licenses)
-#if ( ! ($apacheTxt == $license.name) )
+#if ( ! ($apacheTxt == $license.name) )
#set ( $artId = $project.artifact.artifactId)
#set ( $lf = $locator )
#set ( $url = $license.url )
@@ -33,7 +33,7 @@ subject to the terms and conditions of the following licenses.
#if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html")
#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
#end
-#if ($url)
+#if ($url)
#set ( $licFile = 'lib/' + $artId + '.license' )
#set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") )
#end
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 184c327..284ee86 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -45,7 +45,7 @@ import org.eclipse.aether.resolution.ArtifactDescriptorResult;
/**
* Populates Aether {@link ArtifactDescriptorResult} from Maven project {@link Model}.
- *
+ *
* @since 3.2.4
* @provisional This class is part of work in progress and can be changed or removed without notice.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 645fd1c..8567439 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -128,7 +128,7 @@ public final class MavenRepositorySystemUtils
session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) );
final Properties systemProperties = new Properties();
-
+
// MNG-5670 guard against ConcurrentModificationException
// MNG-6053 guard against key without value
Properties sysProp = System.getProperties();
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 909bd8a..628e35d 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -148,7 +148,7 @@ public class ComparableVersion
{
private static final List<String> QUALIFIERS =
Arrays.asList( "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" );
-
+
private static final Properties ALIASES = new Properties();
static
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java b/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java
index e701567..8439fef 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java
@@ -41,17 +41,17 @@ public interface ProblemCollector
* @param cause The cause of the problem, may be {@code null}.
*/
void add( Problem.Severity severity, String message, int line, int column, Exception cause );
-
+
/**
* The next messages will be bound to this source. When calling this method again, previous messages keep
* their source, but the next messages will use the new source.
- *
+ *
* @param source
*/
void setSource( String source );
-
+
/**
- *
+ *
* @return the collected Problems, never {@code null}
*/
List<Problem> getProblems();
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java b/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java
index c1c2373..43c9bd3 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java
@@ -22,7 +22,7 @@ package org.apache.maven.building;
import java.util.List;
/**
- *
+ *
* @author Robert Scholte
* @since 3.3.0
*/
@@ -30,8 +30,8 @@ public class ProblemCollectorFactory
{
/**
- * The default implementation is not visible, create it with this factory
- *
+ * The default implementation is not visible, create it with this factory
+ *
* @param problems starting set of problems, may be {@code null}
* @return a new instance of a ProblemCollector
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
index bf0f847..57ddcfa 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
@@ -35,10 +35,10 @@ public class DefaultProblemCollectorTest
assertEquals( 0, collector.getProblems().size() );
collector.add( null, "MESSAGE1", -1, -1, null );
-
+
Exception e2 = new Exception();
collector.add( Severity.WARNING, null, 42, 127, e2 );
-
+
assertEquals( 2, collector.getProblems().size() );
Problem p1 = collector.getProblems().get(0);
@@ -47,7 +47,7 @@ public class DefaultProblemCollectorTest
assertEquals( -1, p1.getLineNumber() );
assertEquals( -1, p1.getColumnNumber() );
assertEquals( null, p1.getException() );
-
+
Problem p2 = collector.getProblems().get(1);
assertEquals( Severity.WARNING, p2.getSeverity() );
assertEquals( "",p2.getMessage() );
@@ -60,7 +60,7 @@ public class DefaultProblemCollectorTest
public void testSetSource()
{
DefaultProblemCollector collector = new DefaultProblemCollector( null );
-
+
collector.add( null, "PROBLEM1", -1, -1, null );
collector.setSource( "SOURCE_PROBLEM2" );
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
index 80a20da..1615fc3 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
@@ -36,14 +36,14 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, Severity.FATAL, null, -1, -1, null );
assertEquals( Severity.FATAL, problem.getSeverity() );
-
+
problem = new DefaultProblem( null, Severity.ERROR, null, -1, -1, null );
assertEquals( Severity.ERROR, problem.getSeverity() );
problem = new DefaultProblem( null, Severity.WARNING, null, -1, -1, null );
assertEquals( Severity.WARNING, problem.getSeverity() );
}
-
+
@Test
public void testGetLineNumber()
{
@@ -52,7 +52,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, 42, -1, null );
assertEquals( 42, problem.getLineNumber() );
-
+
problem = new DefaultProblem( null, null, null, Integer.MAX_VALUE, -1, null );
assertEquals( Integer.MAX_VALUE, problem.getLineNumber() );
@@ -60,7 +60,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, Integer.MIN_VALUE, -1, null );
assertEquals( Integer.MIN_VALUE, problem.getLineNumber() );
}
-
+
@Test
public void testGetColumnNumber()
{
@@ -69,7 +69,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, -1, 42, null );
assertEquals( 42, problem.getColumnNumber() );
-
+
problem = new DefaultProblem( null, null, null, -1, Integer.MAX_VALUE, null );
assertEquals( Integer.MAX_VALUE, problem.getColumnNumber() );
@@ -77,13 +77,13 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, -1, Integer.MIN_VALUE, null );
assertEquals( Integer.MIN_VALUE, problem.getColumnNumber() );
}
-
+
@Test
public void testGetException()
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
assertEquals( null, problem.getException() );
-
+
Exception e = new Exception();
problem = new DefaultProblem( null, null, null, -1, -1, e );
assertSame( e, problem.getException() );
@@ -94,7 +94,7 @@ public class DefaultProblemTest
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
assertEquals( "", problem.getSource() );
-
+
problem = new DefaultProblem( null, null, "", -1, -1, null );
assertEquals( "", problem.getSource() );
@@ -107,7 +107,7 @@ public class DefaultProblemTest
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
assertEquals( "", problem.getLocation() );
-
+
problem = new DefaultProblem( null, null, "SOURCE", -1, -1, null );
assertEquals( "SOURCE", problem.getLocation() );
@@ -120,7 +120,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, "SOURCE", 42, 127, null );
assertEquals( "SOURCE, line 42, column 127", problem.getLocation() );
}
-
+
@Test
public void testGetMessage()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
index 44c7906..2fdcbb7 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
@@ -33,10 +33,10 @@ public class ProblemCollectorFactoryTest
public void testNewInstance()
{
ProblemCollector collector1 = ProblemCollectorFactory.newInstance( null );
-
+
Problem problem = new DefaultProblem( "MESSAGE1", null, null, -1, -1, null );
ProblemCollector collector2 = ProblemCollectorFactory.newInstance( Collections.singletonList( problem ) );
-
+
assertNotSame( collector1, collector2 );
assertEquals( 0, collector1.getProblems().size() );
assertEquals( 1, collector2.getProblems().size() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index b8835b5..4998f95 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -435,7 +435,7 @@ public class DefaultWagonManager
}
catch ( ChecksumFailedException e )
{
- // if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the
+ // if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the
// checksum doesn't match. This could be a problem with the server (ibiblio HTTP-200 error
// page), so we'll try this up to two times. On the second try, we'll handle it as a bona-fide
// error, based on the repository's checksum checking policy.
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index 4601eee..96a9dfd 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -692,7 +692,7 @@ public class DefaultLegacyArtifactCollector
fireEvent( ResolutionListener.UPDATE_SCOPE, listeners, nearest, farthestArtifact );
// previously we cloned the artifact, but it is more effecient to just update the artifactScope
- // if problems are later discovered that the original object needs its original artifactScope value,
+ // if problems are later discovered that the original object needs its original artifactScope value,
// cloning may
// again be appropriate
nearestArtifact.setScope( farthestArtifact.getScope() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom b/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom
index f451418..03caa12 100644
--- a/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom
+++ b/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom
@@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: Dummy Artifact</name>
<description>
-
+
</description>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom b/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom
index ca20cbf..149a241 100644
--- a/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom
+++ b/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom
@@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: Dummy Artifact</name>
<description>
-
+
</description>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
index 97bf7cc..a22df68 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
+++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
@@ -4,13 +4,13 @@
<artifactId>p0</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
-
+
<scm>
<connection>scm:svn:http://host/p0</connection>
<developerConnection>scm:svn:https://host/p0</developerConnection>
<url>http://host/viewer?path=/p0</url>
</scm>
-
+
<modules>
<module>modules/p1</module>
</modules>
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
index e9ddf0d..736b515 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
+++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
@@ -7,5 +7,5 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>p1</artifactId>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
index 2cf9f99..546f1b2 100644
--- a/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
@@ -27,7 +27,7 @@ public interface ArtifactFilterManager
{
/**
* Returns a filter for core + extension artifacts.
- *
+ *
* @deprecated use {@code META-INF/maven/extension.xml} to define artifacts exported by Maven core and plugin
* extensions.
*/
@@ -40,7 +40,7 @@ public interface ArtifactFilterManager
/**
* Exclude an extension artifact (doesn't affect getArtifactFilter's result, only getExtensionArtifactFilter).
- *
+ *
* @deprecated use {@code META-INF/maven/extension.xml} to define artifacts exported by Maven core and plugin
* extensions.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
index be7c97a..3c6b4ab 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
@@ -127,7 +127,7 @@ public class DefaultProjectDependenciesResolver
if ( ! exclusions.isEmpty() )
{
- filter = new AndArtifactFilter( Arrays.asList( new ArtifactFilter[]{
+ filter = new AndArtifactFilter( Arrays.asList( new ArtifactFilter[]{
new ExcludesArtifactFilter( exclusions ), scopeFilter } ) );
}
else
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java b/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
index ecd8eca..b4a6fd0 100644
--- a/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
+++ b/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
@@ -31,7 +31,7 @@ public class ProjectCycleException
{
super( message );
}
-
+
public ProjectCycleException( String message, CycleDetectedException cause )
{
super( message, cause );
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 23af3e8..40574e8 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -416,8 +416,8 @@ public class MavenRepositorySystem
}
return new ArtifactRepositoryPolicy( enabled, updatePolicy, checksumPolicy );
- }
-
+ }
+
public ArtifactRepository createArtifactRepository( String id, String url, String layoutId,
ArtifactRepositoryPolicy snapshots,
ArtifactRepositoryPolicy releases )
@@ -439,7 +439,7 @@ public class MavenRepositorySystem
repositoryId ) );
}
}
-
+
public static ArtifactRepository createArtifactRepository( String id, String url,
ArtifactRepositoryLayout repositoryLayout,
ArtifactRepositoryPolicy snapshots,
@@ -564,7 +564,7 @@ public class MavenRepositorySystem
return new DefaultArtifact( groupId, artifactId, versionRange, desiredScope, type, classifier, handler,
optional );
}
-
+
//
// Code taken from LegacyRepositorySystem
//
@@ -576,7 +576,7 @@ public class MavenRepositorySystem
ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
}
-
+
public ArtifactRepository createRepository( String url, String repositoryId, boolean releases,
String releaseUpdates, boolean snapshots, String snapshotUpdates,
String checksumPolicy ) throws Exception
@@ -589,7 +589,7 @@ public class MavenRepositorySystem
return createArtifactRepository( repositoryId, url, "default", snapshotsPolicy, releasesPolicy );
}
-
+
public Set<String> getRepoIds( List<ArtifactRepository> repositories )
{
Set<String> repoIds = new HashSet<>();
@@ -604,8 +604,8 @@ public class MavenRepositorySystem
return repoIds;
}
-
-
+
+
public ArtifactRepository createLocalRepository( MavenExecutionRequest request, File localRepository )
throws Exception
{
@@ -614,8 +614,8 @@ public class MavenRepositorySystem
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, true,
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE );
- }
-
+ }
+
private static final String WILDCARD = "*";
private static final String EXTERNAL_WILDCARD = "external:*";
@@ -780,5 +780,5 @@ public class MavenRepositorySystem
}
return result;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
index ba5630e..9312b32 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
@@ -53,9 +53,9 @@ import org.codehaus.plexus.util.StringUtils;
public class DefaultMavenExecutionRequestPopulator
implements MavenExecutionRequestPopulator
{
-
+
private final MavenRepositorySystem repositorySystem;
-
+
@Inject
public DefaultMavenExecutionRequestPopulator( MavenRepositorySystem repositorySystem )
{
@@ -85,7 +85,7 @@ public class DefaultMavenExecutionRequestPopulator
}
return request;
}
-
+
@Override
public MavenExecutionRequest populateDefaults( MavenExecutionRequest request )
throws MavenExecutionRequestPopulationException
@@ -102,11 +102,11 @@ public class DefaultMavenExecutionRequestPopulator
return request;
}
-
+
//
//
//
-
+
private void populateDefaultPluginGroups( MavenExecutionRequest request )
{
request.addPluginGroup( "org.apache.maven.plugins" );
@@ -206,10 +206,10 @@ public class DefaultMavenExecutionRequestPopulator
{
request.setBaseDirectory( request.getPom().getAbsoluteFile().getParentFile() );
}
- }
-
+ }
+
/*if_not[MAVEN4]*/
-
+
@Override
@Deprecated
public MavenExecutionRequest populateFromSettings( MavenExecutionRequest request, Settings settings )
@@ -311,8 +311,8 @@ public class DefaultMavenExecutionRequestPopulator
}
return request;
- }
-
+ }
+
/*end[MAVEN4]*/
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index 1ec8966..203b2b7 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -356,15 +356,15 @@ public interface MavenExecutionRequest
MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );
/**
- *
- *
+ *
+ *
* @return the global toolchains file
* @since 3.3.0
*/
File getGlobalToolchainsFile();
/**
- *
+ *
* @param globalToolchainsFile the global toolchains file
* @return this request
* @since 3.3.0
@@ -404,15 +404,15 @@ public interface MavenExecutionRequest
String getBuilderId();
/**
- *
- * @param toolchains all toolchains grouped by type
- * @return this request
+ *
+ * @param toolchains all toolchains grouped by type
+ * @return this request
* @since 3.3.0
*/
MavenExecutionRequest setToolchains( Map<String, List<ToolchainModel>> toolchains );
-
+
/**
- *
+ *
* @return all toolchains grouped by type, never {@code null}
* @since 3.3.0
*/
@@ -430,9 +430,9 @@ public interface MavenExecutionRequest
/**
* @since 3.3.0
- */
+ */
MavenExecutionRequest setEventSpyDispatcher( EventSpyDispatcher eventSpyDispatcher );
-
+
/**
* @since 3.3.0
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
index 4f254f7..c2d4c84 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
@@ -54,7 +54,7 @@ public interface MavenExecutionRequestPopulator
throws MavenExecutionRequestPopulationException;
/*if_not[MAVEN4]*/
-
+
/**
* Copies the values from the given settings into the specified execution request. This method will replace any
* existing values in the execution request that are controlled by the settings. Hence, it is expected that this
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index d69bbba..e59edc6 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -273,7 +273,7 @@ public class MavenSession
{
this.projectMap = projectMap;
}
-
+
/** This is a provisional method and may be removed */
public List<MavenProject> getAllProjects()
{
@@ -285,24 +285,24 @@ public class MavenSession
{
this.allProjects = allProjects;
}
-
+
/*if_not[MAVEN4]*/
//
- // Deprecated
+ // Deprecated
//
-
- private PlexusContainer container;
-
+
+ private PlexusContainer container;
+
private final Settings settings;
-
+
@Deprecated
/** @deprecated This appears to only be used in the ReactorReader and we can do any processing required there */
- public Map<String, MavenProject> getProjectMap()
+ public Map<String, MavenProject> getProjectMap()
{
return projectMap;
}
-
+
@Deprecated
public MavenSession( PlexusContainer container, RepositorySystemSession repositorySession,
MavenExecutionRequest request, MavenExecutionResult result )
@@ -313,7 +313,7 @@ public class MavenSession
this.settings = new SettingsAdapter( request );
this.repositorySession = repositorySession;
}
-
+
@Deprecated
public MavenSession( PlexusContainer container, MavenExecutionRequest request, MavenExecutionResult result,
MavenProject project )
@@ -363,7 +363,7 @@ public class MavenSession
{
return getProjects();
}
-
+
@Deprecated
//
// Used by Tycho and will break users and force them to upgrade to Maven 3.1 so we should really leave
@@ -401,7 +401,7 @@ public class MavenSession
return executionProperties;
}
-
+
@Deprecated
public PlexusContainer getContainer()
{
@@ -434,7 +434,7 @@ public class MavenSession
throws ComponentLookupException
{
return container.lookupMap( role );
- }
-
+ }
+
/*end[MAVEN4]*/
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
index e253e9f..1203371 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableSet;
/**
* Provides information about artifacts (identified by groupId:artifactId string key) and classpath elements exported by
* Maven core itself and loaded Maven core extensions.
- *
+ *
* @since 3.3.0
*/
public class CoreExports
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 680d584..5be4d5e 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -73,7 +73,7 @@ public class DefaultGraphBuilder
{
return dependencyGraph( session, session.getProjects(), false );
}
-
+
List<MavenProject> projects = session.getProjects();
if ( projects == null )
@@ -96,7 +96,7 @@ public class DefaultGraphBuilder
return dependencyGraph( session, projects, false );
}
}
-
+
private Result<ProjectDependencyGraph> dependencyGraph( MavenSession session, List<MavenProject> projects,
boolean applyMakeBehaviour )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java b/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
index 5fc99d5..8115bf8 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
@@ -72,7 +72,7 @@ public class Lifecycle
{
return defaultPhases;
}
-
+
@Deprecated
public Map<String, String> getDefaultPhases()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java
index b85bac7..ee299f4 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java
@@ -25,7 +25,7 @@ import org.apache.maven.project.MavenProject;
/**
* A MojoExecutionConfigurator is responsible for creating the configuration for Mojo based on configuration for a Mojo
* in the MavenProject and the default configuration for the Mojo from the containing plugin's plugin.xml descriptor.
- *
+ *
* @provisional
* @author Jason van Zyl
* @since 3.3.1, MNG-5753
@@ -35,7 +35,7 @@ public interface MojoExecutionConfigurator
/**
* Create the MojoExecution configuration based on configuration for a Mojo in the MavenProject and the
* default configuration for the Mojo from the containing plugin's plugin.xml descriptor.
- *
+ *
* @param project
* @param mojoExecution
* @param allowPluginLevelConfig
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index d83a8f4..e6ca6b6 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -76,7 +76,7 @@ public class LifecycleDependencyResolver
@Inject
private EventSpyDispatcher eventSpyDispatcher;
-
+
@Inject
private ProjectArtifactsCache projectArtifactsCache;
@@ -127,13 +127,13 @@ public class LifecycleDependencyResolver
throw new LifecycleExecutionException( e );
}
}
-
+
Set<Artifact> artifacts;
- ProjectArtifactsCache.Key cacheKey = projectArtifactsCache.createKey( project, scopesToCollect,
+ ProjectArtifactsCache.Key cacheKey = projectArtifactsCache.createKey( project, scopesToCollect,
scopesToResolve, aggregating, session.getRepositorySession() );
ProjectArtifactsCache.CacheRecord recordArtifacts;
recordArtifacts = projectArtifactsCache.get( cacheKey );
-
+
if ( recordArtifacts != null )
{
artifacts = recordArtifacts.artifacts;
@@ -142,7 +142,7 @@ public class LifecycleDependencyResolver
{
try
{
- artifacts = getDependencies( project, scopesToCollect, scopesToResolve, session, aggregating,
+ artifacts = getDependencies( project, scopesToCollect, scopesToResolve, session, aggregating,
projectArtifacts );
recordArtifacts = projectArtifactsCache.put( cacheKey, artifacts );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
index cee8073..1377158 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
@@ -65,7 +65,7 @@ public class LifecycleStarter
@Requirement
private Map<String, Builder> builders;
-
+
@Requirement
private SessionScope sessionScope;
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
index b4a8107..2c3ac35 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
@@ -27,7 +27,7 @@ import org.apache.maven.project.artifact.InvalidDependencyVersionException;
/**
* Component interface responsible for creation of MavenProject#dependencyArtifacts instances.
- *
+ *
* @since 3.2.4
* @provisional This interface is part of work in progress and can be changed or removed without notice.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b3e35e0..b24d785 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -150,7 +150,7 @@ public class MultiThreadedBuilder
}
catch ( ExecutionException e )
{
- // TODO MNG-5766 changes likely made this redundant
+ // TODO MNG-5766 changes likely made this redundant
rootSession.getResult().addException( e );
break;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
index e6845a3..e33b9b2 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
@@ -107,7 +107,7 @@ public class DefaultLifecycleMapping
return null;
}
}
-
+
@Deprecated
public Map<String, String> getPhases( String lifecycle )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
index ad3e486..afc82ae 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
@@ -62,7 +62,7 @@ public class Lifecycle
{
return this.lifecyclePhases;
}
-
+
/**
* Method setId
*
@@ -89,12 +89,12 @@ public class Lifecycle
{
return null;
}
-
+
if ( lphases.isEmpty() )
{
return Collections.emptyMap();
}
-
+
Map<String, String> phases = new LinkedHashMap<>();
for ( Map.Entry<String, LifecyclePhase> e: lphases.entrySet() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
index f2af879..8d8fc18 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
@@ -26,36 +26,36 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
public class LifecycleMojo
{
-
+
private String goal;
private Xpp3Dom configuration;
private List<Dependency> dependencies;
-
+
public String getGoal()
{
return goal;
}
-
+
public Xpp3Dom getConfiguration()
{
return configuration;
}
-
+
public List<Dependency> getDependencies()
{
return dependencies;
}
-
+
public void setGoal( String goal )
{
this.goal = goal;
}
-
+
public void setConfiguration( Xpp3Dom configuration )
{
this.configuration = configuration;
}
-
+
public void setDependencies( List<Dependency> dependencies )
{
this.dependencies = dependencies;
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
index 295e642..963c3b1 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
@@ -29,36 +29,36 @@ import org.codehaus.plexus.util.StringUtils;
public class LifecyclePhase
{
-
+
private List<LifecycleMojo> mojos;
-
+
public LifecyclePhase()
{
}
-
+
public LifecyclePhase( String goals )
{
set( goals );
}
-
+
public List<LifecycleMojo> getMojos()
{
return mojos;
}
-
+
public void setMojos( List<LifecycleMojo> mojos )
{
this.mojos = mojos;
}
-
+
public void set( String goals )
{
mojos = new ArrayList<>();
-
+
if ( StringUtils.isNotEmpty( goals ) )
{
String[] mojoGoals = StringUtils.split( goals, "," );
-
+
for ( String mojoGoal: mojoGoals )
{
LifecycleMojo lifecycleMojo = new LifecycleMojo();
@@ -67,7 +67,7 @@ public class LifecyclePhase
}
}
}
-
+
@Override
public String toString()
{
@@ -91,7 +91,7 @@ public class LifecyclePhase
}
return sb.toString();
}
-
+
@Deprecated
public static Map<String, String> toLegacyMap( Map<String, LifecyclePhase> lifecyclePhases )
{
@@ -99,12 +99,12 @@ public class LifecyclePhase
{
return null;
}
-
+
if ( lifecyclePhases.isEmpty() )
{
return Collections.emptyMap();
}
-
+
Map<String, String> phases = new LinkedHashMap<>();
for ( Map.Entry<String, LifecyclePhase> e: lifecyclePhases.entrySet() )
{
@@ -112,5 +112,5 @@ public class LifecyclePhase
}
return phases;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
index 1eaa627..78a1765 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
@@ -54,11 +54,11 @@ public class DefaultProjectArtifactsCache
{
private final String groupId;
-
+
private final String artifactId;
-
+
private final String version;
-
+
private final Set<String> dependencyArtifacts;
private final WorkspaceRepository workspace;
@@ -66,11 +66,11 @@ public class DefaultProjectArtifactsCache
private final LocalRepository localRepo;
private final List<RemoteRepository> repositories;
-
+
private final Set<String> collect;
-
+
private final Set<String> resolve;
-
+
private boolean aggregating;
private final int hashCode;
@@ -79,11 +79,11 @@ public class DefaultProjectArtifactsCache
Collection<String> scopesToCollect, Collection<String> scopesToResolve, boolean aggregating,
RepositorySystemSession session )
{
-
+
groupId = project.getGroupId();
artifactId = project.getArtifactId();
version = project.getVersion();
-
+
Set<String> deps = new HashSet<>();
if ( project.getDependencyArtifacts() != null )
{
@@ -93,7 +93,7 @@ public class DefaultProjectArtifactsCache
}
}
dependencyArtifacts = Collections.unmodifiableSet( deps );
-
+
workspace = CacheUtils.getWorkspace( session );
this.localRepo = session.getLocalRepository();
this.repositories = new ArrayList<>( repositories.size() );
@@ -109,10 +109,10 @@ public class DefaultProjectArtifactsCache
}
}
collect = scopesToCollect == null
- ? Collections.<String>emptySet()
+ ? Collections.<String>emptySet()
: Collections.unmodifiableSet( new HashSet<>( scopesToCollect ) );
- resolve = scopesToResolve == null
- ? Collections.<String>emptySet()
+ resolve = scopesToResolve == null
+ ? Collections.<String>emptySet()
: Collections.unmodifiableSet( new HashSet<>( scopesToResolve ) );
this.aggregating = aggregating;
@@ -162,10 +162,10 @@ public class DefaultProjectArtifactsCache
CacheKey that = (CacheKey) o;
- return eq( groupId, that.groupId ) && eq( artifactId, that.artifactId ) && eq( version, that.version )
+ return eq( groupId, that.groupId ) && eq( artifactId, that.artifactId ) && eq( version, that.version )
&& eq( dependencyArtifacts, that.dependencyArtifacts )
- && eq( workspace, that.workspace ) && eq( localRepo, that.localRepo )
- && CacheUtils.repositoriesEquals( repositories, that.repositories ) && eq( collect, that.collect )
+ && eq( workspace, that.workspace ) && eq( localRepo, that.localRepo )
+ && CacheUtils.repositoriesEquals( repositories, that.repositories ) && eq( collect, that.collect )
&& eq( resolve, that.resolve ) && aggregating == that.aggregating;
}
@@ -181,7 +181,7 @@ public class DefaultProjectArtifactsCache
public Key createKey( MavenProject project, Collection<String> scopesToCollect,
Collection<String> scopesToResolve, boolean aggregating, RepositorySystemSession session )
{
- return new CacheKey( project, project.getRemoteProjectRepositories(), scopesToCollect, scopesToResolve,
+ return new CacheKey( project, project.getRemoteProjectRepositories(), scopesToCollect, scopesToResolve,
aggregating, session );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
index b228a1b..c1ef63e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
@@ -95,7 +95,7 @@ public interface MavenPluginManager
/**
* Sets up class realm for the specified build extensions plugin.
- *
+ *
* @since 3.3.0
*/
ExtensionRealmCache.CacheRecord setupExtensionsRealm( MavenProject project, Plugin plugin,
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
index a7eeb4e..558908d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
@@ -52,7 +52,7 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
* <tr><td><code>settings</code></td> <td></td> <td>{@link MavenSession#getSettings()}</td></tr>
* <tr><td><code>settings.*</code></td> <td></td> <td></td></tr>
* <tr><td><code>basedir</code></td> <td></td>
- * <td>{@link MavenSession#getExecutionRootDirectory()} or
+ * <td>{@link MavenSession#getExecutionRootDirectory()} or
* <code>System.getProperty( "user.dir" )</code> if null</td></tr>
* <tr><td><code>mojoExecution</code></td> <td></td> <td>the actual {@link MojoExecution}</td></tr>
* <tr><td><code>mojo</code></td> <td>(since Maven 3)</td><td>same as <code>mojoExecution</code></td></tr>
@@ -104,12 +104,12 @@ public class PluginParameterExpressionEvaluator
this.project = session.getCurrentProject();
//
- // Maven4: We may want to evaluate how this is used but we add these separate as the
+ // Maven4: We may want to evaluate how this is used but we add these separate as the
// getExecutionProperties is deprecated in MavenSession.
//
this.properties.putAll( session.getUserProperties() );
this.properties.putAll( session.getSystemProperties() );
-
+
String basedir = null;
if ( project != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
index 42a95e5..2e564ba 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
@@ -66,7 +66,7 @@ public interface ProjectArtifactsCache
}
}
- Key createKey( MavenProject project, Collection<String> scopesToCollect, Collection<String> scopesToResolve,
+ Key createKey( MavenProject project, Collection<String> scopesToCollect, Collection<String> scopesToResolve,
boolean aggregating, RepositorySystemSession session );
CacheRecord get( Key key ) throws LifecycleExecutionException;
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 2406ff9..25124e4 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -895,7 +895,7 @@ public class DefaultProjectBuilder
public final List<RemoteRepository> repositories;
public final ReactorModelPool modelPool;
-
+
public final ReactorModelCache modelCache;
InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool, ReactorModelCache modelCache )
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index d7d6ce8..3e31c7c 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -260,7 +260,7 @@ public class MavenProject
/**
* Sets project {@code file} without changing project {@code basedir}.
- *
+ *
* @since 3.2.4
*/
public void setPomFile( File file )
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java b/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java
index 679ee00..1b29733 100644
--- a/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java
+++ b/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java
@@ -23,7 +23,7 @@ import org.eclipse.aether.RepositorySystemSession;
/**
* Component interface that allows per-project customization of Aether repository system sessions.
- *
+ *
* @since 3.2.4
* @provisional This interface is part of work in progress and can be changed or removed without notice.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
index f5630c1..16cf828 100644
--- a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
+++ b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
@@ -38,8 +38,8 @@ public class SystemProperties
/**
* Returns a copy of {@link System#getProperties()} in a thread-safe manner.
- *
- * @return {@link System#getProperties()} obtained in a thread-safe manner.
+ *
+ * @return {@link System#getProperties()} obtained in a thread-safe manner.
*/
public static Properties getSystemProperties()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
index 59f5e13..8e5359d 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
@@ -49,7 +49,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
private Logger logger;
/**
- *
+ *
* @param model the model, must not be {@code null}
* @param logger the logger, must not be {@code null}
*/
@@ -61,7 +61,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
}
/**
- *
+ *
* @param model the model, must not be {@code null}
* @param type the type
* @param logger the logger, must not be {@code null}
@@ -164,7 +164,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
}
return hashCode;
}
-
+
@Override
public String toString()
{
@@ -182,9 +182,9 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
builder.append( ';' );
}
}
-
+
builder.append( '}' );
-
+
return builder.toString();
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/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 9f7a26b..e36f9b0 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
@@ -45,7 +45,7 @@ public class DefaultToolchainManager
@Requirement( role = ToolchainFactory.class )
Map<String, ToolchainFactory> factories;
-
+
@Override
public Toolchain getToolchainFromBuildContext( String type, MavenSession session )
{
@@ -56,7 +56,7 @@ public class DefaultToolchainManager
if ( model != null )
{
List<Toolchain> toolchains = selectToolchains( Collections.singletonList( model ), type, null );
-
+
if ( !toolchains.isEmpty() )
{
return toolchains.get( 0 );
@@ -109,7 +109,7 @@ public class DefaultToolchainManager
}
return toolchains;
}
-
+
Map<String, Object> retrieveContext( MavenSession session )
{
Map<String, Object> context = null;
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
index 40db389..d33ef9b 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
@@ -60,7 +60,7 @@ public class DefaultToolchainManagerPrivate
toRet.add( fact.createToolchain( toolchainModel ) );
}
}
-
+
// add default toolchain
ToolchainPrivate tool = fact.createDefaultToolchain();
if ( tool != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
index 3d6917b..02f5cc0 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
@@ -59,7 +59,7 @@ public final class RequirementMatcherFactory
{
return provides.equalsIgnoreCase( requirement );
}
-
+
@Override
public String toString()
{
@@ -99,7 +99,7 @@ public final class RequirementMatcherFactory
return false;
}
}
-
+
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
index bc0a91d..134c24d 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
@@ -49,11 +49,11 @@ public interface ToolchainManager
* @return the toolchain selected by <code>maven-toolchains-plugin</code>
*/
Toolchain getToolchainFromBuildContext( String type, MavenSession context );
-
+
/**
* Select all toolchains available in user settings matching the type and requirements,
* independently from <code>maven-toolchains-plugin</code>.
- *
+ *
* @param session the Maven session, must not be {@code null}
* @param type the type, must not be {@code null}
* @param requirements the requirements, may be {@code null}
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
index 6836bf1..ed50bd4 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
@@ -37,7 +37,7 @@ public interface ToolchainManagerPrivate
/**
* Retrieves every toolchains of given type available in user settings.
- *
+ *
* @param type the type, must not be {@code null}
* @param context the Maven session, must not be {@code null}
* @since 3.0 (addition of the <code>MavenSession</code> parameter)
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
index 756cd95..d935661 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
@@ -40,7 +40,7 @@ public interface ToolchainPrivate
boolean matchesRequirements( Map<String, String> requirements );
/**
- *
+ *
* @return the original model wrapped by this interface
*/
ToolchainModel getModel();
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
index 7983388..7abd0fe 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
@@ -39,7 +39,7 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.TrackableBase;
/**
- *
+ *
* @author Robert Scholte
* @since 3.3.0
*/
@@ -49,7 +49,7 @@ public class DefaultToolchainsBuilder
implements ToolchainsBuilder
{
private MavenToolchainMerger toolchainsMerger = new MavenToolchainMerger();
-
+
@Inject
private ToolchainsReader toolchainsReader;
@@ -58,21 +58,21 @@ public class DefaultToolchainsBuilder
throws ToolchainsBuildingException
{
ProblemCollector problems = ProblemCollectorFactory.newInstance( null );
-
+
PersistedToolchains globalToolchains = readToolchains( request.getGlobalToolchainsSource(), request, problems );
PersistedToolchains userToolchains = readToolchains( request.getUserToolchainsSource(), request, problems );
toolchainsMerger.merge( userToolchains, globalToolchains, TrackableBase.GLOBAL_LEVEL );
-
+
problems.setSource( "" );
-
+
if ( hasErrors( problems.getProblems() ) )
{
throw new ToolchainsBuildingException( problems.getProblems() );
}
-
-
+
+
return new DefaultToolchainsBuildingResult( userToolchains, problems.getProblems() );
}
@@ -119,7 +119,7 @@ public class DefaultToolchainsBuilder
return toolchains;
}
-
+
private boolean hasErrors( List<Problem> problems )
{
if ( problems != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
index 144d724..3c0e65d 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
@@ -33,7 +33,7 @@ public class DefaultToolchainsBuildingRequest
private Source globalToolchainsSource;
private Source userToolchainsSource;
-
+
@Override
public Source getGlobalToolchainsSource()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
index 60ca244..d06650c 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
@@ -27,7 +27,7 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
/**
* Holds the result of the merged toolchains and holds the problems during this build, if any.
- *
+ *
* @author Robert Scholte
* @since 3.3.0
*/
@@ -36,12 +36,12 @@ public class DefaultToolchainsBuildingResult
{
private PersistedToolchains effectiveToolchains;
-
+
private List<Problem> problems;
-
+
/**
* Default constructor
- *
+ *
* @param effectiveToolchains the merged toolchains, may not be {@code null}
* @param problems the problems while building the effectiveToolchains, if any.
*/
@@ -56,7 +56,7 @@ public class DefaultToolchainsBuildingResult
{
return effectiveToolchains;
}
-
+
@Override
public List<Problem> getProblems()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
index 592fb98..f7c5f71 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
@@ -42,7 +42,7 @@ public interface ToolchainsBuildingResult
/**
* Return a list of problems, if any.
- *
+ *
* @return a list of problems, never {@code null}.
*/
List<Problem> getProblems();
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
index 9cfcff3..ac29f1f 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
@@ -26,7 +26,7 @@ import org.codehaus.plexus.logging.Logger;
* Provides backwards compatibility with Maven 3.2.3 and earlier. Clients that do not require compatibility with Maven
* 3.2.3 and earlier are encouraged to use {@link JavaToolchainImpl}.
* <strong>Note:</strong> This is an internal component whose interface can change without prior notice.
- *
+ *
* @deprecated clients that do not require compatibility with Maven 3.2.3 and earlier should link to
* {@link JavaToolchainImpl} instead.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
index ca910d8..43888ed 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
@@ -28,7 +28,7 @@ import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
- *
+ *
* @author Robert Scholte
* @since 3.2.4
*/
@@ -55,14 +55,14 @@ public class MavenToolchainMerger
for ( ToolchainModel dominantModel : dominant )
{
Object key = getToolchainModelKey( dominantModel );
-
+
merged.put( key, dominantModel );
}
for ( ToolchainModel recessiveModel : recessive )
{
Object key = getToolchainModelKey( recessiveModel );
-
+
ToolchainModel dominantModel = merged.get( key );
if ( dominantModel == null )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/mdo/toolchains.mdo
----------------------------------------------------------------------
diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo
index 4740d1b..161e5a4 100644
--- a/maven-core/src/main/mdo/toolchains.mdo
+++ b/maven-core/src/main/mdo/toolchains.mdo
@@ -182,7 +182,7 @@
<![CDATA[
/**
* Method hashCode.
- *
+ *
* @return int
*/
public int hashCode()
@@ -194,10 +194,10 @@
return result;
} //-- int hashCode()
-
+
/**
* Method equals.
- *
+ *
* @param other
* @return boolean
*/
@@ -220,7 +220,7 @@
result = result && ( getProvides() == null ? that.getProvides() == null : getProvides().equals( that.getProvides() ) );
return result;
- } //-- boolean equals( Object )
+ } //-- boolean equals( Object )
]]>
</code>
</codeSegment>
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/main/resources/META-INF/maven/extension.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
index f9cf07a..7ffb249 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -99,7 +99,7 @@ under the License.
<exportedPackage>javax.enterprise.inject.*</exportedPackage>
- <!--
+ <!--
| We may potentially want to export these, but right now I'm not sure that anything Guice specific needs
| to be made available to plugin authors. If we find people are getting fancy and want to take advantage of
| Guice specifics we can expose that later. Really some testing needs to be done to see full hiding
@@ -161,7 +161,7 @@ under the License.
<exportedArtifact>org.fusesource.jansi:jansi</exportedArtifact>
<!--
- | We must also filter out the old Aether or NoClassDefFoundErrors will surface
+ | We must also filter out the old Aether or NoClassDefFoundErrors will surface
-->
<exportedArtifact>org.sonatype.aether:aether-api</exportedArtifact>
<exportedArtifact>org.sonatype.aether:aether-spi</exportedArtifact>
@@ -171,7 +171,7 @@ under the License.
| NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise
| provoke linkage errors for wagons contributed by build extensions. We also don't need to exclude the wagons
| from plugins. Plugins that use wagons directly and declare the corresponding dependency will simply use a
- | wagon from their plugin realm.
+ | wagon from their plugin realm.
-->
</exportedArtifacts>
</extension>