diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml index fcddb7207..e6e37a9ef 100644 --- a/core-it-suite/pom.xml +++ b/core-it-suite/pom.xml @@ -238,11 +238,6 @@ under the License. maven-site-plugin 0.1-stub-SNAPSHOT - - org.apache.maven.plugins - maven-source-plugin - 0.1-stub-SNAPSHOT - org.apache.maven.plugins maven-surefire-plugin diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java deleted file mode 100644 index c6f51ce40..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java +++ /dev/null @@ -1,53 +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 MavenIT0051ReleaseProfileTest extends AbstractMavenIntegrationTestCase { - - public MavenIT0051ReleaseProfileTest() { - super("(2.0.2,4.0.0-alpha-1)"); - } - - /** - * Test source attachment when -DperformRelease=true is specified. - * - * @throws Exception in case of failure - */ - @Test - public void testit0051() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0051"); - - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setAutoclean(false); - verifier.deleteDirectory("target"); - verifier.addCliArgument("-DperformRelease=true"); - verifier.addCliArgument("package"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - - verifier.verifyFilePresent("target/source-jar.txt"); - verifier.verifyFilePresent("target/javadoc-jar.txt"); - } -} diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java deleted file mode 100644 index 135e02b03..000000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java +++ /dev/null @@ -1,53 +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 MavenIT0052ReleaseProfileTest extends AbstractMavenIntegrationTestCase { - public MavenIT0052ReleaseProfileTest() { - super(ALL_MAVEN_VERSIONS); - } - - /** - * Test that source attachment doesn't take place when - * -DperformRelease=true is missing. - * - * @throws Exception in case of failure - */ - @Test - public void testit0052() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0052"); - - Verifier verifier = newVerifier(testDir.getAbsolutePath()); - verifier.setAutoclean(false); - verifier.deleteDirectory("target"); - verifier.addCliArgument("package"); - verifier.execute(); - verifier.verifyErrorFreeLog(); - - verifier.verifyFilePresent("target/jar-jar.txt"); - verifier.verifyFileNotPresent("target/source-jar.txt"); - verifier.verifyFileNotPresent("target/javadoc-jar.txt"); - } -} 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 3331ca45c..c9bd8e395 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 @@ -734,8 +734,6 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenIT0064MojoConfigViaSettersTest.class); suite.addTestSuite(MavenIT0063SystemScopeDependencyTest.class); suite.addTestSuite(MavenIT0056MultipleGoalExecutionsTest.class); - suite.addTestSuite(MavenIT0052ReleaseProfileTest.class); - suite.addTestSuite(MavenIT0051ReleaseProfileTest.class); suite.addTestSuite(MavenIT0041ArtifactTypeFromPluginExtensionTest.class); suite.addTestSuite(MavenIT0040PackagingFromPluginExtensionTest.class); suite.addTestSuite(MavenIT0038AlternatePomFileDifferentDirTest.class); diff --git a/core-it-suite/src/test/resources-filtered/bootstrap.txt b/core-it-suite/src/test/resources-filtered/bootstrap.txt index 259e9e94c..dfb54b74b 100644 --- a/core-it-suite/src/test/resources-filtered/bootstrap.txt +++ b/core-it-suite/src/test/resources-filtered/bootstrap.txt @@ -108,7 +108,6 @@ org.apache.maven.plugins:maven-resources-plugin:3.3.0 org.apache.maven.plugins:maven-site-plugin:${stubPluginVersion} org.apache.maven.plugins:maven-site-plugin:3.9.1 org.apache.maven.plugins:maven-shade-plugin:3.5.0 -org.apache.maven.plugins:maven-source-plugin:${stubPluginVersion} org.apache.maven.plugins:maven-surefire-plugin:${stubPluginVersion} org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5 org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7 diff --git a/core-it-suite/src/test/resources/it0051/pom.xml b/core-it-suite/src/test/resources/it0051/pom.xml deleted file mode 100644 index d9faee919..000000000 --- a/core-it-suite/src/test/resources/it0051/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.it0051 - maven-it-it0051 - 1.0 - jar - - Maven Integration Test :: it0051 - Test source attachment when -DperformRelease=true is specified. - - - - - - - maven-compiler-plugin - 0.1-stub-SNAPSHOT - - - maven-jar-plugin - 0.1-stub-SNAPSHOT - - - maven-javadoc-plugin - 0.1-stub-SNAPSHOT - - - maven-resources-plugin - 0.1-stub-SNAPSHOT - - - maven-source-plugin - 0.1-stub-SNAPSHOT - - - maven-surefire-plugin - 0.1-stub-SNAPSHOT - - - - - diff --git a/core-it-suite/src/test/resources/it0052/pom.xml b/core-it-suite/src/test/resources/it0052/pom.xml deleted file mode 100644 index 22b28edc7..000000000 --- a/core-it-suite/src/test/resources/it0052/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - 4.0.0 - - org.apache.maven.its.it0052 - maven-it-it0052 - 1.0 - jar - - Maven Integration Test :: it0052 - Test that source attachment doesn't take place when -DperformRelease=true is missing. - - - - - - - maven-compiler-plugin - 0.1-stub-SNAPSHOT - - - maven-jar-plugin - 0.1-stub-SNAPSHOT - - - maven-javadoc-plugin - 0.1-stub-SNAPSHOT - - - maven-resources-plugin - 0.1-stub-SNAPSHOT - - - maven-source-plugin - 0.1-stub-SNAPSHOT - - - maven-surefire-plugin - 0.1-stub-SNAPSHOT - - - - - diff --git a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/pom.xml b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/pom.xml deleted file mode 100644 index 75f32cf59..000000000 --- a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - - org.apache.maven.its.plugins - maven-it-plugin-core-stubs - 2.1-SNAPSHOT - - - org.apache.maven.plugins - maven-source-plugin - 0.1-stub-SNAPSHOT - maven-plugin - - Maven IT Source Plugin Stub - A test plugin that has the same coordinates and goals as the Maven Source Plugin. Its goals only create marker - files to check the principle invocation of the goals via the build lifecycle binding. - 2008 - - - true - - - - - org.apache.maven - maven-plugin-api - provided - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - - - org.apache.maven - maven-compat - provided - - - diff --git a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java deleted file mode 100644 index 926bb0004..000000000 --- a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java +++ /dev/null @@ -1,84 +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.plugin.coreit; - -import java.io.File; -import java.io.IOException; - -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; -import org.apache.maven.project.MavenProject; - -/** - * Creates a text file in the project base directory. - * - * - * @author Benjamin Bentmann - * - */ -@Mojo(name = "jar", defaultPhase = LifecyclePhase.PACKAGE) -public class JarMojo extends AbstractMojo { - - /** - * The current Maven project. - */ - @Parameter(defaultValue = "${project}", required = true, readonly = true) - private MavenProject project; - - /** - * The path to the output file, relative to the project base directory. - * - */ - @Parameter - private String pathname = "target/source-jar.txt"; - - /** - * Runs this mojo. - * - * @throws MojoExecutionException If the output file could not be created. - * @throws MojoFailureException If the output file has not been set. - */ - public void execute() throws MojoExecutionException, MojoFailureException { - getLog().info("[MAVEN-CORE-IT-LOG] Using output file path: " + pathname); - - if (pathname == null || pathname.length() <= 0) { - throw new MojoFailureException("Path name for output file has not been specified"); - } - - File outputFile = new File(pathname); - if (!outputFile.isAbsolute()) { - outputFile = new File(project.getBasedir(), pathname).getAbsoluteFile(); - } - - getLog().info("[MAVEN-CORE-IT-LOG] Creating output file: " + outputFile); - - try { - outputFile.getParentFile().mkdirs(); - outputFile.createNewFile(); - } catch (IOException e) { - throw new MojoExecutionException("Output file could not be created: " + pathname, e); - } - - getLog().info("[MAVEN-CORE-IT-LOG] Created output file: " + outputFile); - } -} diff --git a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarNoFork.java b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarNoFork.java deleted file mode 100644 index 06eebde30..000000000 --- a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarNoFork.java +++ /dev/null @@ -1,29 +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.plugin.coreit; - -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; - -/** - * Creates a text file in the project base directory. - * - */ -@Mojo(name = "jar-no-fork", defaultPhase = LifecyclePhase.PACKAGE) -public class JarNoFork extends JarMojo {} diff --git a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/site/site.xml b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/site/site.xml deleted file mode 100644 index 18f84c576..000000000 --- a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/site/site.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml index d58dea999..3b4fde3c2 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml +++ b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml @@ -46,7 +46,6 @@ under the License. maven-rar-plugin maven-resources-plugin maven-site-plugin - maven-source-plugin maven-surefire-plugin maven-war-plugin