Modernize IT plugins to use annotations (#184)

* Modernize IT plugins to use annotations

* Align some tests to maven 3.8.6

# Conflicts:
#	core-it-suite/src/test/resources-filtered/bootstrap.txt
#	core-it-suite/src/test/resources/mng-3221/report/pom.xml
#	core-it-suite/src/test/resources/mng-3428/pom.xml
#	core-it-suite/src/test/resources/mng-3530/build-path/plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3530/pom-property/plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3530/resource-object/plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml
#	core-it-suite/src/test/resources/mng-3743/project/pom.xml
#	core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.1/maven-it-plugin-a-0.1.pom
#	core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.2-SNAPSHOT/maven-it-plugin-a-0.2-20090315.124508-1.pom
#	core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
#	core-it-suite/src/test/resources/mng-7310-lifecycle-activated-in-specified-module/project/pom.xml

* Add dependencies on all support artifacts to ensure multithreaded builds can use correct ordering

* Add missing dependencies on plexus-utils

* Fix for mng-7335 test

* Fix ITs for maven 4

* Rename Component -> TestComponent to leave room for the annotation

* Upgrade a few plugin versions

* Upgrade some JDK requirements to 1.8

* Remove unwanted parentheseses

* Convert the last mojo to annotations

* Force timestamped build

* Fix ITs following Component -> TestComponent rename

* Remove commented block

* Remove versions infered from plugin management

* The implementation parameter is not supported anymore

* Align maven core version

* Fix bad merge
This commit is contained in:
Guillaume Nodet 2023-01-11 13:35:56 +01:00 committed by GitHub
parent 5ec94529d2
commit 59f503bece
429 changed files with 2192 additions and 2487 deletions

View File

@ -98,13 +98,6 @@ under the License.
<version>3.3.0</version>
<!-- NOTE: Use compile scope for transitivity. -->
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>maven-it-helper</artifactId>
<version>2.1-SNAPSHOT</version>
<!-- TODO: not transitive in tests artifact, so must be left in main
scope <scope>test</scope> -->
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
@ -139,7 +132,348 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>3.6.3</version>
</dependency>
<!-- project dependencies -->
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>maven-it-plugin-bootstrap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>core-it-component</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>core-it-toolchain</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>core-it-wagon</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>maven-it-helper</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>core-it-extension</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>core-it-javaagent</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-rar-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>0.1-stub-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-active-collection</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-ant-based</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-artifact</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-class-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-context-passing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-dependency-collection</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-dependency-resolution</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-expression</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-error</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-extension-consumer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-extension-provider</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-fork</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-invalid-descriptor</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-log-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-model-interpolation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-no-default-comp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-no-project</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-online</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-optional-mojos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-packaging</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-plugin-dependency</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-project</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-project-interpolation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-setter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-singleton-component</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-site</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-toolchain</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-touch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-uses-properties</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-uses-wagon</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-all</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-plexus-utils-11</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-plexus-utils-new</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-plexus-component-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-log4j</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-extension1</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-extension2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-plexus-lifecycle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-settings</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>mng-5805-pkg-type-mojo-configuration-extension</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>mng-5805-pkg-type-mojo-configuration-extension2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>mng-5805-pkg-type-mojo-configuration-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>mng-5805-pkg-type-mojo-configuration-plugin-dep</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>mng-5958-pkg-type-extension</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>mng-6759-resolves-project-dependencies-plugin</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@ -355,7 +689,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>download-maven-distro</id>
@ -382,7 +715,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>unpack-maven-distro</id>
@ -429,7 +761,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>unpack-maven-distro</id>
@ -471,7 +802,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>copy-maven-distro</id>
@ -495,7 +825,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>inject-emma-into-core-realm</id>

View File

@ -63,7 +63,7 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest
verifier.verifyErrorFreeLog();
Properties apiProps = verifier.loadProperties( "target/component.properties" );
assertEquals( "true", apiProps.getProperty( "org.apache.maven.plugin.coreit.DefaultComponent" ) );
assertEquals( "true", apiProps.getProperty( "org.apache.maven.plugin.coreit.DefaultTestComponent" ) );
}
}

View File

