diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java index 874408471..87fcb3732 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java @@ -20,7 +20,6 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; @@ -34,11 +33,11 @@ public class MavenITmng3991ValidDependencyScopeTest extends AbstractMavenIntegra public MavenITmng3991ValidDependencyScopeTest() { // TODO: One day, we should be able to error out but this requires to consider extensions and their use cases - super("[4.0,)"); + super(ALL_MAVEN_VERSIONS); } /** - * Test that invalid dependency scopes cause a validation error during building. + * Test that invalid dependency scopes cause a validation warning during building. * * @throws Exception in case of failure */ @@ -49,13 +48,10 @@ public void testit() throws Exception { Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); - try { - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - fail("Invalid dependency scope did not cause validation error"); - } catch (VerificationException e) { - // expected - } + verifier.addCliArgument("validate"); + verifier.execute(); + verifier.verifyErrorFreeLog(); + verifier.verifyTextInLog( + "[WARNING] 'dependencies.dependency.scope' for org.apache.maven.its.mng3991:a:jar must be one of"); } } diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java index 50c19153e..a6550b2dd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java @@ -32,7 +32,7 @@ public class MavenITmng4262MakeLikeReactorDottedPath370Test extends AbstractMavenIntegrationTestCase { public MavenITmng4262MakeLikeReactorDottedPath370Test() { - super("[4.0.0-alpha-1,)"); + super(ALL_MAVEN_VERSIONS); } private void clean(Verifier verifier) throws Exception { @@ -47,6 +47,7 @@ private void clean(Verifier verifier) throws Exception { */ @Test public void testitMakeRoot() throws Exception { + requiresMavenVersion("[4.0.0,)"); File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-4262"); Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath()); 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 deleted file mode 100644 index e76130a87..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.FileVisitor; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.attribute.BasicFileAttributes; - -import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -import static java.nio.file.FileVisitResult.CONTINUE; - -/** - * This is a test case for a new check introduced with MNG-4660. - * 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("[4.0.0-alpha-1,)"); - } - - /** - * Test that Maven logs a warning when a packaged artifact is found that is older than the outputDirectory of the - * same artifact. - * - * @throws Exception in case of failure - */ - @Test - 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.addCliArgument("package"); - verifier1.execute(); - - Path module1Jar = - testDir.toPath().resolve("module-a/target/module-a-1.0.jar").toAbsolutePath(); - verifier1.verifyErrorFreeLog(); - verifier1.verifyFilePresent(module1Jar.toString()); - - if (System.getProperty("java.version", "").startsWith("1.")) { - // Simulating the delay between two invocations. It also makes sure we're not hit by tests that run so fast, - // that the difference in file modification time (see below) is too small to observe. Java 8 on Linux and - // macOS returns that value with "just" second precision, which is not detailed enough. - Thread.sleep(1_000); - } - - // 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")); - final Path fileToWrite = resourcesDirectory.resolve("example.properties"); - FileUtils.fileWrite(fileToWrite.toString(), "x=42"); - - verifier2.setAutoclean(false); - verifier2.addCliArgument("--projects"); - verifier2.addCliArgument(":module-a"); - verifier2.addCliArgument("compile"); - verifier2.execute(); - - Path module1PropertiesFile = testDir.toPath() - .resolve("module-a/target/classes/example.properties") - .toAbsolutePath(); - - verifier2.verifyFilePresent(module1PropertiesFile.toString()); - assertTrue( - Files.getLastModifiedTime(module1PropertiesFile).compareTo(Files.getLastModifiedTime(module1Jar)) >= 0); - - Path module1Class = testDir.toPath() - .resolve("module-a/target/classes/org/apache/maven/it/Example.class") - .toAbsolutePath(); - verifier2.verifyErrorFreeLog(); - verifier2.verifyFilePresent(module1Class.toString()); - - // 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.addCliArgument("--resume-from"); - verifier3.addCliArgument(":module-b"); - verifier3.addCliArgument("compile"); - verifier3.execute(); - - verifier3.verifyErrorFreeLog(); - try { - verifier3.verifyTextInLog( - "File '" - + Paths.get("module-a", "target", "classes", "example.properties") - + "' is more recent than the packaged artifact for 'module-a', please run a full `mvn package` build"); - } catch (VerificationException e) { - final StringBuilder message = new StringBuilder(e.getMessage()); - message.append(System.lineSeparator()); - - message.append(" ") - .append(module1Jar.toAbsolutePath()) - .append(" -> ") - .append(Files.getLastModifiedTime(module1Jar)) - .append(System.lineSeparator()); - - message.append(System.lineSeparator()); - - Path outputDirectory = Paths.get(testDir.toString(), "module-a", "target", "classes"); - - Files.walkFileTree(outputDirectory, new FileVisitor() { - @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) { - return CONTINUE; - } - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { - message.append(" ") - .append(file.toAbsolutePath()) - .append(" -> ") - .append(attrs.lastModifiedTime()) - .append(System.lineSeparator()); - return CONTINUE; - } - - @Override - public FileVisitResult visitFileFailed(Path file, IOException exc) { - return CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) { - return CONTINUE; - } - }); - - throw new VerificationException(message.toString(), e.getCause()); - } - } -} 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 deleted file mode 100644 index 11af77df2..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; - -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -/** - * This is a test case for MNG-4660. - * - * @author Maarten Mulders - * @author Martin Kanters - */ -public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCase { - public MavenITmng4660ResumeFromTest() { - super("[4.0.0-alpha-1,)"); - } - - /** - * 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 directory of module-a, for the situation where - * module-a has not been packaged. - * - * @throws Exception in case of failure - */ - @Test - public void testShouldResolveOutputDirectoryFromEarlierBuild() 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.addCliArgument("test"); // The test goal will not create a packaged artifact - verifier1.execute(); - fail("Expected this invocation to fail"); // See TestCase.java - } catch (final VerificationException ve) { - verifier1.verifyTextInLog("Deliberately fail test case"); - } - - final Verifier verifier2 = newVerifier(testDir.getAbsolutePath()); - verifier2.setAutoclean(false); - verifier2.addCliArgument("--resume-from"); - verifier2.addCliArgument(":module-b"); - verifier2.addCliArgument("compile"); - verifier2.execute(); // to prevent the unit test from failing (again) - - verifier2.verifyErrorFreeLog(); - } - - /** - * 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. - * - * @throws Exception in case of failure - */ - @Test - 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.addCliArgument("verify"); // The verify goal will create a packaged artifact - verifier1.execute(); - fail("Expected this invocation to fail"); // See TestCase.java - } catch (final VerificationException ve) { - verifier1.verifyTextInLog("Deliberately fail test case"); - } - - final Verifier verifier2 = newVerifier(testDir.getAbsolutePath()); - verifier2.setAutoclean(false); - verifier2.addCliArgument("--resume-from"); - verifier2.addCliArgument(":module-b"); - verifier2.addCliArgument("compile"); // to prevent the unit test from failing (again) - verifier2.execute(); - - verifier2.verifyErrorFreeLog(); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java deleted file mode 100644 index 3bca7aab8..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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. - */ -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 java.io.File; -import java.io.IOException; -import java.util.Properties; - -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -public class MavenITmng5659ProjectSettingsTest extends AbstractMavenIntegrationTestCase { - - public MavenITmng5659ProjectSettingsTest() { - super("[4.0.0-alpha-6,)"); - } - - @Test - public void testProjectSettings() throws IOException, VerificationException { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5659-project-settings"); - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - - Properties props; - - verifier.verifyFilePresent("target/pom.properties"); - props = verifier.loadProperties("target/pom.properties"); - assertEquals( - "project.properties.activated", - Boolean.TRUE.toString(), - props.getProperty("project.properties.activated")); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java deleted file mode 100644 index 141d220e5..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; - -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -/** - * An integration test to verify that builds fail when logs occur - * above or equal to the --fail-on-severity cli property. - * - * MNG-6065. - * - */ -public class MavenITmng6065FailOnSeverityTest extends AbstractMavenIntegrationTestCase { - - public MavenITmng6065FailOnSeverityTest() { - super("[4.0.0-alpha-1,)"); - } - - @Test - public void testItShouldFailOnWarnLogMessages() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6065-fail-on-severity"); - - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setForkJvm(true); - verifier.addCliArgument("--fail-on-severity"); - verifier.addCliArgument("WARN"); - - boolean failed = false; - - try { - verifier.addCliArgument("compile"); - verifier.execute(); - } catch (VerificationException e) { - failed = true; - verifier.verifyTextInLog("Enabled to break the build on log level WARN."); - verifier.verifyTextInLog("Build failed due to log statements with a higher severity than allowed."); - } - - assertTrue("Build should have failed", failed); - } - - @Test - public void testItShouldSucceedOnWarnLogMessagesWhenFailLevelIsError() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6065-fail-on-severity"); - - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setForkJvm(true); - verifier.addCliArgument("--fail-on-severity"); - verifier.addCliArgument("ERROR"); - - verifier.addCliArgument("compile"); - verifier.execute(); - - verifier.verifyTextInLog("Enabled to break the build on log level ERROR."); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java deleted file mode 100644 index 8ccea3326..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; - -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -public class MavenITmng6562WarnDefaultBindings extends AbstractMavenIntegrationTestCase { - - public MavenITmng6562WarnDefaultBindings() { - super("[4.0.0-alpha-1,)"); - } - - @Test - public void testItShouldNotWarn() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6562-default-bindings"); - - String phase = "validate"; - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setAutoclean(false); - verifier.setLogFileName(phase + ".txt"); - verifier.setForkJvm(true); // required due to --fail-on-severity - verifier.addCliArgument("-fos"); - verifier.addCliArgument("WARN"); // ALSO NO WARNINGS - verifier.addCliArgument(phase); - verifier.execute(); - - verifier.verifyErrorFreeLog(); - } - - @Test - public void testItShouldNotWarn2() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6562-default-bindings"); - - String phase = "process-resources"; - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setAutoclean(false); - verifier.setLogFileName(phase + ".txt"); - verifier.setForkJvm(true); // required due to --fail-on-severity - verifier.addCliArgument("-fos"); - verifier.addCliArgument("WARN"); // ALSO NO WARNINGS - verifier.addCliArgument(phase); - verifier.execute(); - - verifier.verifyErrorFreeLog(); - } - - @Test - public void testItShouldWarnForCompilerPlugin() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6562-default-bindings"); - - String phase = "compile"; - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setAutoclean(false); - verifier.setLogFileName(phase + ".txt"); - verifier.addCliArgument(phase); - verifier.execute(); - - verifier.verifyTextInLog("Version not locked for default bindings plugins [maven-compiler-plugin]" - + ", you should define versions in pluginManagement section of your pom.xml or parent"); - } - - @Test - public void testItShouldWarnForCompilerPlugin2() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6562-default-bindings"); - - String phase = "process-test-resources"; - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setAutoclean(false); - verifier.setLogFileName(phase + ".txt"); - verifier.addCliArgument(phase); - verifier.execute(); - verifier.verifyErrorFreeLog(); - - verifier.verifyTextInLog("Version not locked for default bindings plugins [maven-compiler-plugin]" - + ", you should define versions in pluginManagement section of your pom.xml or parent"); - } - - @Test - public void testItShouldWarnForCompilerPlugin3() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6562-default-bindings"); - - String phase = "test-compile"; - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setAutoclean(false); - verifier.setLogFileName(phase + ".txt"); - verifier.addCliArgument(phase); - verifier.execute(); - verifier.verifyErrorFreeLog(); - - verifier.verifyTextInLog("Version not locked for default bindings plugins [maven-compiler-plugin]" - + ", you should define versions in pluginManagement section of your pom.xml or parent"); - } - - @Test - public void testItShouldWarnForCompilerPluginAndSurefirePlugin() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-6562-default-bindings"); - - String phase = "test"; - Verifier verifier = newVerifier(testDir.getAbsolutePath(), false); - verifier.setAutoclean(false); - verifier.setLogFileName(phase + ".txt"); - verifier.addCliArgument(phase); - verifier.execute(); - verifier.verifyErrorFreeLog(); - - verifier.verifyTextInLog( - "Version not locked for default bindings plugins [maven-compiler-plugin, maven-surefire-plugin]" - + ", you should define versions in pluginManagement section of your pom.xml or parent"); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java deleted file mode 100644 index 7648d4e15..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; - -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -public class MavenITmng7051OptionalProfileActivationTest extends AbstractMavenIntegrationTestCase { - private static final String PROJECT_PATH = "/mng-7051-optional-profile-activation"; - - public MavenITmng7051OptionalProfileActivationTest() { - super("[4.0.0-alpha-1,)"); - } - - /** - * This test verifies that activating a non-existing profile breaks the build. - * - * @throws Exception in case of failure - */ - @Test - public void testActivatingNonExistingProfileBreaks() throws Exception { - final File projectDir = ResourceExtractor.simpleExtractResources(getClass(), PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); - - verifier.addCliArgument("-P"); - verifier.addCliArgument("non-existing-profile"); - verifier.setLogFileName("test-breaking.txt"); - - try { - verifier.addCliArgument("validate"); - verifier.execute(); - fail("Activated a non-existing profile without ? prefix should break the build, but it didn't."); - } catch (VerificationException ve) { - // Inspect the reason why the build broke. - verifier.verifyTextInLog( - "[ERROR] The requested profiles [non-existing-profile] could not be activated or deactivated because they do not exist."); - } - } - - /** - * This test verifies that activating a non-existing profile does not break the build when it is prefixed with ?. - * - * @throws Exception in case of failure - */ - @Test - public void testActivatingNonExistingProfileWithQuestionMarkDoesNotBreak() throws Exception { - final File projectDir = ResourceExtractor.simpleExtractResources(getClass(), PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); - - verifier.addCliArgument("-P"); - verifier.addCliArgument("?non-existing-profile"); - verifier.setLogFileName("test-non-breaking.txt"); - - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - verifier.verifyTextInLog( - "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist."); - } - - /** - * This test verifies that activating both an existing and a non-existing profile does not break the build when the latter is prefixed with ?. - * - * @throws Exception in case of failure - */ - @Test - public void testActivatingExistingAndNonExistingProfiles() throws Exception { - final File projectDir = ResourceExtractor.simpleExtractResources(getClass(), PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); - - verifier.addCliArgument("-P"); - verifier.addCliArgument("?non-existing-profile,existing"); - verifier.setLogFileName("test-non-breaking-mixed.txt"); - - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - verifier.verifyTextInLog( - "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist."); - } - - /** - * This test verifies that deactivating a non-existing profile does not break the build when it is prefixed with ?. - * - * @throws Exception in case of failure - */ - @Test - public void testDeactivatingNonExistingProfileWithQuestionMarkDoesNotBreak() throws Exception { - final File projectDir = ResourceExtractor.simpleExtractResources(getClass(), PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); - - verifier.addCliArgument("-P"); - verifier.addCliArgument("!?non-existing-profile"); - verifier.setLogFileName("test-deactivating-non-breaking.txt"); - - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - verifier.verifyTextInLog( - "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist."); - } - - /** - * This test verifies that deactivating both an existing and a non-existing profile does not break the build when the latter is prefixed with ?. - * - * @throws Exception in case of failure - */ - @Test - public void testDeactivatingExistingAndNonExistingProfiles() throws Exception { - final File projectDir = ResourceExtractor.simpleExtractResources(getClass(), PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); - - verifier.addCliArgument("-P"); - verifier.addCliArgument("!?non-existing-profile,!existing"); - verifier.setLogFileName("test-deactivating-non-breaking-mixed.txt"); - - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - verifier.verifyTextInLog( - "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist."); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java deleted file mode 100644 index 5b71e7d9f..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; - -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -/** - * This test suite tests whether the consumer pom feature can load a project with a {@code parent} tag - * inside the plugin configuration. - * Related JIRA issue: MNG-7360. - * - * @author Guillaume Nodet - */ -public class MavenITmng7360BuildConsumer extends AbstractMavenIntegrationTestCase { - - private static final String PROJECT_PATH = "/mng-7360-build-consumer"; - - public MavenITmng7360BuildConsumer() { - super("[4.0.0-alpha-1,)"); - } - - @Test - public void testSelectModuleByCoordinate() throws Exception { - final File projectDir = ResourceExtractor.simpleExtractResources(getClass(), PROJECT_PATH); - final Verifier verifier = newVerifier(projectDir.getAbsolutePath()); - verifier.addCliArgument("validate"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java deleted file mode 100644 index b762b7a82..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; -import java.io.IOException; -import java.util.List; - -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -public class MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest extends AbstractMavenIntegrationTestCase { - public MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest() { - super("[4.0.0-alpha-1,)"); - } - - @Test - public void testConsistentLoggingOfOptionalProfilesAndProjects() throws IOException, VerificationException { - File testDir = ResourceExtractor.simpleExtractResources( - getClass(), "/mng-7443-consistency-of-optional-profiles-and-projects"); - - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.addCliArgument("-pl"); - verifier.addCliArgument("?:does-not-exist"); - verifier.addCliArgument("-P"); - verifier.addCliArgument("?does-not-exist-either"); - - verifier.addCliArguments("clean", "verify"); - verifier.execute(); - - final List logLines = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false); - - int projectSelectorMissingCounter = 0; - int profileSelectorMissingCounter = 0; - - for (String logLine : logLines) { - if (logLine.contains("The requested optional projects") - && logLine.contains(":does-not-exist") - && logLine.contains("do not exist")) { - projectSelectorMissingCounter++; - } - if (logLine.contains("The requested optional profiles") - && logLine.contains("does-not-exist-either") - && logLine.contains("do not exist")) { - profileSelectorMissingCounter++; - } - } - - assertEquals(2, profileSelectorMissingCounter); - assertEquals(2, projectSelectorMissingCounter); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java deleted file mode 100644 index b84c5c04a..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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. - */ -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 java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -class MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest extends AbstractMavenIntegrationTestCase { - - protected MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest() { - super("[4.0.0-alpha-6,)"); - } - - @Test - void testConsumerBuildShouldCleanUpOldConsumerFiles() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7740-consumer-files"); - - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.addCliArgument("validate"); - - verifier.execute(); - - verifier.verifyErrorFreeLog(); - - try (Stream stream = Files.walk(testDir.toPath())) { - final List consumerFiles = stream.filter( - path -> path.getFileName().toString().contains("consumer") - && path.getFileName().toString().contains("pom")) - .collect(Collectors.toList()); - assertTrue("Expected no consumer pom file.", consumerFiles.size() == 0); - } - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7804PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7804PluginExecutionOrderTest.java deleted file mode 100644 index 4adc06a67..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7804PluginExecutionOrderTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.it; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; -import org.junit.jupiter.api.Test; - -/** - * This is a test set for MNG-7804. - * Verifies that plugin execution can be ordered across different plugins. - * - */ -class MavenITmng7804PluginExecutionOrderTest extends AbstractMavenIntegrationTestCase { - - public MavenITmng7804PluginExecutionOrderTest() { - super("[4.0.0-alpha-6,)"); - } - - /** - * Verify that plugin executions are executed in order - * - * @throws Exception in case of failure - */ - @Test - void testOrder() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7804-plugin-execution-order"); - - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.addCliArgument("clean"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - - List executions = Files.lines(Paths.get(verifier.getBasedir(), verifier.getLogFileName())) - .filter(l -> l.contains(" This should be ")) - .collect(Collectors.toList()); - assertEquals(4, executions.size()); - assertTrue(executions.get(0).contains("100")); - assertTrue(executions.get(1).contains("200")); - assertTrue(executions.get(2).contains("300")); - assertTrue(executions.get(3).contains("400")); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 4032a06ce..33c175e80 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -125,15 +125,12 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITgh10937QuotedPipesInMavenOptsTest.class); suite.addTestSuite(MavenITmng8106OverlappingDirectoryRolesTest.class); suite.addTestSuite(MavenITmng7939PluginsValidationExcludesTest.class); - suite.addTestSuite(MavenITmng7804PluginExecutionOrderTest.class); suite.addTestSuite(MavenITmng7836AlternativePomSyntaxTest.class); suite.addTestSuite(MavenITmng7891ConfigurationForExtensionsTest.class); suite.addTestSuite(MavenITmng6401ProxyPortInterpolationTest.class); suite.addTestSuite(MavenITmng7228LeakyModelTest.class); suite.addTestSuite(MavenITmng7819FileLockingWithSnapshotsTest.class); - suite.addTestSuite(MavenITmng5659ProjectSettingsTest.class); suite.addTestSuite(MavenITmng5600DependencyManagementImportExclusionsTest.class); - suite.addTestSuite(MavenITmng7740ConsumerBuildShouldCleanUpOldFilesTest.class); suite.addTestSuite(MavenITmng7587Jsr330.class); suite.addTestSuite(MavenITmng7038RootdirTest.class); suite.addTestSuite(MavenITmng7697PomWithEmojiTest.class); @@ -145,7 +142,6 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITmng6609ProfileActivationForPackagingTest.class); suite.addTestSuite(MavenITmng7566JavaPrerequisiteTest.class); suite.addTestSuite(MavenITmng5889FindBasedir.class); - suite.addTestSuite(MavenITmng7360BuildConsumer.class); suite.addTestSuite(MavenITmng5452MavenBuildTimestampUTCTest.class); suite.addTestSuite(MavenITmng3890TransitiveDependencyScopeUpdateTest.class); suite.addTestSuite(MavenITmng3092SnapshotsExcludedFromVersionRangeTest.class); @@ -156,7 +152,6 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.class); suite.addTestSuite(MavenITmng7474SessionScopeTest.class); suite.addTestSuite(MavenITmng7529VersionRangeRepositorySelection.class); - suite.addTestSuite(MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.class); suite.addTestSuite(MavenITmng7353CliGoalInvocationTest.class); suite.addTestSuite(MavenITmng7504NotWarnUnsupportedReportPluginsTest.class); suite.addTestSuite(MavenITmng7160ExtensionClassloader.class); @@ -177,7 +172,6 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITmng7128BlockExternalHttpReactorTest.class); suite.addTestSuite(MavenITmng6511OptionalProjectSelectionTest.class); suite.addTestSuite(MavenITmng7110ExtensionClassloader.class); - suite.addTestSuite(MavenITmng7051OptionalProfileActivationTest.class); suite.addTestSuite(MavenITmng6957BuildConsumer.class); suite.addTestSuite(MavenITmng7045DropUselessAndOutdatedCdiApiTest.class); suite.addTestSuite(MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.class); @@ -188,7 +182,6 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITmng6759TransitiveDependencyRepositoriesTest.class); suite.addTestSuite(MavenITmng6720FailFastTest.class); suite.addTestSuite(MavenITmng6656BuildConsumer.class); - suite.addTestSuite(MavenITmng6562WarnDefaultBindings.class); suite.addTestSuite(MavenITmng6558ToolchainsBuildingEventTest.class); suite.addTestSuite(MavenITmng6506PackageAnnotationTest.class); suite.addTestSuite(MavenITmng6391PrintVersionTest.class); @@ -207,7 +200,6 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITmng6090CIFriendlyTest.class); suite.addTestSuite(MavenITmng6084Jsr250PluginTest.class); suite.addTestSuite(MavenITmng6071GetResourceWithCustomPom.class); - suite.addTestSuite(MavenITmng6065FailOnSeverityTest.class); suite.addTestSuite(MavenITmng6057CheckReactorOrderTest.class); suite.addTestSuite(MavenITmng5965ParallelBuildMultipliesWorkTest.class); suite.addTestSuite(MavenITmng5958LifecyclePhaseBinaryCompat.class); @@ -314,8 +306,6 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITmng4679SnapshotUpdateInPluginTest.class); suite.addTestSuite(MavenITmng4677DisabledPluginConfigInheritanceTest.class); suite.addTestSuite(MavenITmng4666CoreRealmImportTest.class); - suite.addTestSuite(MavenITmng4660ResumeFromTest.class); - suite.addTestSuite(MavenITmng4660OutdatedPackagedArtifact.class); suite.addTestSuite(MavenITmng4654ArtifactHandlerForMainArtifactTest.class); suite.addTestSuite(MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.class); suite.addTestSuite(MavenITmng4633DualCompilerExecutionsWeaveModeTest.class); diff --git a/core-it-suite/src/test/resources/it0116/pom.xml b/core-it-suite/src/test/resources/it0116/pom.xml deleted file mode 100644 index d6bf60de7..000000000 --- a/core-it-suite/src/test/resources/it0116/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.it0116 - parent - 1.0-SNAPSHOT - pom - - - bogus-profile - - - bogus-family - - - - value - - - - diff --git a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/pom.xml b/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/pom.xml deleted file mode 100644 index f24f39f04..000000000 --- a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.depmgmt - child - - grandchild1 - jar - grandchild1 - - - - org.apache.maven.its.mng624.depmgmt - grandchild2 - - - diff --git a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index 573876cdc..000000000 --- a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello " + World.getWorld()); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/pom.xml b/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/pom.xml deleted file mode 100644 index f8ee508a9..000000000 --- a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.depmgmt - child - - grandchild2 - jar - grandchild2 - diff --git a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/src/main/java/org/apache/maven/mng624/World.java b/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/src/main/java/org/apache/maven/mng624/World.java deleted file mode 100644 index 21d290ace..000000000 --- a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/src/main/java/org/apache/maven/mng624/World.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class World { - public static String getWorld() { - return "earth"; - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/pom.xml b/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/pom.xml deleted file mode 100644 index 98ef9803e..000000000 --- a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/child/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.depmgmt - parent - - child - pom - child - - grandchild1 - grandchild2 - - - - - - org.apache.maven.its.mng624.depmgmt - grandchild2 - ${ver} - - - - diff --git a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/pom.xml b/core-it-suite/src/test/resources/mng-0624/dependencyManagement/pom.xml deleted file mode 100644 index 518a98e86..000000000 --- a/core-it-suite/src/test/resources/mng-0624/dependencyManagement/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624.depmgmt - parent - 1 - pom - mng624 parent - - child - - - - - topaz - http://gandalf.topazproject.org/maven2/ - - - - - 1 - - diff --git a/core-it-suite/src/test/resources/mng-0624/noParentInTree/pom.xml b/core-it-suite/src/test/resources/mng-0624/noParentInTree/pom.xml deleted file mode 100644 index 21fe52a93..000000000 --- a/core-it-suite/src/test/resources/mng-0624/noParentInTree/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child1 - jar - mng624 child1 - - diff --git a/core-it-suite/src/test/resources/mng-0624/noParentInTree/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/noParentInTree/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/noParentInTree/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/pom.xml deleted file mode 100644 index e27d2cb68..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child1 - jar - mng624 child1 - - diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/pom.xml deleted file mode 100644 index 07b92b800..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - child2 - - org.apache.maven.its.mng624.opt - grandchild - jar - mng624 grandchild - - diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/pom.xml deleted file mode 100644 index 8ef560df1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child2/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child2 - pom - mng624 child2 - - grandchild - ../grandchild2 - - diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/pom.xml deleted file mode 100644 index 4d142683d..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - child3 - - org.apache.maven.its.mng624.opt - child3child - jar - mng624 child3child - - diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/pom.xml deleted file mode 100644 index 97c1bf970..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child3/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child3 - 2 - pom - mng624 child3 - - child3child - - diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/pom.xml deleted file mode 100644 index 5be6958e4..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - parent - - org.apache.maven.its.mng624.opt - child4 - jar - mng624 child4 - - diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/pom.xml deleted file mode 100644 index c605e5a28..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624.opt - child2 - ../child2/pom.xml - - org.apache.maven.its.mng624.opt - grandchild2 - jar - mng624 grandchild2 - - diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/optionalVersion/pom.xml b/core-it-suite/src/test/resources/mng-0624/optionalVersion/pom.xml deleted file mode 100644 index 19e301aea..000000000 --- a/core-it-suite/src/test/resources/mng-0624/optionalVersion/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624.opt - parent - 1 - pom - mng624 parent - - child1 - child2 - child3 - - diff --git a/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/pom.xml b/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/pom.xml deleted file mode 100644 index 0b5a96719..000000000 --- a/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng0624 - maven-it-mng0624-basic-parent - ${mng0624ParentPom} - ../parent - - org.apache.maven.its.mng0624 - maven-it-mng0624-main - 1.0 - Maven Integration Test :: mng0624 :: Main - diff --git a/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/mng0624/Hello.java b/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/mng0624/Hello.java deleted file mode 100644 index 9a42e9418..000000000 --- a/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/mng0624/Hello.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package mng0624; - -public class Hello { - public void helloWorld() { - System.out.println("Hello World!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/test/java/mng0624/HelloTest.java b/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/test/java/mng0624/HelloTest.java deleted file mode 100644 index 70f6064c7..000000000 --- a/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/test/java/mng0624/HelloTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package mng0624; - -import junit.framework.TestCase; - -public class HelloTest extends TestCase { - public void testHello() throws Exception { - Hello hello = new Hello(); - hello.helloWorld(); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/parentBadPath/parent/pom.xml b/core-it-suite/src/test/resources/mng-0624/parentBadPath/parent/pom.xml deleted file mode 100644 index 1e5bda68c..000000000 --- a/core-it-suite/src/test/resources/mng-0624/parentBadPath/parent/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng0624 - maven-it-mng0624-basic - ${mng0624pom} - - org.apache.maven.its.mng0624 - maven-it-mng0624-basic-parent - 1.1 - pom - Maven Integration Test :: mng0624 :: Parent - - - junit - junit - 3.8.1 - test - - - diff --git a/core-it-suite/src/test/resources/mng-0624/parentBadPath/pom.xml b/core-it-suite/src/test/resources/mng-0624/parentBadPath/pom.xml deleted file mode 100644 index 25758f09d..000000000 --- a/core-it-suite/src/test/resources/mng-0624/parentBadPath/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng0624 - maven-it-mng0624-basic - 1.0 - pom - Maven Integration Test :: mng0624 - Test that child can get its parent without specifying a version - - parent - main - - diff --git a/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml b/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml deleted file mode 100644 index a9accbf8c..000000000 --- a/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624.simple - myproject - - child - jar - mng624 simple child - - - - test - - - - maven-antrun-plugin - - - - run - - install - - - hello world - - - - - - - - - - diff --git a/core-it-suite/src/test/resources/mng-0624/simple/child/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/simple/child/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/simple/child/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/simple/pom.xml b/core-it-suite/src/test/resources/mng-0624/simple/pom.xml deleted file mode 100644 index 7304a7eaf..000000000 --- a/core-it-suite/src/test/resources/mng-0624/simple/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624.simple - myproject - 1 - pom - mng624 myproject - - - child - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/pom.xml deleted file mode 100644 index 21fe52a93..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child1 - jar - mng624 child1 - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/pom.xml deleted file mode 100644 index bd947d126..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - child2 - ${ver} - - org.apache.maven.its.mng624 - grandchild - jar - mng624 grandchild - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/pom.xml deleted file mode 100644 index 1f25df4ff..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child2/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child2 - pom - mng624 child2 - - grandchild - ../grandchild2 - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/pom.xml deleted file mode 100644 index ce5d48ccd..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - child3 - 2 - - org.apache.maven.its.mng624 - child3child - jar - mng624 child3child - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/pom.xml deleted file mode 100644 index ba28035a7..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child3/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child3 - 2 - pom - mng624 child3 - - child3child - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/pom.xml deleted file mode 100644 index 57b841239..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - parent - ${ver} - - org.apache.maven.its.mng624 - child4 - jar - mng624 child4 - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/pom.xml deleted file mode 100644 index 8bce39cf9..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - - org.apache.maven.its.mng624 - child2 - ${ver} - ../child2/pom.xml - - org.apache.maven.its.mng624 - grandchild2 - jar - mng624 grandchild2 - - diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java b/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java deleted file mode 100644 index ba9fff8f1..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -package org.apache.maven.mng624; - -public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/core-it-suite/src/test/resources/mng-0624/versionInProperty/pom.xml b/core-it-suite/src/test/resources/mng-0624/versionInProperty/pom.xml deleted file mode 100644 index c3b7cfddb..000000000 --- a/core-it-suite/src/test/resources/mng-0624/versionInProperty/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - org.apache.maven.its.mng624 - parent - ${ver} - pom - mng624 parent - - child1 - child2 - child3 - - - - 1 - - diff --git a/core-it-suite/src/test/resources/mng-2289/issue/pom.xml b/core-it-suite/src/test/resources/mng-2289/issue/pom.xml deleted file mode 100644 index 223e73ab8..000000000 --- a/core-it-suite/src/test/resources/mng-2289/issue/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - 4.0.0 - - org.codehaus.jira.mng.2289 - parent - SNAPSHOT - - mng-issue-2289 - SNAPSHOT - jar - Issue 2289 - - - - - commons-logging - commons-logging - - - - diff --git a/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java b/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java deleted file mode 100644 index 5c7d373ac..000000000 --- a/core-it-suite/src/test/resources/mng-2289/issue/src/main/java/mng/Issue2289.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package mng; - -import junit.framework.TestCase; - -public class Issue2289 { - public static void main(final String[] args) { - TestCase tc = new TestCase("Dummy") {}; - System.exit(tc == null ? -1 : 0); - } -} diff --git a/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml b/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml deleted file mode 100644 index ef6d1f601..000000000 --- a/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - org.codehaus.jira.mng.2289 - parent - pom - Parent POM for issue 2289 - SNAPSHOT - 2006 - - - - - - - - commons-logging - commons-logging - 1.0.1 - - - - - - - - false - - - true - always - - local-snapshot-repo - Local snapshot repository - file:///tmp/repo-m2-snapshot - - - - - - - demo-snapshot - Demo Maven 2 snapshot repository - file:///tmp/repo-m2-snapshot - false - - - diff --git a/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml b/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml deleted file mode 100644 index 59df0fadb..000000000 --- a/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - org.codehaus.jira.mng.2289 - parent - pom - Parent POM for issue 2289 - SNAPSHOT - 2006 - - - - - - - - - commons-logging - commons-logging - 1.0.2 - - - - - - - - false - - - true - always - - local-snapshot-repo - Local snapshot repository - file:///tmp/repo-m2-snapshot - - - - - - - demo-snapshot - Demo Maven 2 snapshot repository - file:///tmp/repo-m2-snapshot - false - - - diff --git a/core-it-suite/src/test/resources/mng-2289/test.sh b/core-it-suite/src/test/resources/mng-2289/test.sh deleted file mode 100755 index 05fe4670b..000000000 --- a/core-it-suite/src/test/resources/mng-2289/test.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# We want to test that after changing the parent POM which is a SNAPSHOT, it is used for any children. - -dir=`pwd` - -mvn="mvn" -repo="$HOME/maven-repo-local" - -# Remove commons-logging all together -rm -rf $repo/commons-logging -# Deploy the parent POM in our file-based remote repository -( cd parent ; $mvn -f pom1.xml deploy ) -# Run the compile phase for the child project. This will bring down commons-logging 1.0.1 -( cd issue; $mvn compile ) -# Deploy the parent POM with an update version of the commons-logging dependency -> 1.0.2 - -read - -( cd parent ; $mvn -f pom2.xml deploy ) -# Move the original commons-logging deps out of the way -mv $repo/commons-logging $repo/commons-logging-1.0.1 -# Run the child project again and the new version of commons-logging should come down -( cd issue; $mvn compile ) - 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 deleted file mode 100644 index ad0ec9ca4..000000000 --- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 4.0.0 - - - org.apache.maven.its.mng4660 - parent - 1.0 - - - module-a - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M7 - - - - - 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 deleted file mode 100644 index 7cf4e9285..000000000 --- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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. - */ -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 {} 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 deleted file mode 100644 index c4e4d6976..000000000 --- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 4.0.0 - - - org.apache.maven.its.mng4660 - parent - 1.0 - - - module-b - - - - org.apache.maven.its.mng4660 - module-a - 1.0 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M7 - - - - - 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 deleted file mode 100644 index cee4f277f..000000000 --- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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. - */ -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(); - } -} 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 deleted file mode 100644 index d7de31bf7..000000000 --- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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. - */ -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(); - } -} 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 deleted file mode 100644 index f0f8eb77d..000000000 --- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.mng4660 - parent - 1.0 - - pom - - Maven Integration Test :: MNG-4660 - This is a test case for a new check which verifies if a packaged artifact - within the Reactor is up-to-date with the outputDirectory of the same project. - - - module-b - module-a - - - - UTF-8 - 1.8 - 1.8 - - - - - junit - junit - 4.12 - test - - - - 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 deleted file mode 100644 index ad0ec9ca4..000000000 --- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 4.0.0 - - - org.apache.maven.its.mng4660 - parent - 1.0 - - - module-a - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M7 - - - - - diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java deleted file mode 100644 index 7cf4e9285..000000000 --- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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. - */ -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 {} 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 deleted file mode 100644 index c4e4d6976..000000000 --- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 4.0.0 - - - org.apache.maven.its.mng4660 - parent - 1.0 - - - module-b - - - - org.apache.maven.its.mng4660 - module-a - 1.0 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M7 - - - - - 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 deleted file mode 100644 index cee4f277f..000000000 --- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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. - */ -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(); - } -} 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 deleted file mode 100644 index a0809f7ba..000000000 --- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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. - */ -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() { - final Example example = new Example(); - fail("Deliberately fail test case"); - } -} 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 deleted file mode 100644 index 31313842d..000000000 --- a/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.mng4660 - parent - 1.0 - - pom - - Maven Integration Test :: MNG-4660 - Test that the --resume-from flag resolves dependencies inside the same Maven project - without having them installed first. - - - module-b - module-a - - - - UTF-8 - 1.8 - 1.8 - - - - - junit - junit - 4.12 - test - - - - diff --git a/core-it-suite/src/test/resources/mng-5207/application/pom.xml b/core-it-suite/src/test/resources/mng-5207/application/pom.xml deleted file mode 100755 index 2f3af5ed1..000000000 --- a/core-it-suite/src/test/resources/mng-5207/application/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - 4.0.0 - - bugs.maven.issue - master - x-SNAPSHOT - - application - 1-SNAPSHOT - jar - Issue Application - - - - - bugs.maven.issue - delegate - - - - diff --git a/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml b/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml deleted file mode 100755 index f15567f61..000000000 --- a/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - - bugs.maven.issue - master - x-SNAPSHOT - - delegate - 2-SNAPSHOT - jar - Issue EJB Delegate - - - - - bugs.maven.issue - ejb - client - ejb-client - - - - diff --git a/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml b/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml deleted file mode 100755 index 48ba376f5..000000000 --- a/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 4.0.0 - - bugs.maven.issue - master - x-SNAPSHOT - - ejb - 2-SNAPSHOT - ejb - Issue EJB - - - - - commons-lang - commons-lang - - - - - - - - maven-ejb-plugin - - - - true - - - - - - - - - diff --git a/core-it-suite/src/test/resources/mng-5207/ejb/src/main/java/maven/bugs/IssueHome.java b/core-it-suite/src/test/resources/mng-5207/ejb/src/main/java/maven/bugs/IssueHome.java deleted file mode 100755 index 86a6f805c..000000000 --- a/core-it-suite/src/test/resources/mng-5207/ejb/src/main/java/maven/bugs/IssueHome.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -package maven.bugs; - -public interface IssueHome {} diff --git a/core-it-suite/src/test/resources/mng-5207/ejb/src/main/resources/META-INF/ejb-jar.xml b/core-it-suite/src/test/resources/mng-5207/ejb/src/main/resources/META-INF/ejb-jar.xml deleted file mode 100755 index 8529c4999..000000000 --- a/core-it-suite/src/test/resources/mng-5207/ejb/src/main/resources/META-INF/ejb-jar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - IssueMEJB18 - - - MEJB18 - mejb.Issue18Home - mejb.Issue18 - mejb.Issue18Bean - Stateless - - - diff --git a/core-it-suite/src/test/resources/mng-5207/pom.xml b/core-it-suite/src/test/resources/mng-5207/pom.xml deleted file mode 100755 index afa2cefe0..000000000 --- a/core-it-suite/src/test/resources/mng-5207/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - 4.0.0 - bugs.maven.issue - builder - x-SNAPSHOT - pom - Builder for Issue - - - application - delegate - ejb - - diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.jar b/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.jar deleted file mode 100644 index 23bcd45de..000000000 Binary files a/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.jar and /dev/null differ diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom b/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom deleted file mode 100755 index 6a0c0b1bc..000000000 --- a/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom +++ /dev/null @@ -1,28 +0,0 @@ - - - - bugs.maven.issue - master - 1 - - - 4.0.0 - delegate - 1 - jar - Issue EJB Delegate - - - - - bugs.maven.issue - ejb - client - ejb-client - - - - diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1-client.jar b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1-client.jar deleted file mode 100644 index 0f6ed47cf..000000000 Binary files a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1-client.jar and /dev/null differ diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.jar b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.jar deleted file mode 100644 index b7a1ae923..000000000 Binary files a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.jar and /dev/null differ diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom b/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom deleted file mode 100755 index 51f520c1f..000000000 --- a/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom +++ /dev/null @@ -1,43 +0,0 @@ - - - - bugs.maven.issue - master - 1 - - - 4.0.0 - ejb - 1 - ejb - Issue EJB - - - - - - - maven-ejb-plugin - - - - true - - - - - - - - - - - commons-lang - commons-lang - - - - diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom b/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom deleted file mode 100644 index 363af6394..000000000 --- a/core-it-suite/src/test/resources/mng-5207/prepare/master-1.pom +++ /dev/null @@ -1,256 +0,0 @@ - - 4.0.0 - - - bugs.maven.issue - master - pom - - - Master Project - 1 - Master project with global settings. - - - - 2.2.1 - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${version.org.apache.maven.plugins.assembly} - true - - false - true - - - - org.apache.maven.plugins - maven-clean-plugin - ${version.org.apache.maven.plugins.clean} - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.org.apache.maven.plugins.compiler} - true - - ${java.version.source} - ${java.version.target} - ${project.build.sourceEncoding} - false - true - true - - - - org.apache.maven.plugins - maven-dependency-plugin - ${version.org.apache.maven.plugins.dependency} - true - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.org.apache.maven.plugins.deploy} - - - org.apache.maven.plugins - maven-ear-plugin - ${version.org.apache.maven.plugins.ear} - - / - ${project.name} - - false - - true - true - - - - - - org.apache.maven.plugins - maven-ejb-plugin - ${version.org.apache.maven.plugins.ejb} - - true - ${java.ejb.version} - - META-INF/*.xml - **/ejb/*Bean.class - - - false - - true - false - true - true - - - - - - org.apache.maven.plugins - maven-install-plugin - ${version.org.apache.maven.plugins.install} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${version.org.apache.maven.plugins.resources} - - - false - - ${*} - - - - - org.apache.maven.plugins - maven-source-plugin - ${version.org.apache.maven.plugins.source} - - - attach-sources - package - - jar-no-fork - - - - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.org.apache.maven.plugins.surefire} - true - - - once - -Xms64m -Xmx128m - ${basedir} - false - random - false - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${version.org.codehaus.mojo.build-helper-plugin} - true - - - - - - - - - bugs.maven.issue - application - ${version.application} - - - bugs.maven.issue - delegate - ${version.delegate} - - - - bugs.maven.issue - ejb - ${version.ejb} - client - ejb-client - - - - commons-lang - commons-lang - ${version.commons-lang} - - - - - - - - - - 1.6 - 1.6 - 2.1 - - - - - 3.4.0 - 3.2.0 - 3.10.1 - 3.3.0 - 3.0.0 - 3.3.0 - 3.1.0 - 3.0.1 - 3.3.0 - 3.2.0 - 3.2.1 - 3.0.0-M7 - - 1.7 - - - - - 1-SNAPSHOT - 1 - 1 - - 2.4 - - iso-8859-1 - - diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom b/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom deleted file mode 100644 index 35c5d7971..000000000 --- a/core-it-suite/src/test/resources/mng-5207/prepare/master-x.pom +++ /dev/null @@ -1,256 +0,0 @@ - - 4.0.0 - - - bugs.maven.issue - master - pom - - - Master Project - x-SNAPSHOT - Master project with global settings. - - - - 2.2.1 - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${version.org.apache.maven.plugins.assembly} - true - - false - true - - - - org.apache.maven.plugins - maven-clean-plugin - ${version.org.apache.maven.plugins.clean} - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.org.apache.maven.plugins.compiler} - true - - ${java.version.source} - ${java.version.target} - ${project.build.sourceEncoding} - false - true - true - - - - org.apache.maven.plugins - maven-dependency-plugin - ${version.org.apache.maven.plugins.dependency} - true - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.org.apache.maven.plugins.deploy} - - - org.apache.maven.plugins - maven-ear-plugin - ${version.org.apache.maven.plugins.ear} - - / - ${project.name} - - false - - true - true - - - - - - org.apache.maven.plugins - maven-ejb-plugin - ${version.org.apache.maven.plugins.ejb} - - true - ${java.ejb.version} - - META-INF/*.xml - **/ejb/*Bean.class - - - false - - true - false - true - true - - - - - - org.apache.maven.plugins - maven-install-plugin - ${version.org.apache.maven.plugins.install} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${version.org.apache.maven.plugins.resources} - - - false - - ${*} - - - - - org.apache.maven.plugins - maven-source-plugin - ${version.org.apache.maven.plugins.source} - - - attach-sources - package - - jar-no-fork - - - - - - false - - true - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.org.apache.maven.plugins.surefire} - true - - - once - -Xms64m -Xmx128m - ${basedir} - false - random - false - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${version.org.codehaus.mojo.build-helper-plugin} - true - - - - - - - - - bugs.maven.issue - application - ${version.application} - - - bugs.maven.issue - delegate - ${version.delegate} - - - - bugs.maven.issue - ejb - ${version.ejb} - client - ejb-client - - - - commons-lang - commons-lang - ${version.commons-lang} - - - - - - - - - - 1.6 - 1.6 - 2.1 - - - - - 3.4.0 - 3.2.0 - 3.10.1 - 3.3.0 - 3.0.0 - 3.2.0 - 3.1.0 - 3.0.1 - 3.3.0 - 3.3.0 - 3.2.1 - 3.0.0-M7 - - 1.7 - - - - - 1-SNAPSHOT - 1 - 2-SNAPSHOT - - 2.6 - - iso-8859-1 - - diff --git a/core-it-suite/src/test/resources/mng-5207/prepare/prepare.sh b/core-it-suite/src/test/resources/mng-5207/prepare/prepare.sh deleted file mode 100755 index 468e16f31..000000000 --- a/core-it-suite/src/test/resources/mng-5207/prepare/prepare.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -mvn install:install-file -Dfile=master-1.pom -DpomFile=master-1.pom -mvn install:install-file -Dfile=master-x.pom -DpomFile=master-x.pom -mvn install:install-file -Dfile=ejb-1.jar -DpomFile=ejb-1.pom -mvn install:install-file -Dfile=ejb-1-client.jar -Dclassifier=client -DpomFile=ejb-1.pom -mvn install:install-file -Dfile=delegate-1.jar -DpomFile=delegate-1.pom diff --git a/core-it-suite/src/test/resources/mng-5659-project-settings/.mvn/settings.xml b/core-it-suite/src/test/resources/mng-5659-project-settings/.mvn/settings.xml deleted file mode 100644 index 32cd8aa60..000000000 --- a/core-it-suite/src/test/resources/mng-5659-project-settings/.mvn/settings.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - settings-active-default - - true - - - true - - - - git-local - file://${session.rootDirectory}/repository - - ignore - - - - - - \ No newline at end of file diff --git a/core-it-suite/src/test/resources/mng-5659-project-settings/child/pom.xml b/core-it-suite/src/test/resources/mng-5659-project-settings/child/pom.xml deleted file mode 100644 index d34fa2b4e..000000000 --- a/core-it-suite/src/test/resources/mng-5659-project-settings/child/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - - mng5659 - project - 0.0.1-SNAPSHOT - - child - jar - - - - foo - bar - 1.0 - - - - diff --git a/core-it-suite/src/test/resources/mng-5659-project-settings/pom.xml b/core-it-suite/src/test/resources/mng-5659-project-settings/pom.xml deleted file mode 100644 index 89da7e242..000000000 --- a/core-it-suite/src/test/resources/mng-5659-project-settings/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - mng5659 - project - 0.0.1-SNAPSHOT - pom - - - child - - - - false - - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - - - eval - - validate - - target/pom.properties - - project/properties - - - - - - - - - diff --git a/core-it-suite/src/test/resources/mng-5659-project-settings/repository/foo/bar/1.0/bar-1.0.jar b/core-it-suite/src/test/resources/mng-5659-project-settings/repository/foo/bar/1.0/bar-1.0.jar deleted file mode 100644 index 214c630b3..000000000 Binary files a/core-it-suite/src/test/resources/mng-5659-project-settings/repository/foo/bar/1.0/bar-1.0.jar and /dev/null differ diff --git a/core-it-suite/src/test/resources/mng-5659-project-settings/repository/foo/bar/1.0/bar-1.0.pom b/core-it-suite/src/test/resources/mng-5659-project-settings/repository/foo/bar/1.0/bar-1.0.pom deleted file mode 100644 index 5c10179d5..000000000 --- a/core-it-suite/src/test/resources/mng-5659-project-settings/repository/foo/bar/1.0/bar-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - foo - bar - 1.0 - jar - \ No newline at end of file diff --git a/core-it-suite/src/test/resources/mng-6065-fail-on-severity/pom.xml b/core-it-suite/src/test/resources/mng-6065-fail-on-severity/pom.xml deleted file mode 100644 index b1e776bfc..000000000 --- a/core-it-suite/src/test/resources/mng-6065-fail-on-severity/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.mng6065 - test - 0.1 - jar - - Maven Integration Test :: MNG-6065 - An integration test to verify that builds fail when logs occur above or equal to the --fail-on-severity cli property. - An empty project like this will already log warnings about the platform encoding and the empty jar. - diff --git a/core-it-suite/src/test/resources/mng-6352-print-version/module-1/pom.xml b/core-it-suite/src/test/resources/mng-6352-print-version/module-1/pom.xml deleted file mode 100644 index 509b51806..000000000 --- a/core-it-suite/src/test/resources/mng-6352-print-version/module-1/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - 4.0.0 - - mng-6352-print-version - base-project - 1.3.0-SNAPSHOT - - - module-1 - - diff --git a/core-it-suite/src/test/resources/mng-6352-print-version/module-2/pom.xml b/core-it-suite/src/test/resources/mng-6352-print-version/module-2/pom.xml deleted file mode 100644 index 82bcf8545..000000000 --- a/core-it-suite/src/test/resources/mng-6352-print-version/module-2/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 4.0.0 - - - mng-6352-print-version - base-project - 1.3.0-SNAPSHOT - - module-2 - - - - mng-6352-print-version - module-1 - ${project.version} - - - - diff --git a/core-it-suite/src/test/resources/mng-6352-print-version/module-3/pom.xml b/core-it-suite/src/test/resources/mng-6352-print-version/module-3/pom.xml deleted file mode 100644 index a5d4dda78..000000000 --- a/core-it-suite/src/test/resources/mng-6352-print-version/module-3/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 4.0.0 - - - mng-6352-print-version - base-project - 1.3.0-SNAPSHOT - - module-3 - - - - mng-6352-print-version - module-2 - ${project.version} - - - - diff --git a/core-it-suite/src/test/resources/mng-6352-print-version/pom.xml b/core-it-suite/src/test/resources/mng-6352-print-version/pom.xml deleted file mode 100644 index c2f0052a4..000000000 --- a/core-it-suite/src/test/resources/mng-6352-print-version/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - 4.0.0 - - mng-6352-print-version - base-project - 1.3.0-SNAPSHOT - pom - - - module-3 - module-1 - module-2 - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.4.0 - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - - - diff --git a/core-it-suite/src/test/resources/mng-6562-default-bindings/pom.xml b/core-it-suite/src/test/resources/mng-6562-default-bindings/pom.xml deleted file mode 100644 index 46b0365bc..000000000 --- a/core-it-suite/src/test/resources/mng-6562-default-bindings/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.mng6562 - test - 0.1 - - Maven Integration Test :: MNG-6562 - - - UTF-8 - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 0.1-stub-SNAPSHOT - - - - - diff --git a/core-it-suite/src/test/resources/mng-7051-optional-profile-activation/pom.xml b/core-it-suite/src/test/resources/mng-7051-optional-profile-activation/pom.xml deleted file mode 100644 index 97f2b0eec..000000000 --- a/core-it-suite/src/test/resources/mng-7051-optional-profile-activation/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.mng7051 - profile-selection - 1.0 - - - - existing - - - - diff --git a/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml b/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml deleted file mode 100644 index 09e34ec2a..000000000 --- a/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.mng7360 - parent - 1.0-SNAPSHOT - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - 2.1-SNAPSHOT - - expand - - - - - - - diff --git a/core-it-suite/src/test/resources/mng-7443-consistency-of-optional-profiles-and-projects/pom.xml b/core-it-suite/src/test/resources/mng-7443-consistency-of-optional-profiles-and-projects/pom.xml deleted file mode 100644 index a9aa1e4ef..000000000 --- a/core-it-suite/src/test/resources/mng-7443-consistency-of-optional-profiles-and-projects/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.mng7443 - consistent-logging-of-optional-projects-and-profiles-selectors - 1.0 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - - diff --git a/core-it-suite/src/test/resources/mng-7740-consumer-files/pom.xml b/core-it-suite/src/test/resources/mng-7740-consumer-files/pom.xml deleted file mode 100644 index 82a6abd72..000000000 --- a/core-it-suite/src/test/resources/mng-7740-consumer-files/pom.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its.mng7740 - test - 1.0-SNAPSHOT - diff --git a/core-it-suite/src/test/resources/mng-7804-plugin-execution-order/pom.xml b/core-it-suite/src/test/resources/mng-7804-plugin-execution-order/pom.xml deleted file mode 100644 index e14caa454..000000000 --- a/core-it-suite/src/test/resources/mng-7804-plugin-execution-order/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - mng7804 - plugin-execution-order - 1.0 - - - - - maven-clean-plugin - 3.2.0 - - - 100. This should be first - - clean - - clean - 100 - - - 300. This should be third - - clean - - clean - 300 - - - - - maven-antrun-plugin - 3.1.0 - - - 200. This should be second - - run - - clean - 200 - - - 400. This should be fourth - - run - - clean - 400 - - - - - -