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 2020/12/24 18:50:51 UTC
[maven] 02/02: Replace tabs with proper count of spaces
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8eda091d4e2231eee3c33b4e9d417d62971d0762
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Dec 24 19:50:27 2020 +0100
Replace tabs with proper count of spaces
---
Jenkinsfile | 4 +-
.../src/assembly/wrapper/script/download.cmd | 12 +-
.../src/main/appended-resources/META-INF/NOTICE.vm | 2 +-
.../inheritance/t09/ProjectInheritanceTest.java | 2 +-
.../inheritance/t10/ProjectInheritanceTest.java | 4 +-
.../DefaultClasspathTransformationTest.java | 124 ++++++------
.../DefaultGraphConflictResolutionPolicyTest.java | 38 ++--
.../metadata/DefaultGraphConflictResolverTest.java | 170 ++++++++--------
.../test/resources/inheritance-repo/t04/p0/pom.xml | 12 +-
.../test/resources/inheritance-repo/t10/p0/pom.xml | 14 +-
maven-core/src/site/apt/offline-mode.apt | 2 +-
.../lifecycle/MojoExecutionXPathContainer.java | 2 +-
.../maven/plugin/PluginParameterExceptionTest.java | 18 +-
.../maven/project/harness/PomTestWrapper.java | 4 +-
.../config-with-plugin-mng/pom.xml | 75 ++++---
.../dependency-scope-inheritance/pom.xml | 28 +--
.../duplicate-exclusions-dependency/pom.xml | 56 +++---
.../w-plugin-mgmt/pom.xml | 2 +-
.../resources-project-builder/micromailer/pom.xml | 218 ++++++++++-----------
.../micromailer/spice-parent-9.pom | 186 +++++++++---------
.../parent-interpolation/pom.xml | 30 +--
.../parent-interpolation/sub/pom.xml | 16 +-
.../plugin-inheritance-simple/pom.xml | 31 ++-
.../plugin-inheritance-simple/sub/pom.xml | 38 ++--
.../plugin-management-dependencies/pom.xml | 44 ++---
.../plugin-management-duplicate/pom.xml | 66 +++----
.../plugin-management-duplicate/sub/pom.xml | 12 +-
.../pluginmanagement-inherited/pom.xml | 34 ++--
.../pluginmanagement-inherited/sub/pom.xml | 32 +--
.../profile-properties-interpolation/pom.xml | 86 ++++----
.../properties-no-duplication/sub/pom.xml | 6 +-
.../reporting-interpolation/pom.xml | 10 +-
.../resources-settings/settings-no-pom/pom.xml | 22 +--
.../settings-no-pom/settings.xml | 34 ++--
.../grandchild-check/child/grandchild/pom.xml | 15 +-
.../projects/grandchild-check/child/pom.xml | 16 +-
.../resources/projects/grandchild-check/pom.xml | 10 +-
.../pom.xml | 10 +-
.../pom.xml | 10 +-
.../parent-version-range-local-valid/pom.xml | 10 +-
.../DefaultInheritanceAssemblerTest.java | 2 +-
.../raw-model/bad-ci-friendly-sha1plus.xml | 18 +-
.../raw-model/bad-ci-friendly-sha1plus2.xml | 18 +-
.../poms/validation/raw-model/bad-ci-friendly.xml | 18 +-
.../raw-model/bad-parent-version-latest.xml | 30 +--
.../raw-model/bad-parent-version-release.xml | 30 +--
.../raw-model/ok-ci-friendly-all-expressions.xml | 18 +-
.../raw-model/ok-ci-friendly-changelist.xml | 18 +-
.../raw-model/ok-ci-friendly-revision.xml | 18 +-
.../validation/raw-model/ok-ci-friendly-sha1.xml | 18 +-
.../poms/validation/raw-model/self-referencing.xml | 32 +--
.../maven/xml/sax/filter/ModulesXMLFilterTest.java | 78 ++++----
52 files changed, 900 insertions(+), 903 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index eae44cc..ba9c3c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,8 +58,8 @@ node(jenkinsEnv.nodeSelection(osNode)) {
invokerPublisher(disabled: true),
pipelineGraphPublisher(disabled: false)
], publisherStrategy: 'EXPLICIT') {
- // For now: maven-wrapper contains 2 poms sharing the same outputDirectory, so separate clean
- sh "mvn clean"
+ // For now: maven-wrapper contains 2 poms sharing the same outputDirectory, so separate clean
+ sh "mvn clean"
sh "mvn ${MAVEN_GOAL} -B -U -e -fae -V -Dmaven.test.failure.ignore=true -P versionlessMavenDist"
}
dir ('apache-maven/target') {
diff --git a/apache-maven/src/assembly/wrapper/script/download.cmd b/apache-maven/src/assembly/wrapper/script/download.cmd
index 8d71146..9166b9a 100755
--- a/apache-maven/src/assembly/wrapper/script/download.cmd
+++ b/apache-maven/src/assembly/wrapper/script/download.cmd
@@ -17,12 +17,12 @@ if "%MVNW_VERBOSE%" == "true" (
)
powershell -Command "&{"^
- "$webclient = new-object System.Net.WebClient;"^
- "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
- "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
- "}"^
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%LAUNCHER_JAR%')"^
- "}"
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%LAUNCHER_JAR%')"^
+ "}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %LAUNCHER_JAR%
)
diff --git a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
index 37fad1f..7366c77 100644
--- a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
@@ -48,7 +48,7 @@ about.html in archive lib/org.eclipse.sisu.inject-0.3.4.jar
<body lang="EN-US">
<h2>About org.eclipse.sisu.inject</h2>
-<p>November 5, 2013</p>
+<p>November 5, 2013</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
index aa492e4..29cd2ea 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
@@ -41,7 +41,7 @@ public class ProjectInheritanceTest
// or we can show it graphically as:
//
// p1 ---> p0 --> super model
- //
+ //
// ----------------------------------------------------------------------
/**
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
index c785176..b24f70f 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
@@ -49,7 +49,7 @@ public class ProjectInheritanceTest
// or we can show it graphically as:
//
// p1 ---> p0 --> super model
- //
+ //
// ----------------------------------------------------------------------
public void testDependencyManagementOverridesTransitiveDependencyVersion()
@@ -91,4 +91,4 @@ public class ProjectInheritanceTest
assertTrue("Incorrect scope for " + c.getDependencyConflictId(), c.getScope().equals("runtime"));
}
-}
\ No newline at end of file
+}
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
index 4f40516..339ce24 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
@@ -33,87 +33,87 @@ import org.codehaus.plexus.PlexusTestCase;
public class DefaultClasspathTransformationTest
extends PlexusTestCase
{
- ClasspathTransformation transform;
+ ClasspathTransformation transform;
- MetadataGraph graph;
+ MetadataGraph graph;
- MetadataGraphVertex v1;
- MetadataGraphVertex v2;
- MetadataGraphVertex v3;
- MetadataGraphVertex v4;
+ MetadataGraphVertex v1;
+ MetadataGraphVertex v2;
+ MetadataGraphVertex v3;
+ MetadataGraphVertex v4;
//------------------------------------------------------------------------------------------
@Override
- protected void setUp() throws Exception
- {
- super.setUp();
- transform = (ClasspathTransformation) lookup( ClasspathTransformation.ROLE, "default" );
-
- graph = new MetadataGraph( 4, 3 );
- /*
- * v2
- * v1<
- * v3-v4
- *
- */
- v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0"));
- graph.setEntry(v1);
- v2 = graph.addVertex(new ArtifactMetadata("g","a2","1.0"));
- v3 = graph.addVertex(new ArtifactMetadata("g","a3","1.0"));
- v4 = graph.addVertex(new ArtifactMetadata("g","a4","1.0"));
-
- // v1-->v2
- graph.addEdge(v1, v2, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
- graph.addEdge(v1, v2, new MetadataGraphEdge( "1.2", true, null, null, 2, 2 ) );
-
- // v1-->v3
- graph.addEdge(v1, v3, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
- graph.addEdge(v1, v3, new MetadataGraphEdge( "1.2", true, null, null, 4, 2 ) );
-
- // v3-->v4
- graph.addEdge(v3, v4, new MetadataGraphEdge( "1.1", true, ArtifactScopeEnum.runtime, null, 2, 2 ) );
- graph.addEdge(v3, v4, new MetadataGraphEdge( "1.2", true, ArtifactScopeEnum.test, null, 2, 2 ) );
- }
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ transform = (ClasspathTransformation) lookup( ClasspathTransformation.ROLE, "default" );
+
+ graph = new MetadataGraph( 4, 3 );
+ /*
+ * v2
+ * v1<
+ * v3-v4
+ *
+ */
+ v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0"));
+ graph.setEntry(v1);
+ v2 = graph.addVertex(new ArtifactMetadata("g","a2","1.0"));
+ v3 = graph.addVertex(new ArtifactMetadata("g","a3","1.0"));
+ v4 = graph.addVertex(new ArtifactMetadata("g","a4","1.0"));
+
+ // v1-->v2
+ graph.addEdge(v1, v2, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
+ graph.addEdge(v1, v2, new MetadataGraphEdge( "1.2", true, null, null, 2, 2 ) );
+
+ // v1-->v3
+ graph.addEdge(v1, v3, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
+ graph.addEdge(v1, v3, new MetadataGraphEdge( "1.2", true, null, null, 4, 2 ) );
+
+ // v3-->v4
+ graph.addEdge(v3, v4, new MetadataGraphEdge( "1.1", true, ArtifactScopeEnum.runtime, null, 2, 2 ) );
+ graph.addEdge(v3, v4, new MetadataGraphEdge( "1.2", true, ArtifactScopeEnum.test, null, 2, 2 ) );
+ }
//------------------------------------------------------------------------------------------
public void testCompileClasspathTransform()
throws Exception
{
- ClasspathContainer res;
-
- res = transform.transform( graph, ArtifactScopeEnum.compile, false );
+ ClasspathContainer res;
+
+ res = transform.transform( graph, ArtifactScopeEnum.compile, false );
- assertNotNull("null classpath container after compile transform", res );
- assertNotNull("null classpath after compile transform", res.getClasspath() );
- assertEquals("compile classpath should have 3 entries", 3, res.getClasspath().size() );
+ assertNotNull("null classpath container after compile transform", res );
+ assertNotNull("null classpath after compile transform", res.getClasspath() );
+ assertEquals("compile classpath should have 3 entries", 3, res.getClasspath().size() );
}
//------------------------------------------------------------------------------------------
public void testRuntimeClasspathTransform()
throws Exception
{
- ClasspathContainer res;
-
- res = transform.transform( graph, ArtifactScopeEnum.runtime, false );
-
- assertNotNull("null classpath container after runtime transform", res );
- assertNotNull("null classpath after runtime transform", res.getClasspath() );
- assertEquals("runtime classpath should have 4 entries", 4, res.getClasspath().size() );
-
- ArtifactMetadata md = res.getClasspath().get(3);
- assertEquals("runtime artifact version should be 1.1", "1.1", md.getVersion() );
+ ClasspathContainer res;
+
+ res = transform.transform( graph, ArtifactScopeEnum.runtime, false );
+
+ assertNotNull("null classpath container after runtime transform", res );
+ assertNotNull("null classpath after runtime transform", res.getClasspath() );
+ assertEquals("runtime classpath should have 4 entries", 4, res.getClasspath().size() );
+
+ ArtifactMetadata md = res.getClasspath().get(3);
+ assertEquals("runtime artifact version should be 1.1", "1.1", md.getVersion() );
}
//------------------------------------------------------------------------------------------
public void testTestClasspathTransform()
throws Exception
{
- ClasspathContainer res;
-
- res = transform.transform( graph, ArtifactScopeEnum.test, false );
-
- assertNotNull("null classpath container after runtime transform", res );
- assertNotNull("null classpath after runtime transform", res.getClasspath() );
- assertEquals("runtime classpath should have 4 entries", 4, res.getClasspath().size() );
-
- ArtifactMetadata md = res.getClasspath().get(3);
- assertEquals("test artifact version should be 1.2", "1.2", md.getVersion() );
+ ClasspathContainer res;
+
+ res = transform.transform( graph, ArtifactScopeEnum.test, false );
+
+ assertNotNull("null classpath container after runtime transform", res );
+ assertNotNull("null classpath after runtime transform", res.getClasspath() );
+ assertEquals("runtime classpath should have 4 entries", 4, res.getClasspath().size() );
+
+ ArtifactMetadata md = res.getClasspath().get(3);
+ assertEquals("test artifact version should be 1.2", "1.2", md.getVersion() );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
index 89c0116..472f018 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
@@ -29,31 +29,31 @@ import junit.framework.TestCase;
public class DefaultGraphConflictResolutionPolicyTest
extends TestCase
{
- GraphConflictResolutionPolicy policy;
- MetadataGraphEdge e1;
- MetadataGraphEdge e2;
- MetadataGraphEdge e3;
+ GraphConflictResolutionPolicy policy;
+ MetadataGraphEdge e1;
+ MetadataGraphEdge e2;
+ MetadataGraphEdge e3;
//------------------------------------------------------------------------------------------
@Override
- protected void setUp() throws Exception
- {
- super.setUp();
- policy = new DefaultGraphConflictResolutionPolicy();
- e1 = new MetadataGraphEdge( "1.1", true, null, null, 2, 1 );
- e2 = new MetadataGraphEdge( "1.2", true, null, null, 3, 2 );
- e3 = new MetadataGraphEdge( "1.2", true, null, null, 2, 3 );
- }
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ policy = new DefaultGraphConflictResolutionPolicy();
+ e1 = new MetadataGraphEdge( "1.1", true, null, null, 2, 1 );
+ e2 = new MetadataGraphEdge( "1.2", true, null, null, 3, 2 );
+ e3 = new MetadataGraphEdge( "1.2", true, null, null, 2, 3 );
+ }
//------------------------------------------------------------------------------------------
public void testDefaultPolicy()
throws Exception
{
- MetadataGraphEdge res;
-
- res = policy.apply( e1, e2 );
- assertEquals( "Wrong depth edge selected", "1.1", res.getVersion() );
-
- res = policy.apply( e1, e3 );
- assertEquals( "Wrong version edge selected", "1.2", res.getVersion() );
+ MetadataGraphEdge res;
+
+ res = policy.apply( e1, e2 );
+ assertEquals( "Wrong depth edge selected", "1.1", res.getVersion() );
+
+ res = policy.apply( e1, e3 );
+ assertEquals( "Wrong version edge selected", "1.2", res.getVersion() );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
index 4fba8f5..ccd25b4 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
@@ -33,120 +33,120 @@ import org.codehaus.plexus.logging.Logger;
public class DefaultGraphConflictResolverTest
extends PlexusTestCase
{
- Logger log;
-
- GraphConflictResolver resolver;
-
- MetadataGraph graph;
-
- MetadataGraphVertex v1;
- MetadataGraphVertex v2;
- MetadataGraphVertex v3;
- MetadataGraphVertex v4;
+ Logger log;
+
+ GraphConflictResolver resolver;
+
+ MetadataGraph graph;
+
+ MetadataGraphVertex v1;
+ MetadataGraphVertex v2;
+ MetadataGraphVertex v3;
+ MetadataGraphVertex v4;
//------------------------------------------------------------------------------------------
@Override
- protected void setUp() throws Exception
- {
- super.setUp();
- resolver = (GraphConflictResolver) lookup( GraphConflictResolver.ROLE, "default" );
-
- /*
- * v2
- * v1<
- * v3-v4
- *
- */
- graph = new MetadataGraph( 4, 3 );
- v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0"));
- graph.setEntry(v1);
- v2 = graph.addVertex(new ArtifactMetadata("g","a2","1.0"));
- v3 = graph.addVertex(new ArtifactMetadata("g","a3","1.0"));
- v4 = graph.addVertex(new ArtifactMetadata("g","a4","1.0"));
-
- // v1-->v2
- graph.addEdge(v1, v2, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
- graph.addEdge(v1, v2, new MetadataGraphEdge( "1.2", true, null, null, 2, 2 ) );
-
- // v1-->v3
- graph.addEdge(v1, v3, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
- graph.addEdge(v1, v3, new MetadataGraphEdge( "1.2", true, null, null, 4, 2 ) );
-
- // v3-->v4
- graph.addEdge(v3, v4, new MetadataGraphEdge( "1.1", true, ArtifactScopeEnum.runtime, null, 2, 1 ) );
- graph.addEdge(v3, v4, new MetadataGraphEdge( "1.2", true, ArtifactScopeEnum.provided, null, 2, 2 ) );
- }
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ resolver = (GraphConflictResolver) lookup( GraphConflictResolver.ROLE, "default" );
+
+ /*
+ * v2
+ * v1<
+ * v3-v4
+ *
+ */
+ graph = new MetadataGraph( 4, 3 );
+ v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0"));
+ graph.setEntry(v1);
+ v2 = graph.addVertex(new ArtifactMetadata("g","a2","1.0"));
+ v3 = graph.addVertex(new ArtifactMetadata("g","a3","1.0"));
+ v4 = graph.addVertex(new ArtifactMetadata("g","a4","1.0"));
+
+ // v1-->v2
+ graph.addEdge(v1, v2, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
+ graph.addEdge(v1, v2, new MetadataGraphEdge( "1.2", true, null, null, 2, 2 ) );
+
+ // v1-->v3
+ graph.addEdge(v1, v3, new MetadataGraphEdge( "1.1", true, null, null, 2, 1 ) );
+ graph.addEdge(v1, v3, new MetadataGraphEdge( "1.2", true, null, null, 4, 2 ) );
+
+ // v3-->v4
+ graph.addEdge(v3, v4, new MetadataGraphEdge( "1.1", true, ArtifactScopeEnum.runtime, null, 2, 1 ) );
+ graph.addEdge(v3, v4, new MetadataGraphEdge( "1.2", true, ArtifactScopeEnum.provided, null, 2, 2 ) );
+ }
//------------------------------------------------------------------------------------------
public void testCompileResolution()
throws Exception
{
- MetadataGraph res;
-
- res = resolver.resolveConflicts( graph, ArtifactScopeEnum.compile );
-
- assertNotNull("null graph after resolver", res );
- assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
+ MetadataGraph res;
+
+ res = resolver.resolveConflicts( graph, ArtifactScopeEnum.compile );
- assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
+ assertNotNull("null graph after resolver", res );
+ assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
- assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
- assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
+ assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
- assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
- assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
+ assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
+ assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
- assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
- assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
+ assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
+ assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
- assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
- assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v4).get(0).getVersion() );
+ assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
+ assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
+
+ assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
+ assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v4).get(0).getVersion() );
}
//------------------------------------------------------------------------------------------
public void testRuntimeResolution()
throws Exception
{
- MetadataGraph res;
-
- res = resolver.resolveConflicts( graph, ArtifactScopeEnum.runtime );
-
- assertNotNull("null graph after resolver", res );
- assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
- assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
+ MetadataGraph res;
+
+ res = resolver.resolveConflicts( graph, ArtifactScopeEnum.runtime );
+
+ assertNotNull("null graph after resolver", res );
+ assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
+ assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
- assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
- assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
+ assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
+ assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
- assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
- assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
+ assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
+ assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
- assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
- assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
+ assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
+ assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
- assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
- assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v4).get(0).getVersion() );
+ assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
+ assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v4).get(0).getVersion() );
}
//------------------------------------------------------------------------------------------
public void testTestResolution()
throws Exception
{
- MetadataGraph res;
-
- res = resolver.resolveConflicts( graph, ArtifactScopeEnum.test );
-
- assertNotNull("null graph after resolver", res );
- assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
- assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
+ MetadataGraph res;
+
+ res = resolver.resolveConflicts( graph, ArtifactScopeEnum.test );
+
+ assertNotNull("null graph after resolver", res );
+ assertNotNull("no vertices in the resulting graph after resolver", res.getVertices() );
+ assertNotNull("no edges in the resulting graph after resolver", res.getExcidentEdges(v1) );
- assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
- assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
+ assertEquals( "wrong # of vertices in the resulting graph after resolver", 4, res.getVertices().size() );
+ assertEquals( "wrong # of excident edges in the resulting graph entry after resolver", 2, res.getExcidentEdges(v1).size() );
- assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
- assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
+ assertEquals( "wrong # of v2 incident edges in the resulting graph after resolver", 1, res.getIncidentEdges(v2).size() );
+ assertEquals( "wrong edge v1-v2 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v2).get(0).getVersion() );
- assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
- assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
+ assertEquals( "wrong # of edges v1-v3 in the resulting graph after resolver", 1, res.getIncidentEdges(v3).size() );
+ assertEquals( "wrong edge v1-v3 in the resulting graph after resolver", "1.1", res.getIncidentEdges(v3).get(0).getVersion() );
- assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
- assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v4).get(0).getVersion() );
+ assertEquals( "wrong # of edges v3-v4 in the resulting graph after resolver", 1, res.getIncidentEdges(v4).size() );
+ assertEquals( "wrong edge v3-v4 in the resulting graph after resolver", "1.2", res.getIncidentEdges(v4).get(0).getVersion() );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml
index 1b02dc2..b7eb670 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml
@@ -25,13 +25,13 @@
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>t04-c</artifactId>
- <version>2.0</version>
- </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t04-c</artifactId>
+ <version>2.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml
index 853af40..74b6317 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml
@@ -27,15 +27,15 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>t10-c</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <artifactId>t10-c</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-core/src/site/apt/offline-mode.apt b/maven-core/src/site/apt/offline-mode.apt
index ff91bb5..ec596c0 100644
--- a/maven-core/src/site/apt/offline-mode.apt
+++ b/maven-core/src/site/apt/offline-mode.apt
@@ -196,7 +196,7 @@ Offline Mode Design
correctly.
[false] <<(Default)>> Either status is acceptable for the mojo to
- execute. It doesn't care.
+ execute. It doesn't care.
The majority of mojos will leave the requiresOnline == false,
since online/offline status will be irrelevant, provided they have
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java b/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java
index 6244cc9..ce81c85 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java
@@ -43,7 +43,7 @@ public class MojoExecutionXPathContainer
context = JXPathContext.newContext( mojoExecution );
}
- public Iterator<?> getIteratorForXPathExpression( String expression )
+ public Iterator<?> getIteratorForXPathExpression( String expression )
{
return context.iterate( expression );
}
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
index ead7ae2..fada72b 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
@@ -56,15 +56,15 @@ public class PluginParameterExceptionTest
new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) );
assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
- "\n" +
- "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
- "\n" +
- "<configuration>\n" +
- " ...\n" +
- " <toAddresses>\n" +
- " <item>VALUE</item>\n" +
- " </toAddresses>\n" +
- "</configuration>.\n", exception.buildDiagnosticMessage() );
+ "\n" +
+ "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
+ "\n" +
+ "<configuration>\n" +
+ " ...\n" +
+ " <toAddresses>\n" +
+ " <item>VALUE</item>\n" +
+ " </toAddresses>\n" +
+ "</configuration>.\n", exception.buildDiagnosticMessage() );
}
public void testMissingRequiredCollectionTypeParameter()
diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java b/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
index f6275d8..aa203e9 100644
--- a/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
+++ b/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
@@ -79,9 +79,9 @@ public class PomTestWrapper
source.init( domainModel.getModelProperties(), null );
return source.queryFor( uri ).size();
}
- */
+ */
- public Iterator<?> getIteratorForXPathExpression( String expression )
+ public Iterator<?> getIteratorForXPathExpression( String expression )
{
return context.iterate( expression );
}
diff --git a/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml b/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml
index e13c8a8..e2c315c 100644
--- a/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml
+++ b/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml
@@ -1,39 +1,38 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>nexus.xml</id>
- <configuration>
- <version>1.0.8</version>
- </configuration>
- </execution>
- <execution>
- <id>security.xml</id>
- <configuration>
- <version>1.0.0</version>
- <model>src/main/mdo/security.xml</model>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-21</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-</project>
\ No newline at end of file
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>nexus.xml</id>
+ <configuration>
+ <version>1.0.8</version>
+ </configuration>
+ </execution>
+ <execution>
+ <id>security.xml</id>
+ <configuration>
+ <version>1.0.0</version>
+ <model>src/main/mdo/security.xml</model>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-21</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
index 9f2ab95..1728fa2 100644
--- a/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml
@@ -1,16 +1,16 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>p0</artifactId>
- <groupId>maven</groupId>
- <version>1.0</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>p0</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>maven-test</groupId>
- <version>1.0</version>
- <artifactId>a</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+ <dependencies>
+ <dependency>
+ <groupId>maven-test</groupId>
+ <version>1.0</version>
+ <artifactId>a</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml
index f465d91..b8aa7ff 100644
--- a/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml
+++ b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml
@@ -1,33 +1,33 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-parent</artifactId>
- <version>8-SNAPSHOT</version>
- <relativePath>nexus-parent.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-parent</artifactId>
+ <version>8-SNAPSHOT</version>
+ <relativePath>nexus-parent.xml</relativePath>
+ </parent>
<groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <packaging>pom</packaging>
- <name>Nexus Repository Manager</name>
- <version>1.3.0-SNAPSHOT</version>
+ <artifactId>nexus</artifactId>
+ <packaging>pom</packaging>
+ <name>Nexus Repository Manager</name>
+ <version>1.3.0-SNAPSHOT</version>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <scope>provided</scope>
- <version>${plexus.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
\ No newline at end of file
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <scope>provided</scope>
+ <version>${plexus.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml
index edeffd7..1732570 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml
@@ -33,7 +33,7 @@ under the License.
</description>
<build>
- <!-- NOTE: This parent uses plugin management -->
+ <!-- NOTE: This parent uses plugin management -->
<pluginManagement>
<plugins>
<plugin>
diff --git a/maven-core/src/test/resources-project-builder/micromailer/pom.xml b/maven-core/src/test/resources-project-builder/micromailer/pom.xml
index c1e06df..75b362f 100644
--- a/maven-core/src/test/resources-project-builder/micromailer/pom.xml
+++ b/maven-core/src/test/resources-project-builder/micromailer/pom.xml
@@ -1,124 +1,124 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.sonatype.spice</groupId>
- <artifactId>spice-parent</artifactId>
- <version>11</version>
- <relativePath>spice-parent-9.pom</relativePath>
- </parent>
+ <parent>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-parent</artifactId>
+ <version>11</version>
+ <relativePath>spice-parent-9.pom</relativePath>
+ </parent>
- <groupId>org.sonatype.micromailer</groupId>
- <artifactId>micromailer</artifactId>
- <version>1.0.3</version>
- <packaging>jar</packaging>
- <name>Micro Mailer</name>
- <!-- SCM -->
- <scm>
- <connection>scm:svn:http://svn.sonatype.org/spice/trunk/micromailer</connection>
- <url>https://svn.sonatype.org/spice/trunk/micromailer</url>
- <developerConnection>scm:svn:https://svn.sonatype.org/spice/trunk/micromailer</developerConnection>
- </scm>
+ <groupId>org.sonatype.micromailer</groupId>
+ <artifactId>micromailer</artifactId>
+ <version>1.0.3</version>
+ <packaging>jar</packaging>
+ <name>Micro Mailer</name>
+ <!-- SCM -->
+ <scm>
+ <connection>scm:svn:http://svn.sonatype.org/spice/trunk/micromailer</connection>
+ <url>https://svn.sonatype.org/spice/trunk/micromailer</url>
+ <developerConnection>scm:svn:https://svn.sonatype.org/spice/trunk/micromailer</developerConnection>
+ </scm>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-47</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-47</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.3.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
- <!-- Mail composition -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-velocity</artifactId>
- <version>1.1.7</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- Mail composition -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.7</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
- <!-- Mail sending -->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
+ <!-- Mail sending -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.1</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
- <executions>
- <execution>
- <goals>
- <goal>child-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>child-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom b/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom
index 751ebaa..e453483 100644
--- a/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom
+++ b/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom
@@ -1,103 +1,103 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.sonatype.spice</groupId>
- <artifactId>spice-parent</artifactId>
- <version>11</version>
- <packaging>pom</packaging>
- <name>Sonatype Spice Components</name>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sonatype.spice</groupId>
+ <artifactId>spice-parent</artifactId>
+ <version>11</version>
+ <packaging>pom</packaging>
+ <name>Sonatype Spice Components</name>
- <scm>
- <connection>scm:svn:http://svn.sonatype.org/spice/trunk/spice-parent</connection>
- <url>https://svn.sonatype.org/spice/trunk/spice-parent</url>
- <developerConnection>scm:svn:https://svn.sonatype.org/spice/trunk/spice-parent</developerConnection>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.sonatype.org/spice/trunk/spice-parent</connection>
+ <url>https://svn.sonatype.org/spice/trunk/spice-parent</url>
+ <developerConnection>scm:svn:https://svn.sonatype.org/spice/trunk/spice-parent</developerConnection>
+ </scm>
- <properties>
+ <properties>
<!-- 2008.12.07 Oleg: reverted to 6.1.12 as http transport only works with that version
| Please always sync with mercury-http-transport !!
-->
- <jetty.version>6.1.12</jetty.version>
- </properties>
+ <jetty.version>6.1.12</jetty.version>
+ </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-beta-1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <version>1.0-beta-1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-beta-1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <version>1.0-beta-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
<scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>process-classes</id>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>process-classes</id>
+ <goals>
+ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
diff --git a/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
index d2ae6ea..1279e13 100644
--- a/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml
@@ -1,16 +1,16 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml b/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml
index 752852b..f43936a 100644
--- a/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml
@@ -1,9 +1,9 @@
<project>
- <parent>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>a</artifactId>
-</project>
\ No newline at end of file
+ <parent>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>a</artifactId>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
index b73bfce..c8d3bf7 100644
--- a/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml
@@ -1,17 +1,16 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>gid</groupId>
- <artifactId>aid</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-21</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-21</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
index f6ed4dd..eb68c97 100644
--- a/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml
@@ -1,20 +1,20 @@
<project>
- <parent>
- <groupId>gid</groupId>
- <artifactId>aid</artifactId>
- <version>1.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin2</artifactId>
- <version>1.0-alpha-21</version>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+ <parent>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin2</artifactId>
+ <version>1.0-alpha-21</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml
index bcdb05a..2636f03 100644
--- a/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml
@@ -1,25 +1,25 @@
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<groupId>gid</groupId>
<artifactId>aid</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-21</version>
- <dependencies>
- <dependency>
- <groupId>a</groupId>
- <artifactId>b</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-21</version>
+ <dependencies>
+ <dependency>
+ <groupId>a</groupId>
+ <artifactId>b</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
index 80f1013..d5c57da 100644
--- a/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- https://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
+ https://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>gid</groupId>
- <artifactId>aid</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins
- </groupId>
- <artifactId>maven-it-plugin-configuration
- </artifactId>
- <version>2.1-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins
+ </groupId>
+ <artifactId>maven-it-plugin-configuration
+ </artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
index a3af616..3e41665 100644
--- a/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
@@ -20,11 +20,11 @@ under the License.
-->
<project>
- <parent>
- <groupId>gid</groupId>
- <artifactId>aid</artifactId>
- <version>1.0</version>
- </parent>
+ <parent>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng4053</groupId>
@@ -61,4 +61,4 @@ under the License.
</plugins>
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml
index 477451d..28c96ab 100644
--- a/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml
+++ b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml
@@ -1,18 +1,18 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-21</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>1.0-alpha-21</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml
index 319e6ad..a87d669 100644
--- a/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml
@@ -1,17 +1,17 @@
<project>
- <parent>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>a</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+ <parent>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>a</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml
index 348dc21..a2ef18c 100644
--- a/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml
@@ -1,54 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- https://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
+ https://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.mng3900 </groupId>
- <artifactId>test</artifactId>
- <version>0.1</version>
- <packaging>jar</packaging>
+ <groupId>org.apache.maven.its.mng3900</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-3900</name>
- <description>
- Test that build properties defined via active profiles are used for
- interpolation.
+ <name>Maven Integration Test :: MNG-3900</name>
+ <description>
+ Test that build properties defined via active profiles are used for
+ interpolation.
</description>
- <!--
- These are some POM elements we would like to interpolate with
- properties from the profile.
- -->
- <url>https://maven.apache.org/${test}
- </url>
- <properties>
- <test>FAILED</test>
- <property>${test}</property>
- </properties>
+ <!--
+ These are some POM elements we would like to interpolate with
+ properties from the profile.
+ -->
+ <url>https://maven.apache.org/${test}
+ </url>
+ <properties>
+ <test>FAILED</test>
+ <property>${test}</property>
+ </properties>
- <profiles>
- <profile>
- <id>interpolation-profile</id>
- <!-- This profile defines the properties to use for interpolation. -->
- <properties>
- <test>PASSED</test>
- <test1>PASSED</test1>
- </properties>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>interpolation-profile</id>
+ <!-- This profile defines the properties to use for interpolation. -->
+ <properties>
+ <test>PASSED</test>
+ <test1>PASSED</test1>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml b/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml
index 799bb4c..54f1d5b 100644
--- a/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>test-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>test-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.maven.its</groupId>
<artifactId>test</artifactId>
diff --git a/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml
index 49df00a..c439214 100644
--- a/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml
@@ -1,6 +1,6 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>gid</groupId>
- <artifactId>aid</artifactId>
- <version>1.0</version>
-</project>
\ No newline at end of file
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>gid</groupId>
+ <artifactId>aid</artifactId>
+ <version>1.0</version>
+</project>
diff --git a/maven-core/src/test/resources-settings/settings-no-pom/pom.xml b/maven-core/src/test/resources-settings/settings-no-pom/pom.xml
index 3632d84..88a5988 100644
--- a/maven-core/src/test/resources-settings/settings-no-pom/pom.xml
+++ b/maven-core/src/test/resources-settings/settings-no-pom/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng3099</groupId>
- <artifactId>maven-mng3099-plugin</artifactId>
- <version>1</version>
- <packaging>maven-plugin</packaging>
-
- <name>maven-mng3099-plugin</name>
- <description>Tests properties injected as a result of active profiles in the user settings file.</description>
-</project>
\ No newline at end of file
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3099</groupId>
+ <artifactId>maven-mng3099-plugin</artifactId>
+ <version>1</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>maven-mng3099-plugin</name>
+ <description>Tests properties injected as a result of active profiles in the user settings file.</description>
+</project>
diff --git a/maven-core/src/test/resources-settings/settings-no-pom/settings.xml b/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
index 964e051..3407183 100644
--- a/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
+++ b/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings
- xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <profiles>
- <profile>
- <id>local-profile</id>
- <properties>
- <local-profile-prop>local-profile-prop-value</local-profile-prop>
- </properties>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>local-profile</activeProfile>
- </activeProfiles>
-
+ xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <profiles>
+ <profile>
+ <id>local-profile</id>
+ <properties>
+ <local-profile-prop>local-profile-prop-value</local-profile-prop>
+ </properties>
+ </profile>
+ </profiles>
+
+ <activeProfiles>
+ <activeProfile>local-profile</activeProfile>
+ </activeProfiles>
+
</settings>
diff --git a/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml b/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml
index 56bed2c..b2646e3 100644
--- a/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml
+++ b/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml
@@ -1,10 +1,9 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>grandchildtest</groupId>
- <artifactId>child</artifactId>
- <version>1</version>
- </parent>
- <artifactId>grandchild</artifactId>
-
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>grandchildtest</groupId>
+ <artifactId>child</artifactId>
+ <version>1</version>
+ </parent>
+ <artifactId>grandchild</artifactId>
</project>
diff --git a/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml b/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml
index 0858c6d..f347d75 100644
--- a/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml
+++ b/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml
@@ -1,12 +1,12 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>grandchildtest</groupId>
- <artifactId>root-pom</artifactId>
- <version>1</version>
- </parent>
- <artifactId>child</artifactId>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>grandchildtest</groupId>
+ <artifactId>root-pom</artifactId>
+ <version>1</version>
+ </parent>
+ <artifactId>child</artifactId>
+ <packaging>pom</packaging>
<modules>
<module>grandchild</module>
</modules>
diff --git a/maven-core/src/test/resources/projects/grandchild-check/pom.xml b/maven-core/src/test/resources/projects/grandchild-check/pom.xml
index 3b1ebd0..5393ffc 100644
--- a/maven-core/src/test/resources/projects/grandchild-check/pom.xml
+++ b/maven-core/src/test/resources/projects/grandchild-check/pom.xml
@@ -1,7 +1,7 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>grandchildtest</groupId>
- <artifactId>root-pom</artifactId>
- <version>1</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>grandchildtest</groupId>
+ <artifactId>root-pom</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
</project>
diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-version-expression/pom.xml b/maven-core/src/test/resources/projects/parent-version-range-local-child-version-expression/pom.xml
index a82bbf2..858cf1c 100644
--- a/maven-core/src/test/resources/projects/parent-version-range-local-child-version-expression/pom.xml
+++ b/maven-core/src/test/resources/projects/parent-version-range-local-child-version-expression/pom.xml
@@ -1,7 +1,7 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>parent-version-range-local</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>parent-version-range-local</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
</project>
diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml b/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml
index a82bbf2..858cf1c 100644
--- a/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml
+++ b/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml
@@ -1,7 +1,7 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>parent-version-range-local</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>parent-version-range-local</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
</project>
diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml b/maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml
index a82bbf2..858cf1c 100644
--- a/maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml
+++ b/maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml
@@ -1,7 +1,7 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>parent-version-range-local</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>parent-version-range-local</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
</project>
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index 25abf0f..2b1eed8 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -192,7 +192,7 @@ public class DefaultInheritanceAssemblerTest
public void testWithEmptyUrl()
throws IOException
{
- testInheritance( "empty-urls", false );
+ testInheritance( "empty-urls", false );
}
public void testInheritance( String baseName )
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml
index 3b9034a..8276c94 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml
@@ -18,14 +18,14 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-sha1plus</artifactId>
- <version>${sha1}${wrong}</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-sha1plus</artifactId>
+ <version>${sha1}${wrong}</version>
- <description>
- This will test if the validation for the ci friendly versions
- is working correct.
- </description>
+ <description>
+ This will test if the validation for the ci friendly versions
+ is working correct.
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml
index 182f69e..247b326 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml
@@ -18,14 +18,14 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-sha1plus</artifactId>
- <version>${sha1}${wrong}${revision}</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-sha1plus</artifactId>
+ <version>${sha1}${wrong}${revision}</version>
- <description>
- This will test if the validation for the ci friendly versions
- is working correct.
- </description>
+ <description>
+ This will test if the validation for the ci friendly versions
+ is working correct.
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml
index 6131ca9..0ef3def 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml
@@ -18,14 +18,14 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-wrong</artifactId>
- <version>${wrong}</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-wrong</artifactId>
+ <version>${wrong}</version>
- <description>
- This will test if the validation for the ci friendly versions
- is working correct.
- </description>
+ <description>
+ This will test if the validation for the ci friendly versions
+ is working correct.
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml
index ead458d..5782f99 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml
@@ -18,20 +18,20 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.example.group</groupId>
- <artifactId>com-parent</artifactId>
- <version>LATEST</version>
- </parent>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-wrong</artifactId>
- <version>1.0</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <description>
- This will test if the validation for the parent version
- is working correct in case of usage of LATEST
- </description>
+ <parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>com-parent</artifactId>
+ <version>LATEST</version>
+ </parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-wrong</artifactId>
+ <version>1.0</version>
+
+ <description>
+ This will test if the validation for the parent version
+ is working correct in case of usage of LATEST
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml
index 0a0fe3c..13cd42a 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml
@@ -18,20 +18,20 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.example.group</groupId>
- <artifactId>com-parent</artifactId>
- <version>RELEASE</version>
- </parent>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-wrong</artifactId>
- <version>1.0</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <description>
- This will test if the validation for the parent version
- is working correct in case of usage of RELEASE
- </description>
+ <parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>com-parent</artifactId>
+ <version>RELEASE</version>
+ </parent>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-wrong</artifactId>
+ <version>1.0</version>
+
+ <description>
+ This will test if the validation for the parent version
+ is working correct in case of usage of RELEASE
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml
index d796ead..3eefb15 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml
@@ -18,14 +18,14 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-sha1</artifactId>
- <version>${revision}${changelist}${sha1}</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-sha1</artifactId>
+ <version>${revision}${changelist}${sha1}</version>
- <description>
- This will test if the validation for the ci friendly versions
- is working correct.
- </description>
+ <description>
+ This will test if the validation for the ci friendly versions
+ is working correct.
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml
index f5aa3d6..56fda9a 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml
@@ -18,14 +18,14 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-changelist</artifactId>
- <version>${changelist}</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-changelist</artifactId>
+ <version>${changelist}</version>
- <description>
- This will test if the validation for the ci friendly versions
- is working correct.
- </description>
+ <description>
+ This will test if the validation for the ci friendly versions
+ is working correct.
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml
index e3e73fc..5b0c73f 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml
@@ -18,14 +18,14 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-revision</artifactId>
- <version>${revision}</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-revision</artifactId>
+ <version>${revision}</version>
- <description>
- This will test if the validation for the ci friendly versions
- is working correct.
- </description>
+ <description>
+ This will test if the validation for the ci friendly versions
+ is working correct.
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml
index 4ef6b49..d1bc42f 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml
@@ -18,14 +18,14 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>valid-version-sha1</artifactId>
- <version>${sha1}</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>valid-version-sha1</artifactId>
+ <version>${sha1}</version>
- <description>
- This will test if the validation for the ci friendly versions
- is working correct. This c
- </description>
+ <description>
+ This will test if the validation for the ci friendly versions
+ is working correct.
+ </description>
</project>
diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml
index de0ac3a..d65cbc2 100644
--- a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml
@@ -18,21 +18,21 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example.group</groupId>
- <artifactId>testinvalidpom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.group</groupId>
+ <artifactId>testinvalidpom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
- <description>
- This will test if the module validator recognized that this
- dependency is the same as the module itself.
- </description>
- <dependencies>
- <dependency>
- <groupId>com.example.group</groupId>
- <artifactId>testinvalidpom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <description>
+ This will test if the module validator recognized that this
+ dependency is the same as the module itself.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>com.example.group</groupId>
+ <artifactId>testinvalidpom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java
index 0306b94..fac2b79 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/ModulesXMLFilterTest.java
@@ -28,56 +28,56 @@ import org.xml.sax.ext.LexicalHandler;
public class ModulesXMLFilterTest extends AbstractXMLFilterTests {
- @Override
- protected ModulesXMLFilter getFilter( Consumer<LexicalHandler> lexicalHandlerConsumer )
- {
- ModulesXMLFilter filter = new ModulesXMLFilter();
- lexicalHandlerConsumer.accept( filter );
- return filter;
- }
-
- @Test
- public void emptyModules() throws Exception {
- String input = "<project><modules/></project>";
+ @Override
+ protected ModulesXMLFilter getFilter( Consumer<LexicalHandler> lexicalHandlerConsumer )
+ {
+ ModulesXMLFilter filter = new ModulesXMLFilter();
+ lexicalHandlerConsumer.accept( filter );
+ return filter;
+ }
+
+ @Test
+ public void emptyModules() throws Exception {
+ String input = "<project><modules/></project>";
+ String expected = "<project/>";
+ String actual = transform( input );
+ assertThat( actual ).and( expected ).areIdentical();
+ }
+
+ @Test
+ public void setOfModules() throws Exception {
+ String input = "<project><modules>"
+ + "<module>ab</module>"
+ + "<module>../cd</module>"
+ + "</modules></project>";
String expected = "<project/>";
String actual = transform( input );
assertThat( actual ).and( expected ).areIdentical();
- }
+ }
- @Test
- public void setOfModules() throws Exception {
- String input = "<project><modules>"
- + "<module>ab</module>"
- + "<module>../cd</module>"
- + "</modules></project>";
- String expected = "<project/>";
- String actual = transform( input );
- assertThat( actual ).and( expected ).areIdentical();
- }
-
- @Test
+ @Test
public void noModules() throws Exception {
String input = "<project><name>NAME</name></project>";
String expected = input;
String actual = transform( input );
assertThat( actual ).and( expected ).areIdentical();
}
-
- @Test
- public void comment() throws Exception {
-
- String input = "<project><!--before--><modules>"
+
+ @Test
+ public void comment() throws Exception {
+
+ String input = "<project><!--before--><modules>"
+ "<!--pre-in-->"
- + "<module><!--in-->ab</module>"
- + "<module>../cd</module>"
+ + "<module><!--in-->ab</module>"
+ + "<module>../cd</module>"
+ "<!--post-in-->"
- + "</modules>"
- + "<!--after--></project>";
- String expected = "<project><!--before--><!--after--></project>";
- String actual = transform( input );
- assertThat( actual ).and( expected ).areIdentical();
- }
-
+ + "</modules>"
+ + "<!--after--></project>";
+ String expected = "<project><!--before--><!--after--></project>";
+ String actual = transform( input );
+ assertThat( actual ).and( expected ).areIdentical();
+ }
+
@Test
public void setOfModulesLF() throws Exception {
String input = "<project>\n"
@@ -95,5 +95,5 @@ public class ModulesXMLFilterTest extends AbstractXMLFilterTests {
+ "</project>\n";
String actual = transform( input );
assertThat( actual ).and( expected ).areIdentical();
- }
+ }
}