@ -1,67 +0,0 @@
package org.apache.maven.it;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
import java.util.Properties;
import org.junit.jupiter.api.Test;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2293">MNG-2293</a>.
*
*
*/
public class MavenITmng2293CustomPluginParamImplTest
extends AbstractMavenIntegrationTestCase
{
public MavenITmng2293CustomPluginParamImplTest()
{
super( "(2.0.4,)" );
}
/**
* Verify that default implementation of an implementation for a complex object works as expected.
*
* @throws Exception in case of failure
*/
@Test
public void testitMNG2293()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2293" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/param.properties" );
assertEquals( "org.apache.maven.plugin.coreit.sub.AnImplementation-foobar", props.getProperty( "theParameter.string" ) );
assertEquals( "org.apache.maven.plugin.coreit.sub.AnImplementation", props.getProperty( "theParameter.class" ) );
}
}

View File

@ -71,7 +71,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "", "jar",
"69c041c12f35894230c7c23c49cd245886c6fb6f" );
assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "", "pom",
"f0abcb2aa6d99f045c013ecb2671a3a3e71bd715" );
"04a8ecb6dc279585b6d17552a4518805f0ff33b9" );
assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "tests", "jar",
"69c041c12f35894230c7c23c49cd245886c6fb6f" );
assertArtifact( verifier, gid + "a", "x", "0.2-SNAPSHOT", "sources", "jar",
@ -84,7 +84,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "", "jar",
"efb7c4046565774cd7e44645e02f06ecdf91098d" );
assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "", "pom",
"a057baebe5cdae3978b530c0bfea8b523b3d4506" );
"834b45a91af07702a59855bf99614c099979c065" );
assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "tests", "jar",
"efb7c4046565774cd7e44645e02f06ecdf91098d" );
assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "sources", "jar",
@ -99,7 +99,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "", "jar",
"1eb0d5a421b3074e8a69b0dcca7e325c0636a932" );
assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "", "pom",
"9c993bdebc7bd1b673891f203511fed9085996f3" );
"f25d7907d7bd9807e823d15f49363de7826204b0" );
assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "tests", "jar",
"1eb0d5a421b3074e8a69b0dcca7e325c0636a932" );
assertArtifact( verifier, gid + "c", "x", "0.2-SNAPSHOT", "sources", "jar",
@ -114,7 +114,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "", "jar",
"3d606c564625a594165bcbbe4a24c8f11b18b5a0" );
assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "", "pom",
"e7b6322cea42970e61316b161f79da690f042f7e" );
"4255f7a5781e1be7564a09c86eee140fad042de8" );
assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "tests", "jar",
"3d606c564625a594165bcbbe4a24c8f11b18b5a0" );
assertArtifact( verifier, gid + "d", "x", "0.2-SNAPSHOT", "sources", "jar",

View File

@ -1,73 +0,0 @@
package org.apache.maven.it;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
import java.util.Properties;
import org.junit.jupiter.api.Test;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4479">MNG-4479</a>.
*
* @author Benjamin Bentmann
*/
public class MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest
extends AbstractMavenIntegrationTestCase
{
public MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest()
{
super( "[2.0.3,2.0.99),[3.0-alpha-2,)" );
}
/**
* Verify that project-level plugin dependencies are used for direct invocations of the plugin and that they
* can contribute classes required for the plugin configuration when the plugin is declared using properties
* for its key.
*
* @throws Exception in case of failure
*/
@Test
public void testit()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4479" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4479" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "-s" );
verifier.addCliOption( "settings.xml" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-parameter-implementation:2.1-SNAPSHOT:param-implementation" );
verifier.execute();
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties( "target/param.properties" );
assertEquals( "org.apache.maven.plugin.coreit.ItImpl-passed", props.getProperty( "theParameter.string" ) );
assertEquals( "org.apache.maven.plugin.coreit.ItImpl", props.getProperty( "theParameter.class" ) );
}
}

View File

