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 2018/12/26 14:22:01 UTC
[maven-integration-testing] 02/02: [MNG-5965] Parallel build
multiplies work if multiple goals are given
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-5965
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 2819749ce85b446f6199b12f0fb6ccd1511ac9cf
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Dec 26 15:21:26 2018 +0100
[MNG-5965] Parallel build multiplies work if multiple goals are given
This closes #22
---
.../maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java | 8 ++++----
.../mng-5965-parallel-build-multiplies-work/module-1/pom.xml | 8 ++++++--
.../mng-5965-parallel-build-multiplies-work/module-2/pom.xml | 8 ++++++--
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
index 784b302..508b9c7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
@@ -3,7 +3,7 @@ package org.apache.maven.it;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -17,7 +17,7 @@ public class MavenITmng5965ParallelBuildMultipliesWorkTest
{
public MavenITmng5965ParallelBuildMultipliesWorkTest()
{
- super( "[3.5.1,)" );
+ super( "[3.0,)" );
}
public void testItShouldOnlyRunEachTaskOnce()
@@ -31,7 +31,7 @@ public class MavenITmng5965ParallelBuildMultipliesWorkTest
verifier.setAutoclean( false );
verifier.setLogFileName( "log-only.txt" );
- verifier.addCliOption( "-T10" );
+ verifier.addCliOption( "-T1" );
// include an aggregator task so that the two goals end up in different task segments
verifier.executeGoals( Arrays.asList( "clean", "install:help" ) );
verifier.verifyErrorFreeLog();
@@ -51,7 +51,7 @@ public class MavenITmng5965ParallelBuildMultipliesWorkTest
private void assertNoRepeatedLines( List<String> logLines )
throws VerificationException
{
- Set<String> uniqueLines = new HashSet<>();
+ Set<String> uniqueLines = new LinkedHashSet<>();
for ( String line : logLines )
{
if ( uniqueLines.contains( line ) )
diff --git a/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-1/pom.xml b/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-1/pom.xml
index ec9aacd..5c64b41 100644
--- a/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-1/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-1/pom.xml
@@ -23,8 +23,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>mng-5965-parallel-build-multiplies-work</groupId>
+ <parent>
+ <groupId>mng-5965-parallel-build-multiplies-work</groupId>
+ <artifactId>base-project</artifactId>
+ <version>0.1</version>
+ </parent>
+
<artifactId>module-1</artifactId>
- <version>0.1</version>
<packaging>pom</packaging>
</project>
diff --git a/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-2/pom.xml b/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-2/pom.xml
index 1504e6a..c4637ce 100644
--- a/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-2/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5965-parallel-build-multiplies-work/module-2/pom.xml
@@ -23,8 +23,12 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>mng-5965-parallel-build-multiplies-work</groupId>
+ <parent>
+ <groupId>mng-5965-parallel-build-multiplies-work</groupId>
+ <artifactId>base-project</artifactId>
+ <version>0.1</version>
+ </parent>
+
<artifactId>module-2</artifactId>
- <version>0.1</version>
<packaging>pom</packaging>
</project>