Repository: maven-integration-testing Updated Branches: refs/heads/MNG-5958 885253820 -> 1e4c7c36b
[MNG-5958] restore binary compatibility of Lifecycle.setPhases Modify tests for MNG-5805 This closes #18 Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/1e4c7c36 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/1e4c7c36 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/1e4c7c36 Branch: refs/heads/MNG-5958 Commit: 1e4c7c36bd1d7fb4bc0a1a6335c4778ee58a664e Parents: 8852538 Author: Anton Tanasenko <atg.sleepl...@gmail.com> Authored: Mon Jan 16 01:01:28 2017 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Mon Jan 16 02:35:46 2017 +0100 ---------------------------------------------------------------------- .../apache/maven/it/IntegrationTestSuite.java | 1 + .../MavenITmng5805PkgTypeMojoConfiguration.java | 2 +- ...MavenITmng5805PkgTypeMojoConfiguration2.java | 30 +++++++++ .../test/resources/bootstrap/group-3/pom.xml | 6 ++ .../pom.xml | 40 +++++++++++ .../resources/META-INF/plexus/components.xml | 4 +- .../core-it-plugins/mng5805-extension2/pom.xml | 37 ++++++++++ .../resources/META-INF/plexus/components.xml | 71 ++++++++++++++++++++ core-it-support/core-it-plugins/pom.xml | 1 + 9 files changed, 189 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index c4fdbd5..7171aee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -111,6 +111,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5840ParentVersionRanges.class ); suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class ); suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class ); + suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class ); suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class ); suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class ); suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java index ada7448..5335677 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java @@ -10,7 +10,7 @@ public class MavenITmng5805PkgTypeMojoConfiguration public MavenITmng5805PkgTypeMojoConfiguration() { - super( "(3.3.3,)" ); + super( "(3.3.3,3.5.0)" ); } public void testPkgTypeMojoConfiguration() http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java new file mode 100644 index 0000000..ca1c0e3 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java @@ -0,0 +1,30 @@ +package org.apache.maven.it; + +import java.io.File; + +import org.apache.maven.it.util.ResourceExtractor; + +public class MavenITmng5805PkgTypeMojoConfiguration2 + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5805PkgTypeMojoConfiguration2() + { + super( "(3.3.3,)" ); + } + + public void testPkgTypeMojoConfiguration() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5805-pkg-type-mojo-configuration2" ); + + Verifier verifier; + + + verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.verifyTextInLog( "CLASS_NAME=org.apache.maven.its.mng5805.TestClass1" ); + verifier.resetStreams(); + } +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml index 8250ce9..9731869 100644 --- a/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml +++ b/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml @@ -138,6 +138,12 @@ under the License. </dependency> <dependency> <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>mng-5805-pkg-type-mojo-configuration-extension2</artifactId> + <version>${itPluginVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.its.plugins</groupId> <artifactId>mng-5958-pkg-type-extension</artifactId> <version>${itPluginVersion}</version> <scope>runtime</scope> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml new file mode 100644 index 0000000..b7e12f1 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>mng-5805-pkg-type-mojo-configuration</groupId> + <artifactId>mng-5805-pkg-type-mojo-configuration-project2</artifactId> + <version>0.1</version> + <packaging>mng5805</packaging> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>mng-5805-pkg-type-mojo-configuration-extension2</artifactId> + <version>2.1-SNAPSHOT</version> + </extension> + </extensions> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml b/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml index a07744d..e7fb615 100644 --- a/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml +++ b/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml @@ -28,7 +28,7 @@ under the License. <lifecycles> <lifecycle> <id>default</id> - <lifecyclePhases> + <phases> <validate> <mojos> <mojo> @@ -48,7 +48,7 @@ under the License. </mojo> </mojos> </validate> - </lifecyclePhases> + </phases> </lifecycle> </lifecycles> </configuration> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-support/core-it-plugins/mng5805-extension2/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/mng5805-extension2/pom.xml b/core-it-support/core-it-plugins/mng5805-extension2/pom.xml new file mode 100644 index 0000000..c6a24f6 --- /dev/null +++ b/core-it-support/core-it-plugins/mng5805-extension2/pom.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>maven-it-plugins</artifactId> + <groupId>org.apache.maven.its.plugins</groupId> + <version>2.1-SNAPSHOT</version> + </parent> + + <artifactId>mng-5805-pkg-type-mojo-configuration-extension2</artifactId> + <packaging>jar</packaging> + + <name>Maven IT Plugin :: mng-5805 extension mk2</name> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml b/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml new file mode 100644 index 0000000..a07744d --- /dev/null +++ b/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml @@ -0,0 +1,71 @@ +<?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. +--> +<component-set> + <components> + + <component> + <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role> + <role-hint>mng5805</role-hint> + <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation> + <configuration> + <lifecycles> + <lifecycle> + <id>default</id> + <lifecyclePhases> + <validate> + <mojos> + <mojo> + <goal> + org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-plugin:2.1-SNAPSHOT:test + </goal> + <configuration> + <className>org.apache.maven.its.mng5805.TestClass1</className> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>mng-5805-pkg-type-mojo-configuration-plugin-dep</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + </dependencies> + </mojo> + </mojos> + </validate> + </lifecyclePhases> + </lifecycle> + </lifecycles> + </configuration> + </component> + + <component> + <role>org.apache.maven.artifact.handler.ArtifactHandler</role> + <role-hint>mng5805</role-hint> + <implementation> + org.apache.maven.artifact.handler.DefaultArtifactHandler + </implementation> + <configuration> + <extension>zip</extension> + <type>mng5805</type> + <packaging>mng5805</packaging> + </configuration> + </component> + + </components> +</component-set> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-support/core-it-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-support/core-it-plugins/pom.xml b/core-it-support/core-it-plugins/pom.xml index 93abe85..c301aae 100644 --- a/core-it-support/core-it-plugins/pom.xml +++ b/core-it-support/core-it-plugins/pom.xml @@ -79,6 +79,7 @@ under the License. <module>maven-it-plugin-plexus-lifecycle</module> <module>maven-it-plugin-settings</module> <module>mng5805-extension</module> + <module>mng5805-extension2</module> <module>mng5805-plugin</module> <module>mng5805-plugin-dep</module> <module>mng5958-extension</module>