@ -43,6 +43,8 @@ public class MavenITmng5669ReadPomsOnce
extends AbstractMavenIntegrationTestCase
{
private static final int LOG_SIZE = 233;
public MavenITmng5669ReadPomsOnce()
{
super( "[4.0.0-alpha-1,)" );
@ -57,7 +59,7 @@ public class MavenITmng5669ReadPomsOnce
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
Map<String, String> filterProperties =
Collections.singletonMap( "${javaAgentJar}",
verifier.getArtifactPath( "mng-coreit", "javaagent", "1.0-SNAPSHOT", "jar" ) );
verifier.getArtifactPath( "org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar" ) );
verifier.filterFile( ".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties );
verifier.setForkJvm( true ); // pick up agent
@ -78,10 +80,10 @@ public class MavenITmng5669ReadPomsOnce
break;
}
}
assertEquals( logTxt.toString(), 202, logTxt.size() );
assertEquals( logTxt.toString(), LOG_SIZE, logTxt.size() );
// analyze lines. It is a Hashmap, so we can't rely on the order
Set<String> uniqueBuildingSources = new HashSet<>( 202 );
Set<String> uniqueBuildingSources = new HashSet<>( LOG_SIZE );
final String buildSourceKey = "org.apache.maven.model.building.source=";
final int keyLength = buildSourceKey.length();
for ( String line : logTxt )
@ -99,7 +101,7 @@ public class MavenITmng5669ReadPomsOnce
}
uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
}
assertEquals( uniqueBuildingSources.size(), 201 /* is 202 minus superpom */ );
assertEquals( uniqueBuildingSources.size(), LOG_SIZE - 1 /* minus superpom */ );
}
@Test
@ -111,7 +113,7 @@ public class MavenITmng5669ReadPomsOnce
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
Map<String, String> filterProperties =
Collections.singletonMap( "${javaAgentJar}",
verifier.getArtifactPath( "mng-coreit", "javaagent", "1.0-SNAPSHOT", "jar" ) );
verifier.getArtifactPath( "org.apache.maven.its", "core-it-javaagent", "2.1-SNAPSHOT", "jar" ) );
verifier.filterFile( ".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties );
verifier.setLogFileName( "log-bc.txt" );
@ -133,11 +135,11 @@ public class MavenITmng5669ReadPomsOnce
break;
}
}
assertEquals( logTxt.toString(), 202 + 4 /* reactor poms are read twice: file + raw (=XMLFilters) */,
assertEquals( logTxt.toString(), LOG_SIZE + 4 /* reactor poms are read twice: file + raw (=XMLFilters) */,
logTxt.size() );
// analyze lines. It is a Hashmap, so we can't rely on the order
Set<String> uniqueBuildingSources = new HashSet<>( 202 );
Set<String> uniqueBuildingSources = new HashSet<>( LOG_SIZE );
final String buildSourceKey = "org.apache.maven.model.building.source=";
final int keyLength = buildSourceKey.length();
for ( String line : logTxt )
@ -155,7 +157,7 @@ public class MavenITmng5669ReadPomsOnce
}
uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
}
assertEquals( uniqueBuildingSources.size(), 201 /* is 202 minus superpom */ );
assertEquals( uniqueBuildingSources.size(), LOG_SIZE - 1 /* minus superpom */ );
}
}

View File

@ -294,7 +294,6 @@ public class TestSuiteOrdering implements ClassOrderer
suite.addTestSuite( MavenITmng4489MirroringOfExtensionRepoTest.class );
suite.addTestSuite( MavenITmng4488ValidateExternalParenPomLenientTest.class );
suite.addTestSuite( MavenITmng4482ForcePluginSnapshotUpdateTest.class );
suite.addTestSuite( MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.class );
suite.addTestSuite( MavenITmng4474PerLookupWagonInstantiationTest.class );
suite.addTestSuite( MavenITmng4470AuthenticatedDeploymentToProxyTest.class );
suite.addTestSuite( MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.class );
@ -600,7 +599,6 @@ public class TestSuiteOrdering implements ClassOrderer
suite.addTestSuite( MavenITmng2318LocalParentResolutionTest.class );
suite.addTestSuite( MavenITmng2309ProfileInjectionOrderTest.class );
suite.addTestSuite( MavenITmng2305MultipleProxiesTest.class );
suite.addTestSuite( MavenITmng2293CustomPluginParamImplTest.class );
suite.addTestSuite( MavenITmng2277AggregatorAndResolutionPluginsTest.class );
suite.addTestSuite( MavenITmng2276ProfileActivationBySettingsPropertyTest.class );
suite.addTestSuite( MavenITmng2254PomEncodingTest.class );

View File

