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/22 11:19:33 UTC
[maven-integration-testing] 02/03: WS
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6957_squashed
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 5aa77cc040c955a602c85bfc8a519ebdcb862897
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Dec 22 12:14:42 2020 +0100
WS
---
.../maven/it/MavenITmng5576CdFriendlyVersions.java | 10 +++++-----
.../MavenITmng5895CIFriendlyUsageWithPropertyTest.java | 18 +++++++++---------
.../apache/maven/it/MavenITmng6090CIFriendlyTest.java | 16 ++++++++--------
.../apache/maven/it/MavenITmng6957BuildConsumer.java | 14 +++++++-------
.../mng-6957-buildconsumer/expected/parent.pom | 3 +--
.../mng-6957-buildconsumer/expected/simple-parent.pom | 5 +----
.../mng-6957-buildconsumer/expected/simple-weather.pom | 5 ++---
.../mng-6957-buildconsumer/expected/utils-parent.pom | 2 +-
.../mng-6957-buildconsumer/simple-parent/pom.xml | 5 ++---
.../simple-parent/simple-testutils/pom.xml | 2 +-
.../simple-parent/simple-weather/pom.xml | 5 ++---
.../simple-parent/simple-webapp/pom.xml | 2 +-
.../simple-parent/utils-parent/pom.xml | 2 +-
13 files changed, 41 insertions(+), 48 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
index d68d79d..2104187 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java
@@ -28,7 +28,7 @@ import java.util.Properties;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-5576">MNG-5576</a>.
- *
+ *
* @author Jason van Zyl
*/
public class MavenITmng5576CdFriendlyVersions
@@ -51,7 +51,7 @@ public class MavenITmng5576CdFriendlyVersions
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.addCliOption( "-Dchangelist=changelist" );
+ verifier.addCliOption( "-Dchangelist=changelist" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -59,7 +59,7 @@ public class MavenITmng5576CdFriendlyVersions
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "1.0.0.changelist", props.getProperty( "project.version" ) );
-
+
List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
for( String line : lines )
{
@@ -80,7 +80,7 @@ public class MavenITmng5576CdFriendlyVersions
verifier.setLogFileName( "log-bc.txt" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.addCliOption( "-Dchangelist=changelist" );
+ verifier.addCliOption( "-Dchangelist=changelist" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -88,7 +88,7 @@ public class MavenITmng5576CdFriendlyVersions
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( "1.0.0.changelist", props.getProperty( "project.version" ) );
-
+
List<String> lines = verifier.loadFile( new File( testDir, "log-bc.txt" ), false );
for( String line : lines )
{
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
index 5d0db85..df4587b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java
@@ -25,12 +25,12 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
/**
- * The usage of a <code>${revision}</code> for the version in the pom file and furthermore
+ * The usage of a <code>${revision}</code> for the version in the pom file and furthermore
* defining the property in the pom file and overwrite it via command line.
* <a href="https://issues.apache.org/jira/browse/MNG-5895">MNG-5895</a>.
- *
+ *
* This will result in a failure without the fix for this issue.
- *
+ *
* @author Karl Heinz Marbaise khmarbaise@apache.org
*/
public class MavenITmng5895CIFriendlyUsageWithPropertyTest
@@ -45,9 +45,9 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest
}
/**
- * Check that the resulting run will not fail in case
+ * Check that the resulting run will not fail in case
* of defining the property via command line which is
- * already defined inside the pom.
+ * already defined inside the pom.
*/
public void testitShouldResolveTheDependenciesWithoutBuildConsumer()
throws Exception
@@ -72,11 +72,11 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5895-ci-friendly-usage-with-property" );
-
+
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setMavenDebug( false );
verifier.setAutoclean( false );
-
+
verifier.setLogFileName( "log-bc.txt" );
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
@@ -84,7 +84,7 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
+
}
-
+
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
index e9d3abe..9d72eba 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
@@ -26,11 +26,11 @@ import java.io.File;
import java.util.Arrays;
/**
- * The usage of a <code>${revision}</code> for the version in the pom file and furthermore
+ * The usage of a <code>${revision}</code> for the version in the pom file and furthermore
* defining the property in the pom file and overwrite it via command line and
* try to build a partial reactor via <code>mvn -pl ..</code>
* <a href="https://issues.apache.org/jira/browse/MNG-6090">MNG-6090</a>.
- *
+ *
* @author Karl Heinz Marbaise khmarbaise@apache.org
*/
public class MavenITmng6090CIFriendlyTest
@@ -45,7 +45,7 @@ public class MavenITmng6090CIFriendlyTest
}
/**
- * Check that the resulting run will not fail in case
+ * Check that the resulting run will not fail in case
* of defining the property via command line and
* install the projects and afterwards just build
* a part of the whole reactor.
@@ -58,7 +58,7 @@ public class MavenITmng6090CIFriendlyTest
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setMavenDebug( false );
verifier.setAutoclean( false );
-
+
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
verifier.setLogFileName( "install-log.txt" );
@@ -81,22 +81,22 @@ public class MavenITmng6090CIFriendlyTest
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6090-ci-friendly" );
-
+
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setMavenDebug( false );
verifier.setAutoclean( false );
-
+
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
verifier.setLogFileName( "install-log.txt" );
verifier.executeGoals( Arrays.asList( "clean", "install" ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
+
verifier = newVerifier( testDir.getAbsolutePath(), false );
verifier.setMavenDebug( false );
verifier.setAutoclean( false );
-
+
verifier.addCliOption( "-Drevision=1.2" );
verifier.addCliOption( "-pl module-3" );
verifier.executeGoal( "package" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
index 147edb4..6486d45 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
* <li>parents can omit the version if the relative path points to the correct parent</li>
* <li>dependencies can omit the version if it is part of the reactor</li>
* </ul>
- *
+ *
* During install the POM will be cleaned up
* <ul>
* <li>the modules will be removed</li>
@@ -75,22 +75,22 @@ public class MavenITmng6957BuildConsumer
verifier.verifyErrorFreeLog();
String content;
- content = FileUtils.fileRead( new File( testDir, "expected/parent.pom") );
+ content = FileUtils.fileRead( new File( testDir, "expected/parent.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/simple-parent.pom") );
+ content = FileUtils.fileRead( new File( testDir, "expected/simple-parent.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/simple-weather.pom") );
+ content = FileUtils.fileRead( new File( testDir, "expected/simple-weather.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/simple-webapp.pom") );
+ content = FileUtils.fileRead( new File( testDir, "expected/simple-webapp.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/simple-testutils.pom") );
+ content = FileUtils.fileRead( new File( testDir, "expected/simple-testutils.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom", content );
- content = FileUtils.fileRead( new File( testDir, "expected/utils-parent.pom") );
+ content = FileUtils.fileRead( new File( testDir, "expected/utils-parent.pom") );
verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
}
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent.pom
index bfe5879..1c7f332 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent.pom
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent.pom
@@ -24,5 +24,4 @@ under the License.
<name>Multi Chapter Parent Project</name>
<!-- Optimized from https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
-
-</project>
\ No newline at end of file
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom
index 843f219..77743bb 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom
@@ -25,8 +25,6 @@ under the License.
<artifactId>simple-parent</artifactId>
<packaging>pom</packaging>
<name>Multi Chapter Simple Parent Project</name>
-
-
<build>
<pluginManagement>
@@ -39,5 +37,4 @@ under the License.
</plugins>
</pluginManagement>
</build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
index 9d75f1d..8b9493e 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
@@ -26,7 +26,7 @@ under the License.
<packaging>jar</packaging>
<name>Multi Chapter Simple Weather API</name>
-
+
<dependencies>
<dependency>
<groupId>org.sonatype.mavenbook.multi</groupId>
@@ -35,5 +35,4 @@ under the License.
<version>0.9-MNG6957-SNAPSHOT</version>
</dependency>
</dependencies>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom
index 934ac75..2cf5f2d 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom
@@ -24,4 +24,4 @@ under the License.
</parent>
<artifactId>utils-parent</artifactId>
<packaging>pom</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
index fb098e0..0eb3351 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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>
@@ -30,7 +30,7 @@ under the License.
<artifactId>simple-parent</artifactId>
<packaging>pom</packaging>
<name>Multi Chapter Simple Parent Project</name>
-
+
<modules>
<module>simple-weather</module>
<module>simple-webapp</module>
@@ -52,5 +52,4 @@ under the License.
</plugins>
</pluginManagement>
</build>
-
</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
index b9b32a4..3fab2e6 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
index 4a1873c..863f22b 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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>
@@ -31,7 +31,7 @@ under the License.
<packaging>jar</packaging>
<name>Multi Chapter Simple Weather API</name>
-
+
<dependencies>
<dependency>
<groupId>org.sonatype.mavenbook.multi</groupId>
@@ -39,5 +39,4 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
index 9e18a21..b1068b7 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
index deb03d6..d1d0c6e 100644
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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>