Skip to content

Commit

Permalink
Replace tabs with proper count of spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-o
michael-o committed Dec 24, 2020
1 parent 673a7d1 commit 8eda091
Show file tree
Hide file tree
Showing 52 changed files with 900 additions and 903 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
12 changes: 6 additions & 6 deletions apache-maven/src/assembly/wrapper/script/download.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%
)
Expand Down
2 changes: 1 addition & 1 deletion apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (&quot;Content&quot;). Unless otherwise
Expand Down
2 changes: 1 addition & 1 deletion ...compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ProjectInheritanceTest
// or we can show it graphically as:
//
// p1 ---> p0 --> super model
//
//
// ----------------------------------------------------------------------

/**
Expand Down
4 changes: 2 additions & 2 deletions ...compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class ProjectInheritanceTest
// or we can show it graphically as:
//
// p1 ---> p0 --> super model
//
//
// ----------------------------------------------------------------------

public void testDependencyManagementOverridesTransitiveDependencyVersion()
Expand Down Expand Up @@ -91,4 +91,4 @@ public void testDependencyManagementOverridesTransitiveDependencyVersion()
assertTrue("Incorrect scope for " + c.getDependencyConflictId(), c.getScope().equals("runtime"));

}
}
}
124 changes: 62 additions & 62 deletions ...rc/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,87 +33,87 @@
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() );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
Expand Down
38 changes: 19 additions & 19 deletions ...t/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,31 @@
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() );
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 8eda091

Please sign in to comment.