@ -39,7 +39,6 @@ org.apache.maven.its.plugins:maven-it-plugin-no-project:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-online:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-optional-mojos:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-packaging:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-parameter-implementation:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-plexus-component-api:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-plexus-utils-11:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-plexus-utils-new:${project.version}
@ -62,14 +61,14 @@ org.apache.maven.its:core-it-wagon:${project.version}
org.apache.maven.its:maven-core-it-support:1.0
org.apache.maven.its:maven-core-it-support:1.3
org.apache.maven.its:maven-core-it-support:1.4
org.apache.maven.plugin-tools:maven-plugin-annotations:3.3
org.apache.maven.plugins:maven-antrun-plugin:3.0.0
org.apache.maven.plugins:maven-assembly-plugin:2.2-beta-5
org.apache.maven.plugins:maven-assembly-plugin:3.1.0
org.apache.maven.plugins:maven-clean-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-clean-plugin:2.5
org.apache.maven.plugins:maven-clean-plugin:3.1.0
org.apache.maven.plugins:maven-clean-plugin:3.2.0
org.apache.maven.plugins:maven-compiler-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-compiler-plugin:2.0.2
org.apache.maven.plugins:maven-compiler-plugin:3.1
org.apache.maven.plugins:maven-compiler-plugin:3.8.1
org.apache.maven.plugins:maven-compiler-plugin:3.10.1
@ -79,43 +78,35 @@ org.apache.maven.plugins:maven-dependency-plugin:3.1.1
org.apache.maven.plugins:maven-dependency-plugin:3.3.0
org.apache.maven.plugins:maven-deploy-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-deploy-plugin:2.7
org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1
org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M2
org.apache.maven.plugins:maven-deploy-plugin:3.0.0
org.apache.maven.plugins:maven-ear-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-ear-plugin:2.8
org.apache.maven.plugins:maven-ear-plugin:3.2.0
org.apache.maven.plugins:maven-ejb-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-ejb-plugin:2.5.1
org.apache.maven.plugins:maven-ejb-plugin:3.1.0
org.apache.maven.plugins:maven-install-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-install-plugin:2.4
org.apache.maven.plugins:maven-install-plugin:2.5.2
org.apache.maven.plugins:maven-install-plugin:3.0.0-M1
org.apache.maven.plugins:maven-install-plugin:3.0.1
org.apache.maven.plugins:maven-jar-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-jar-plugin:2.2
org.apache.maven.plugins:maven-jar-plugin:2.4
org.apache.maven.plugins:maven-jar-plugin:3.2.0
org.apache.maven.plugins:maven-jar-plugin:3.3.0
org.apache.maven.plugins:maven-javadoc-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-plugin-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-plugin-plugin:3.2
org.apache.maven.plugins:maven-plugin-plugin:3.3
org.apache.maven.plugins:maven-plugin-plugin:3.6.0
org.apache.maven.plugins:maven-rar-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-release-plugin:2.5.3
org.apache.maven.plugins:maven-release-plugin:3.0.0-M5
org.apache.maven.plugins:maven-resources-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-resources-plugin:2.6
org.apache.maven.plugins:maven-resources-plugin:2.7
org.apache.maven.plugins:maven-resources-plugin:3.2.0
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.2
org.apache.maven.plugins:maven-site-plugin:3.3
org.apache.maven.plugins:maven-site-plugin:3.9.1
org.apache.maven.plugins:maven-source-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-surefire-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-surefire-plugin:2.12.4
org.apache.maven.plugins:maven-surefire-plugin:2.22.0
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7
org.apache.maven.plugins:maven-war-plugin:${stubPluginVersion}
org.apache.maven.plugins:maven-war-plugin:2.6
org.apache.maven.plugins:maven-war-plugin:3.3.2
org.apache.maven.plugins:maven-wrapper-plugin:3.1.0
org.apache.maven.reporting:maven-reporting-exec:1.1
org.apache.maven.resolver:maven-resolver-api:1.7.3
org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3
org.apache.maven.resolver:maven-resolver-impl:1.7.3
@ -124,16 +115,11 @@ org.apache.maven.resolver:maven-resolver-util:1.7.3
org.apache.maven.shared:maven-artifact-transfer:0.11.0
org.apache.maven.shared:maven-common-artifact-filters:3.1.0
org.apache.maven.shared:maven-shared-utils:3.3.3
org.apache.maven.skins:maven-default-skin:1.0
org.apache.maven.surefire:surefire-junit4:2.12.4
org.apache.maven.surefire:surefire-junit4:2.22.0
org.apache.maven.wagon:wagon-webdav-jackrabbit:2.0
org.apache.maven.skins:maven-default-skin:1.3
org.apache.maven.surefire:surefire-junit4:3.0.0-M7
org.apache.maven.wagon:wagon-webdav-jackrabbit:2.10
org.apache.maven:maven-aether-provider:3.1.1
org.apache.maven:maven-artifact-manager:2.1.0
org.apache.maven:maven-core:3.1.0
org.apache.maven:maven-core:3.3.1
org.apache.maven:maven-model:2.1.0
org.apache.maven.wagon:wagon-webdav:1.0-beta-2
org.apache.maven:maven-core:3.8.6
org.apache.maven:maven-plugin-api:3.1.0
org.apache.maven:maven-plugin-api:3.2.5
org.apache.maven:maven-plugin-registry:2.1.0
@ -141,10 +127,9 @@ org.apache.maven:maven-profile:2.1.0
org.apache.maven:maven-project:2.1.0
org.apache.maven:maven-repository-metadata:2.1.0
org.apache.maven:maven-repository-metadata:3.1.1
org.apache.maven:maven-resolver-provider:3.8.6
org.apache.maven:maven-script-ant:2.1.0
org.apache.maven:maven-settings-builder:3.1.1
org.apache.maven:maven-settings:2.0
org.apache.maven:maven-settings:2.1.0
org.apache.maven:maven-settings:3.1.1
org.codehaus.gmavenplus:gmavenplus-plugin:1.11.0
org.codehaus.mojo:flatten-maven-plugin:1.0.0
@ -152,6 +137,7 @@ org.codehaus.plexus:plexus-classworlds:2.5.1
org.codehaus.plexus:plexus-component-annotations:1.5.5
org.codehaus.plexus:plexus-component-metadata:1.5.5
org.codehaus.plexus:plexus-container-default:1.5.5
org.codehaus.plexus:plexus-io:1.0
org.codehaus.plexus:plexus-java:1.0.5
org.codehaus.plexus:plexus-utils:1.1
org.codehaus.plexus:plexus-utils:1.4.5

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<!--

