You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/03/28 10:23:36 UTC
[maven-integration-testing] branch MNG-4660 created (now e74bd48)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
at e74bd48 Revert unrelated change
This branch includes the following new commits:
new 7b21861 Add integration test to show that --resume-from works
new 616f86f Change order of modules in POM
new f513c6a Introduce a compile-time dependency from module B to A
new a458cf1 Rename test method so it's more descriptive
new 8a0c5e0 No longer necessary to first install the whole project locally
new a58549d Only run test for Maven 3.7.0-SNAPSHOT and up
new 432e07d Remove TODO
new 5797693 Formatting
new 4a09d93 Corrected the Maven version to be 3.7.0 instead of -SNAPSHOT.
new faa839f Reverted the change in the other integration test
new be403db Putting our integration test on top of the list, to order the tests from new to old (and not alphabetically on ticket number)
new b14a4d7 Run test twice, once with packaged and once without packaged artifact
new 740bd17 Test case for checking whether a packaged artifact is up to date with the compiled artifact
new c61a262 Remove System.err.println invocations
new 93e8b68 Rename method so it better describes the test
new e74bd48 Revert unrelated change
The 16 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-integration-testing] 10/16: Reverted the change in the other
integration test
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit faa839f69a2d81436101031516a96b24e8ece19d
Author: Martin Kanters <Ma...@ing.com>
AuthorDate: Sat Feb 22 10:07:18 2020 -0500
Reverted the change in the other integration test
---
.../src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 d561ef5..c1abf34 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
@@ -60,7 +60,7 @@ public class MavenITmng6090CIFriendlyTest
verifier.addCliOption( "-Drevision=1.2" );
verifier.setLogFileName( "install-log.txt" );
- verifier.executeGoal( "verify" );
+ verifier.executeGoals( Arrays.asList( "clean", "install" ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
[maven-integration-testing] 08/16: Formatting
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 5797693fc01b1cc3223777c2fd8a6e567a42f1ac
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Feb 14 15:18:43 2020 +0100
Formatting
---
.../src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index a1c6ec1..a30febf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -49,7 +49,7 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
try
{
- verifier1.executeGoal("verify");
+ verifier1.executeGoal( "verify" );
fail( "Expected this invocation to fail" ); // See TestCase.java
}
catch ( final VerificationException ve )
[maven-integration-testing] 01/16: Add integration test to show
that --resume-from works
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 7b21861028274a0d3b735d67f2b6c10971d56332
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Wed Jan 29 11:20:35 2020 +0100
Add integration test to show that --resume-from works
---
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
.../maven/it/MavenITmng4660ResumeFromTest.java | 74 ++++++++++++++++++++++
.../mng-4660-resume-from/module-a/pom.xml | 36 +++++++++++
.../mng-4660-resume-from/module-b/pom.xml | 44 +++++++++++++
.../test/java/org/apache/maven/it/TestCase.java | 33 ++++++++++
.../test/resources/mng-4660-resume-from/pom.xml | 62 ++++++++++++++++++
6 files changed, 250 insertions(+)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 87b948e..d54ba20 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -232,6 +232,7 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenITmng4679SnapshotUpdateInPluginTest.class );
suite.addTestSuite( MavenITmng4677DisabledPluginConfigInheritanceTest.class );
suite.addTestSuite( MavenITmng4666CoreRealmImportTest.class );
+ suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
suite.addTestSuite( MavenITmng4654ArtifactHandlerForMainArtifactTest.class );
suite.addTestSuite( MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.class );
// suite.addTestSuite( MavenITmng4633DualCompilerExecutionsWeaveModeTest.class );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
new file mode 100644
index 0000000..c1cbf66
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -0,0 +1,74 @@
+package org.apache.maven.it;
+
+/*
+ * 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
+ *
+ * http://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.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test case for <a href="https://issues.apache.org/jira/browse/MNG-4660">MNG-4660</a>.
+ *
+ * @author Maarten Mulders
+ * @author Martin Kanters
+ */
+public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCase {
+ public MavenITmng4660ResumeFromTest()
+ {
+ // TODO Update version range once bug has been fixed!
+ super( "[3.6.3,)" );
+ }
+
+ /**
+ * Test that the --resume-from flag resolves dependencies inside the same Maven project
+ * without having them installed first.
+ */
+ public void testIt() throws Exception
+ {
+ final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-resume-from" );
+
+ final Verifier verifier1 = newVerifier( testDir.getAbsolutePath() );
+ verifier1.deleteDirectory( "target" );
+ verifier1.deleteArtifacts( "org.apache.maven.its.mng4660" );
+
+ try
+ {
+ verifier1.executeGoal("verify");
+ fail( "Expected this invocation to fail" ); // See TestCase.java
+ }
+ catch ( final VerificationException ve )
+ {
+ verifier1.verifyTextInLog( "Deliberately fail test case" );
+ }
+ finally
+ {
+ verifier1.resetStreams();
+ }
+
+ final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
+ verifier2.setAutoclean( false );
+ verifier2.addCliOption( "--resume-from" );
+ verifier2.addCliOption( ":module-b" );
+ verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
+
+ verifier2.verifyErrorFreeLog();
+ verifier2.resetStreams();
+ }
+}
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml b/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml
new file mode 100644
index 0000000..f6e2caa
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml
@@ -0,0 +1,36 @@
+<?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
+
+ http://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 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 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>module-a</artifactId>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml
new file mode 100644
index 0000000..e00e63b
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml
@@ -0,0 +1,44 @@
+<?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
+
+ http://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 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 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>module-b</artifactId>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>module-a</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
new file mode 100644
index 0000000..0fe241b
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
@@ -0,0 +1,33 @@
+package org.apache.maven.it;
+
+/*
+ * 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
+ *
+ * http://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.
+ */
+
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+
+public class TestCase
+{
+ @Test
+ public void testCase()
+ {
+ fail( "Deliberately fail test case" );
+ }
+}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml b/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml
new file mode 100644
index 0000000..5fa0e49
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml
@@ -0,0 +1,62 @@
+<?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
+
+ http://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 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 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ </properties>
+
+ <modules>
+ <module>module-a</module>
+ <module>module-b</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
[maven-integration-testing] 13/16: Test case for checking whether a
packaged artifact is up to date with the compiled artifact
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 740bd17e87bb666f5c41eb7c9d457712d7763483
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Thu Mar 26 14:02:42 2020 +0100
Test case for checking whether a packaged artifact is up to date with the compiled artifact
---
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 91 ++++++++++++++++++++++
.../module-a/pom.xml | 36 +++++++++
.../src/main/java/org/apache/maven/it/Example.java | 24 ++++++
.../module-b/pom.xml | 44 +++++++++++
.../java/org/apache/maven/it/AnotherExample.java | 28 +++++++
.../test/java/org/apache/maven/it/TestCase.java | 31 ++++++++
.../mng-4660-outdated-packaged-artifact/pom.xml | 62 +++++++++++++++
.../java/org/apache/maven/it/AnotherExample.java | 28 +++++++
9 files changed, 345 insertions(+)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index fbb2ba1..48749e2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -108,6 +108,7 @@ public class IntegrationTestSuite
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
+ suite.addTestSuite( MavenITmng4660OutdatedPackagedArtifact.class );
suite.addTestSuite( MavenITmng5669ReadPomsOnce.class );
suite.addTestSuite( MavenITmng6071GetResourceWithCustomPom.class );
suite.addTestSuite( MavenITmng6759TransitiveDependencyRepositoriesTest.class );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
new file mode 100644
index 0000000..289a357
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
@@ -0,0 +1,91 @@
+package org.apache.maven.it;
+
+/*
+ * 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
+ *
+ * http://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.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.shared.utils.io.FileUtils;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * This is a test case for a new check introduced with <a href="https://issues.apache.org/jira/browse/MNG-4660">MNG-4660</a>.
+ * That check verifies if a packaged artifact within the Reactor is up-to-date with the outputDirectory of the same project.
+ *
+ * @author Maarten Mulders
+ * @author Martin Kanters
+ */
+public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegrationTestCase {
+ public MavenITmng4660OutdatedPackagedArtifact()
+ {
+ super( "[3.7.0,)" );
+ }
+
+ /**
+ * Test that Maven logs a warning when a packaged artifact is found that is older than the outputDirectory of the
+ * same artifact.
+ */
+ public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception
+ {
+ final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-outdated-packaged-artifact" );
+
+ // 1. Package the whole project
+ final Verifier verifier1 = newVerifier( testDir.getAbsolutePath() );
+ verifier1.deleteDirectory( "target" );
+ verifier1.deleteArtifacts( "org.apache.maven.its.mng4660" );
+
+ verifier1.executeGoal( "package" );
+
+ verifier1.verifyErrorFreeLog();
+ verifier1.resetStreams();
+
+
+ // 2. Create a properties file with some content and compile only that module (module A).
+ final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
+
+ final Path resourcesDirectory = Files.createDirectories( Paths.get( testDir.toString(), "module-a", "src", "main", "resources" ) );
+ System.err.println( "Created directory " + resourcesDirectory.toAbsolutePath().toString() );
+ final Path fileToWrite = resourcesDirectory.resolve( "example.properties" );
+ FileUtils.fileWrite( fileToWrite.toString(), "x=42" );
+ System.err.println( "Wrote file " + fileToWrite.toAbsolutePath().toString() );
+
+ verifier2.setAutoclean( false );
+ verifier2.addCliOption( "--projects" );
+ verifier2.addCliOption( ":module-a" );
+ verifier2.executeGoal( "compile" );
+
+ verifier2.verifyErrorFreeLog();
+ verifier2.resetStreams();
+
+ // 3. Resume project build from module B, that depends on module A we just touched. Its packaged artifact
+ // is no longer in sync with its compiled artifacts.
+ final Verifier verifier3 = newVerifier( testDir.getAbsolutePath() );
+ verifier3.setAutoclean( false );
+ verifier3.addCliOption( "--resume-from" );
+ verifier3.addCliOption( ":module-b" );
+ verifier3.executeGoal( "compile" );
+
+ verifier3.verifyErrorFreeLog();
+ verifier3.verifyTextInLog( "Packaged artifact is not up-to-date" );
+ verifier3.resetStreams();
+ }
+}
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml
new file mode 100644
index 0000000..f6e2caa
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml
@@ -0,0 +1,36 @@
+<?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
+
+ http://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 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 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>module-a</artifactId>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java
new file mode 100644
index 0000000..1608aba
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java
@@ -0,0 +1,24 @@
+package org.apache.maven.it;
+
+/*
+ * 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
+ *
+ * http://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.
+ */
+
+public class Example
+{
+}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml
new file mode 100644
index 0000000..e00e63b
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml
@@ -0,0 +1,44 @@
+<?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
+
+ http://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 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 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>module-b</artifactId>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>module-a</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
new file mode 100644
index 0000000..20ab187
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
@@ -0,0 +1,28 @@
+package org.apache.maven.it;
+
+/*
+ * 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
+ *
+ * http://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.
+ */
+
+public class AnotherExample
+{
+ public AnotherExample()
+ {
+ new Example();
+ }
+}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java
new file mode 100644
index 0000000..74a4579
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java
@@ -0,0 +1,31 @@
+package org.apache.maven.it;
+
+/*
+ * 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
+ *
+ * http://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.
+ */
+
+import org.junit.Test;
+
+public class TestCase
+{
+ @Test
+ public void testCase()
+ {
+ final Example example = new Example();
+ }
+}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml
new file mode 100644
index 0000000..a2d0bcd
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml
@@ -0,0 +1,62 @@
+<?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
+
+ http://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 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 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4660</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ </properties>
+
+ <modules>
+ <module>module-b</module>
+ <module>module-a</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
new file mode 100644
index 0000000..20ab187
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
@@ -0,0 +1,28 @@
+package org.apache.maven.it;
+
+/*
+ * 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
+ *
+ * http://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.
+ */
+
+public class AnotherExample
+{
+ public AnotherExample()
+ {
+ new Example();
+ }
+}
\ No newline at end of file
[maven-integration-testing] 07/16: Remove TODO
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 432e07db85b40a046fece7e9a83423f3799262d0
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Feb 14 13:29:59 2020 +0100
Remove TODO
---
.../src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index 6a1788a..a1c6ec1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -32,7 +32,6 @@ import java.io.File;
public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCase {
public MavenITmng4660ResumeFromTest()
{
- // TODO Update version range once bug has been fixed!
super( "[3.7.0-SNAPSHOT,)" );
}
[maven-integration-testing] 06/16: Only run test for Maven
3.7.0-SNAPSHOT and up
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit a58549d6463a11b91f6159f03454f9c3d05dc5a2
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Feb 14 13:29:38 2020 +0100
Only run test for Maven 3.7.0-SNAPSHOT and up
---
.../src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index 7405cac..6a1788a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -33,7 +33,7 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
public MavenITmng4660ResumeFromTest()
{
// TODO Update version range once bug has been fixed!
- super( "[3.6.3,)" );
+ super( "[3.7.0-SNAPSHOT,)" );
}
/**
[maven-integration-testing] 04/16: Rename test method so it's more
descriptive
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit a458cf1b1434cbc00597b14d79b990aa43d579b0
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Feb 14 12:05:03 2020 +0100
Rename test method so it's more descriptive
---
.../src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index c1cbf66..7405cac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -40,7 +40,7 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
* Test that the --resume-from flag resolves dependencies inside the same Maven project
* without having them installed first.
*/
- public void testIt() throws Exception
+ public void testShouldResolveDependenciesFromEarlierBuild() throws Exception
{
final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-resume-from" );
[maven-integration-testing] 11/16: Putting our integration test on
top of the list,
to order the tests from new to old (and not alphabetically on ticket number)
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit be403dba6c8db9612079c059e6aaf28056210e80
Author: Martin Kanters <Ma...@ing.com>
AuthorDate: Mon Mar 9 09:34:58 2020 +0100
Putting our integration test on top of the list, to order the tests from new to old (and not alphabetically on ticket number)
---
.../src/test/java/org/apache/maven/it/IntegrationTestSuite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index d54ba20..fbb2ba1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -107,6 +107,7 @@ public class IntegrationTestSuite
// -------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+ suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
suite.addTestSuite( MavenITmng5669ReadPomsOnce.class );
suite.addTestSuite( MavenITmng6071GetResourceWithCustomPom.class );
suite.addTestSuite( MavenITmng6759TransitiveDependencyRepositoriesTest.class );
@@ -232,7 +233,6 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenITmng4679SnapshotUpdateInPluginTest.class );
suite.addTestSuite( MavenITmng4677DisabledPluginConfigInheritanceTest.class );
suite.addTestSuite( MavenITmng4666CoreRealmImportTest.class );
- suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
suite.addTestSuite( MavenITmng4654ArtifactHandlerForMainArtifactTest.class );
suite.addTestSuite( MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.class );
// suite.addTestSuite( MavenITmng4633DualCompilerExecutionsWeaveModeTest.class );
[maven-integration-testing] 15/16: Rename method so it better
describes the test
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 93e8b6840637d81536ebbff20a5995aad9da9ad8
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Mar 27 11:04:31 2020 +0100
Rename method so it better describes the test
Also update the Javadoc a bit to better explain what the
scenario is in this case.
---
.../test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index 6d2b471..b223812 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -38,9 +38,10 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
/**
* Test that the --resume-from flag resolves dependencies inside the same Maven project
* without having them installed first.
- * This test case uses the target/classes folder of module-a.
+ * This test case uses the target/classes folder of module-a, for the situation where
+ * module-a has not been packaged.
*/
- public void testShouldResolveUnpackagedArtifactFromEarlierBuild() throws Exception
+ public void testShouldResolveOutputDirectoryFromEarlierBuild() throws Exception
{
final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-resume-from" );
[maven-integration-testing] 05/16: No longer necessary to first
install the whole project locally
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 8a0c5e0335128b4b145aa01a284ee8a42c450f2f
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Feb 14 12:06:13 2020 +0100
No longer necessary to first install the whole project locally
---
.../test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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 77b7248..d561ef5 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
@@ -19,7 +19,6 @@ package org.apache.maven.it;
* under the License.
*/
-import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
@@ -61,7 +60,7 @@ public class MavenITmng6090CIFriendlyTest
verifier.addCliOption( "-Drevision=1.2" );
verifier.setLogFileName( "install-log.txt" );
- verifier.executeGoals( Arrays.asList( "clean", "install" ) );
+ verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
[maven-integration-testing] 14/16: Remove System.err.println
invocations
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit c61a262f903c5e704b42118a564290838afb4821
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Mar 27 11:01:35 2020 +0100
Remove System.err.println invocations
---
.../org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
index 289a357..d168696 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
@@ -63,10 +63,8 @@ public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegra
final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
final Path resourcesDirectory = Files.createDirectories( Paths.get( testDir.toString(), "module-a", "src", "main", "resources" ) );
- System.err.println( "Created directory " + resourcesDirectory.toAbsolutePath().toString() );
final Path fileToWrite = resourcesDirectory.resolve( "example.properties" );
FileUtils.fileWrite( fileToWrite.toString(), "x=42" );
- System.err.println( "Wrote file " + fileToWrite.toAbsolutePath().toString() );
verifier2.setAutoclean( false );
verifier2.addCliOption( "--projects" );
[maven-integration-testing] 09/16: Corrected the Maven version to
be 3.7.0 instead of -SNAPSHOT.
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 4a09d937c2f98198c4ab5935531af14914b15218
Author: Martin Kanters <Ma...@ing.com>
AuthorDate: Sat Feb 22 10:05:09 2020 -0500
Corrected the Maven version to be 3.7.0 instead of -SNAPSHOT.
---
.../src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index a30febf..d43e796 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -32,7 +32,7 @@ import java.io.File;
public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCase {
public MavenITmng4660ResumeFromTest()
{
- super( "[3.7.0-SNAPSHOT,)" );
+ super( "[3.7.0,)" );
}
/**
[maven-integration-testing] 03/16: Introduce a compile-time
dependency from module B to A
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit f513c6a531036ac66c07cd7a979c1bd183f23447
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Wed Jan 29 15:11:17 2020 +0100
Introduce a compile-time dependency from module B to A
---
.../src/main/java/org/apache/maven/it/Example.java} | 11 +----------
.../module-b/src/test/java/org/apache/maven/it/TestCase.java | 1 +
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java
similarity index 82%
copy from core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
copy to core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java
index 0fe241b..1608aba 100644
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java
@@ -19,15 +19,6 @@ package org.apache.maven.it;
* under the License.
*/
-import org.junit.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
+public class Example
{
- @Test
- public void testCase()
- {
- fail( "Deliberately fail test case" );
- }
}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
index 0fe241b..932ff51 100644
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
@@ -28,6 +28,7 @@ public class TestCase
@Test
public void testCase()
{
+ final Example example = new Example();
fail( "Deliberately fail test case" );
}
}
\ No newline at end of file
[maven-integration-testing] 16/16: Revert unrelated change
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit e74bd48d6cd74c092cfb24c8481263917a45c210
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Fri Mar 27 11:30:37 2020 +0100
Revert unrelated change
---
.../src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java | 1 +
1 file changed, 1 insertion(+)
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 c1abf34..77b7248 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
@@ -19,6 +19,7 @@ package org.apache.maven.it;
* under the License.
*/
+import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
[maven-integration-testing] 02/16: Change order of modules in POM
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 616f86f8b3a712839a8364a6ca8aaf9ae26d55e4
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Wed Jan 29 15:10:43 2020 +0100
Change order of modules in POM
---
core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml b/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml
index 5fa0e49..a2d0bcd 100644
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml
@@ -37,8 +37,8 @@ under the License.
</properties>
<modules>
- <module>module-a</module>
<module>module-b</module>
+ <module>module-a</module>
</modules>
<dependencies>
[maven-integration-testing] 12/16: Run test twice,
once with packaged and once without packaged artifact
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-4660
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit b14a4d78a40639998c289d67d2afa01fc44f4502
Author: Maarten Mulders <ma...@infosupport.com>
AuthorDate: Mon Mar 9 14:46:59 2020 +0100
Run test twice, once with packaged and once without packaged artifact
---
.../maven/it/MavenITmng4660ResumeFromTest.java | 42 ++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
index d43e796..6d2b471 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
@@ -38,8 +38,9 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
/**
* Test that the --resume-from flag resolves dependencies inside the same Maven project
* without having them installed first.
+ * This test case uses the target/classes folder of module-a.
*/
- public void testShouldResolveDependenciesFromEarlierBuild() throws Exception
+ public void testShouldResolveUnpackagedArtifactFromEarlierBuild() throws Exception
{
final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-resume-from" );
@@ -49,7 +50,44 @@ public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCa
try
{
- verifier1.executeGoal( "verify" );
+ verifier1.executeGoal( "test" ); // The test goal will not create a packaged artifact
+ fail( "Expected this invocation to fail" ); // See TestCase.java
+ }
+ catch ( final VerificationException ve )
+ {
+ verifier1.verifyTextInLog( "Deliberately fail test case" );
+ }
+ finally
+ {
+ verifier1.resetStreams();
+ }
+
+ final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
+ verifier2.setAutoclean( false );
+ verifier2.addCliOption( "--resume-from" );
+ verifier2.addCliOption( ":module-b" );
+ verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
+
+ verifier2.verifyErrorFreeLog();
+ verifier2.resetStreams();
+ }
+
+ /**
+ * Test that the --resume-from flag resolves dependencies inside the same Maven project
+ * without having them installed first.
+ * This test case uses the packaged artifact of module-a.
+ */
+ public void testShouldResolvePackagedArtifactFromEarlierBuild() throws Exception
+ {
+ final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-resume-from" );
+
+ final Verifier verifier1 = newVerifier( testDir.getAbsolutePath() );
+ verifier1.deleteDirectory( "target" );
+ verifier1.deleteArtifacts( "org.apache.maven.its.mng4660" );
+
+ try
+ {
+ verifier1.executeGoal( "verify" ); // The verify goal will create a packaged artifact
fail( "Expected this invocation to fail" ); // See TestCase.java
}
catch ( final VerificationException ve )