View File

@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>

View File

@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<!--

View File

@ -1 +1 @@
9a1d5d7341340153a6b44ae5ee5f183e
ed17d782a3727e5edf5a8b672d3b235a

View File

@ -1 +1 @@
e1d55c712d06c8e149685a5f71715cdc55e2efbd
126f797cdce826d98f1a80617ed491a2a63337b7

View File

@ -50,7 +50,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</project>

View File

@ -1 +1 @@
bbddd843a4d55c67b34a2fdec1c6d94f
ae87252c2c73b22833c5c91e1fbafaa1

View File

@ -1 +1 @@
c143f32cfa614a461dc638b17d0c8efaf46782e4
dbd5509a21484155dfdeb1eb13f59892e129f631

View File

@ -1,37 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng2293</groupId>
<artifactId>test</artifactId>
<version>3.8.1</version>
<packaging>pom</packaging>
<name>Maven Integration Test :: MNG-2293</name>
<description>
Verify that default implementation of an implementation for a complex object works as expected.
</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-parameter-implementation</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>param-implementation</goal>
</goals>
<configuration>
<outputFile>target/param.properties</outputFile>
<theParameter>
<field>foobar</field>
</theParameter>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>

View File

@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -18,7 +18,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<version>3.0.0-M7</version>
<configuration>
<forkMode>once</forkMode>
<workingDirectory>${basedir}</workingDirectory>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0.8</version>
<version>3.8.6</version>
</dependency>
<!-- These are directly from MNG-3372, but we need something that can actually resolve.

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</project>

View File

@ -41,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>3.3.0</version>
<executions>
<execution>
<id>tests</id>
@ -53,7 +53,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
<version>3.2.1</version>
<executions>
<execution>
<id>sources</id>
@ -65,7 +65,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<version>3.4.0</version>
<executions>
<execution>
<id>apidocs</id>

View File

@ -41,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>3.3.0</version>
<executions>
<execution>
<id>tests</id>
@ -53,7 +53,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
<version>3.2.1</version>
<executions>
<execution>
<id>sources</id>
@ -65,7 +65,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<version>3.4.0</version>
<executions>
<execution>
<id>apidocs</id>

View File

@ -41,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>3.3.0</version>
<executions>
<execution>
<id>tests</id>
@ -53,7 +53,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
<version>3.2.1</version>
<executions>
<execution>
<id>sources</id>
@ -65,7 +65,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<version>3.4.0</version>
<executions>
<execution>
<id>apidocs</id>

View File

@ -41,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>3.3.0</version>
<executions>
<execution>
<id>tests</id>
@ -53,7 +53,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
<version>3.2.1</version>
<executions>
<execution>
<id>sources</id>
@ -65,7 +65,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<version>3.4.0</version>
<executions>
<execution>
<id>apidocs</id>

View File

@ -16,7 +16,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</project>

View File

@ -16,7 +16,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</project>

View File

@ -25,7 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<version>3.0.0-M7</version>
</plugin>
</plugins>
</pluginManagement>

View File

@ -31,7 +31,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.its.mng3586</groupId>

View File

@ -8,26 +8,28 @@
<name>test-plugin Maven Mojo</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>3.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.0-beta-3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
<version>3.8.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.0-beta-3</version>
<version>3.8.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>3.8.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
</dependencies>
</project>

View File

@ -19,7 +19,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<version>3.10.1</version>
<dependencies>
<dependency>
<groupId>junit</groupId>

View File

@ -11,7 +11,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -11,7 +11,7 @@
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>3.9.1</version>
</plugin>
</plugins>
</pluginManagement>

View File

@ -11,7 +11,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -11,7 +11,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -11,7 +11,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -19,7 +19,7 @@
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>3.9.1</version>
</plugin>
</plugins>
</pluginManagement>

View File

@ -9,7 +9,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -9,7 +9,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -9,7 +9,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -14,7 +14,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</project>

View File

@ -14,7 +14,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</project>

View File

@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -44,7 +44,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -44,7 +44,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -44,7 +44,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -38,7 +38,7 @@ under the License.
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>2.0</version>
<version>2.10</version>
</extension>
<!--
FWIW, adding the extension below would make the test pass but it has to work with the bundled wagon, too.

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -62,7 +62,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<!-- That's the dependency that needs to be resolved from the repo given in this POM -->

View File

@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -47,7 +47,7 @@ under the License.
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>2.0</version>
<version>2.10</version>
</extension>
</extensions>
<plugins>

View File

@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -1,71 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng4479</groupId>
<artifactId>test</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
<name>Maven Integration Test :: MNG-4479</name>
<description>
Verify that project-level plugin dependencies are used for direct invocations of the plugin and that they
can contribute classes required for the plugin configuration when the plugin is declared using properties
for its key.
</description>
<properties>
<pluginGroupId>org.apache.maven.its.plugins</pluginGroupId>
<pluginArtifactId>maven-it-plugin-parameter-implementation</pluginArtifactId>
</properties>
<build>
<plugins>
<plugin>
<!-- NOTE: It's the essential part of the test to use properties for the plugin key -->
<groupId>${pluginGroupId}</groupId>
<artifactId>${pluginArtifactId}</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
<outputFile>target/param.properties</outputFile>
<!-- The implementation class for this parameter needs to be loaded from the dependency below -->
<theParameter implementation="org.apache.maven.plugin.coreit.ItImpl">
<field>passed</field>
</theParameter>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.its.mng4479</groupId>
<artifactId>dep</artifactId>
<version>0.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<!-- NOTE: The presence of another plugin declaration is crucial to trigger the bug -->
<artifactId>maven-resources-plugin</artifactId>
<version>2.1</version>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,3 +0,0 @@
*.pom text eol=lf
maven-metadata.xml text eol=lf

View File

@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng4479</groupId>
<artifactId>dep</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
<name>Maven Integration Test :: MNG-4479 :: Plugin Dependency</name>
<distributionManagement>
<repository>
<id>maven-core-it</id>
<url>file:///${basedir}/repo</url>
</repository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-parameter-implementation</artifactId>
<version>2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>pom.xml</include>
<include>src/**</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.apache.maven.its.mng4479</groupId>
<artifactId>dep</artifactId>
<version>0.1</version>
<versioning>
<versions>
<version>0.1</version>
</versions>
<lastUpdated>20091206230357</lastUpdated>
</versioning>
</metadata>

View File

@ -1,55 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<settings>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<repositories>
<repository>
<id>maven-core-it</id>
<url>@baseurl@/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>maven-core-it</id>
<url>@baseurl@/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>maven-core-it-repo</activeProfile>
</activeProfiles>
</settings>

View File

@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -40,7 +40,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
<dependency>
<!-- this dependency needs to be resolved from the repo in this POM -->

View File

@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.8.6</version>
</dependency>
</dependencies>

View File

@ -1 +1 @@
3f95d29de76828655789e5785026d174
cb030c26156526e8f31390ccd1b8462c

View File

@ -1 +1 @@
c922024196f921779ed781a49cf18935496638d9
ba39882edd1776397321bbd8d0dd14cb71f06554

Some files were not shown because too many files have changed in this diff Show More