From 849a1bdb610e996ab2b06259a7cd5649847f2965 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 20 Dec 2015 19:34:40 +0100 Subject: [PATCH 01/16] [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression) --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...nExecutionDeclarationInPluginMgmtTest.java | 58 +++++++++++++++ .../src/test/resources/mng-5359/pom.xml | 74 +++++++++++++++++++ .../org/apache/maven/its/mng5359/App.java | 13 ++++ 4 files changed, 146 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java create mode 100644 core-it-suite/src/test/resources/mng-5359/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5359/src/main/java/org/apache/maven/its/mng5359/App.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 0d63f7e1a..9b35d1570 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 @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.class ); suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class ); suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class ); suite.addTestSuite( MavenITmng5895CIFriendlyUsageWithPropertyTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java new file mode 100644 index 000000000..062f85dfd --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java @@ -0,0 +1,58 @@ +package org.apache.maven.it; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; + +/** + * This is a test set for MNG-5359. + * + * @author Anders Hammar + */ +public class MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest() + { + // Might work with versions before 2.0.11, but not verified + super( "[2.0.11,3.0-alpha-1),[3.4.0,)" ); + } + + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5359" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); + + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng5359" ); + + verifier.executeGoal( "install" ); // will fail if clean plugin is executed + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertArtifactPresent( "org.apache.maven.its.mng5359", "test", "0.1-SNAPSHOT", "jar" ); + } +} diff --git a/core-it-suite/src/test/resources/mng-5359/pom.xml b/core-it-suite/src/test/resources/mng-5359/pom.xml new file mode 100644 index 000000000..8b13d9d7d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5359/pom.xml @@ -0,0 +1,74 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5359 + test + 0.1-SNAPSHOT + jar + + Maven Integration Test :: MNG-5359 + + Verifies that an execution of maven-clean-plugin declared in pluginManagement doesn't make it bound to the build lifecycle. + + + + UTF-8 + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.5 + + + auto-clean + package + + clean + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + + diff --git a/core-it-suite/src/test/resources/mng-5359/src/main/java/org/apache/maven/its/mng5359/App.java b/core-it-suite/src/test/resources/mng-5359/src/main/java/org/apache/maven/its/mng5359/App.java new file mode 100644 index 000000000..2f61c7df4 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5359/src/main/java/org/apache/maven/its/mng5359/App.java @@ -0,0 +1,13 @@ +package org.apache.maven.its.mng5359; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} From d6d0e0573c13138029fbfb926e5ff12a81d2d717 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sat, 30 Jan 2016 20:21:33 +0100 Subject: [PATCH 02/16] [MNG-4463] Dependency management import should support version ranges. --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...pendencyManagementImportVersionRanges.java | 108 ++++++++++++++++++ .../mng-4463/exclusive-upper-bound/pom.xml | 76 ++++++++++++ .../mng-4463/inclusive-upper-bound/pom.xml | 76 ++++++++++++ .../resources/mng-4463/no-upper-bound/pom.xml | 54 +++++++++ 5 files changed, 315 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java create mode 100644 core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml 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 9b35d1570..e49b462cd 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 @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class ); suite.addTestSuite( MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.class ); suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class ); suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java new file mode 100644 index 000000000..a6f548c6f --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java @@ -0,0 +1,108 @@ +/* + * Copyright 2016 The Apache Software Foundation. + * + * Licensed 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.util.List; +import java.util.regex.Pattern; +import org.apache.maven.it.util.ResourceExtractor; +import static junit.framework.Assert.assertTrue; + +/** + * Integration tests for MNG-4463. + * + * @author Christian Schulte + */ +public class MavenITmng4463DependencyManagementImportVersionRanges + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4463DependencyManagementImportVersionRanges() + { + super( "[3.4.0,)" ); + } + + public void testInclusiveUpperBoundResolvesToHighestVersion() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/inclusive-upper-bound" ); + final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) ); + } + + public void testExclusiveUpperBoundResolvesToHighestVersion() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/exclusive-upper-bound" ); + final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) ); + } + + public void testFailureWithoutUpperBound() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/no-upper-bound" ); + final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); + + try + { + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + fail( "Expected 'VerificationException' not thrown." ); + } + catch ( final VerificationException e ) + { + final List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); + assertTrue( "Expected error message not found.", + indexOf( lines, ".*dependency version range.*does not specify an upper bound.*" ) >= 0 ); + } + finally + { + verifier.resetStreams(); + } + } + + private static int indexOf( final List logLines, final String regex ) + { + final Pattern pattern = Pattern.compile( regex ); + + for ( int i = 0, l0 = logLines.size(); i < l0; i++ ) + { + if ( pattern.matcher( logLines.get( i ) ).matches() ) + { + return i; + } + } + + return -1; + } + +} diff --git a/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml new file mode 100644 index 000000000..54404ac24 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml @@ -0,0 +1,76 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4463 + test + 1.0 + jar + + Maven Integration Test :: MNG-4463 + + Tests that importing dependency management using version ranges + with exclusive upper bound resolves to the highest version. + + + + + + org.apache.maven + maven + (,3.0.1) + pom + import + + + + + + + org.apache.maven + maven-plugin-api + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + test + validate + + compile + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml new file mode 100644 index 000000000..0e91b01e7 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml @@ -0,0 +1,76 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4463 + test + 1.0 + jar + + Maven Integration Test :: MNG-4463 + + Tests that importing dependency management using version ranges + with inclusive upper bound resolves to the highest version. + + + + + + org.apache.maven + maven + (,3.0] + pom + import + + + + + + + org.apache.maven + maven-plugin-api + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + test + validate + + compile + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml new file mode 100644 index 000000000..53ec4e313 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml @@ -0,0 +1,54 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4463 + test + 1.0 + jar + + Maven Integration Test :: MNG-4463 + + Tests that importing dependency management using version ranges + without upper bound fails. + + + + + + org.apache.maven + maven + (3.0,) + pom + import + + + + + + + org.apache.maven + maven-plugin-api + + + From b440c1c5c5b190ed7f548f3e80d8c3e2d90d5d57 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Wed, 22 Jun 2016 17:41:42 +0200 Subject: [PATCH 03/16] [MNG-5527] Dependency management import should support relocations. --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...ndencyManagementImportRelocationsTest.java | 74 +++++++++++++++++++ .../resources/mng-5527/relocations/pom.xml | 72 ++++++++++++++++++ .../its/mng5527/relocated1/bom/0/bom-0.pom | 48 ++++++++++++ .../its/mng5527/relocated2/bom/0/bom-0.pom | 48 ++++++++++++ .../its/mng5527/relocated3/bom/0/bom-0.pom | 39 ++++++++++ .../resources/mng-5527/settings-template.xml | 43 +++++++++++ 7 files changed, 325 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java create mode 100644 core-it-suite/src/test/resources/mng-5527/relocations/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated1/bom/0/bom-0.pom create mode 100644 core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated2/bom/0/bom-0.pom create mode 100644 core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated3/bom/0/bom-0.pom create mode 100644 core-it-suite/src/test/resources/mng-5527/settings-template.xml 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 e49b462cd..cc884b171 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 @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class ); suite.addTestSuite( MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.class ); suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java new file mode 100644 index 000000000..27c9360c7 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java @@ -0,0 +1,74 @@ +package org.apache.maven.it; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.util.Arrays; +import java.util.Map; +import java.util.Properties; + +import org.apache.maven.it.util.ResourceExtractor; + +import static junit.framework.Assert.assertEquals; + +/** + * [MNG-5527] Dependency management import should support relocations. + * + * @author Christian Schulte + */ +public class MavenITmng5527DependencyManagementImportRelocationsTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5527DependencyManagementImportRelocationsTest() + { + super( "[3.4.0,)" ); + } + + public void testCanRelocateDependencyManagementImport() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5527/relocations" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.verifyTextInLog( "LEVEL_1" ); + verifier.verifyTextInLog( "LEVEL_2" ); + + final Properties properties = verifier.loadProperties( "target/project.properties" ); + assertEquals( "1", properties.getProperty( "project.dependencyManagement.dependencies" ) ); + assertEquals( "group-id-to-import:artifact-id-to-import:jar", + properties.getProperty( "project.dependencyManagement.dependencies.0.managementKey" ) ); + + } + +} diff --git a/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml b/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml new file mode 100644 index 000000000..822f1cf04 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml @@ -0,0 +1,72 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5527 + 0 + 2016062 + pom + + Maven Integration Test :: MNG-5527 + + + Tests that dependency management import relocations are supported. + + + + + + org.apache.maven.its.mng5527.relocated1 + bom + 0 + pom + import + + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + + verify + + eval + + + + project/dependencyManagement + + ${project.build.directory}/project.properties + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated1/bom/0/bom-0.pom b/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated1/bom/0/bom-0.pom new file mode 100644 index 000000000..9fd2234df --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated1/bom/0/bom-0.pom @@ -0,0 +1,48 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5527.relocated1 + bom + 0 + pom + + + + + level1-group-id-must-not-be-imported + level1-artifact-id-must-not-be-imported + level1-version-must-not-be-imported + + + + + + + org.apache.maven.its.mng5527.relocated2 + bom + 0 + LEVEL_1 + + + diff --git a/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated2/bom/0/bom-0.pom b/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated2/bom/0/bom-0.pom new file mode 100644 index 000000000..cc5aa27e7 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated2/bom/0/bom-0.pom @@ -0,0 +1,48 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5527.relocated2 + bom + 0 + pom + + + + + level2-group-id-must-not-be-imported + level2-artifact-id-must-not-be-imported + level2-version-must-not-be-imported + + + + + + + org.apache.maven.its.mng5527.relocated3 + bom + 0 + LEVEL_2 + + + diff --git a/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated3/bom/0/bom-0.pom b/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated3/bom/0/bom-0.pom new file mode 100644 index 000000000..35c729ecc --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5527/repo/org/apache/maven/its/mng5527/relocated3/bom/0/bom-0.pom @@ -0,0 +1,39 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5527.relocated3 + bom + 0 + pom + + + + + group-id-to-import + artifact-id-to-import + version-to-import + + + + diff --git a/core-it-suite/src/test/resources/mng-5527/settings-template.xml b/core-it-suite/src/test/resources/mng-5527/settings-template.xml new file mode 100644 index 000000000..f22a7f357 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5527/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/../repo + + ignore + + + false + + + + + + + maven-core-it-repo + + From d02d27fbb929a967d80d6bd8fc1b9e8d061680ac Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 19 Jun 2016 17:18:51 +0200 Subject: [PATCH 04/16] [MNG-5600] Dependency management import should support exclusions. --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...endencyManagementImportExclusionsTest.java | 82 ++++++++++++++++++ .../resources/mng-5600/exclusions/pom.xml | 84 +++++++++++++++++++ .../apache/maven/its/mng5600/bom/0/bom-0.pom | 44 ++++++++++ .../resources/mng-5600/settings-template.xml | 43 ++++++++++ 5 files changed, 254 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java create mode 100644 core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom create mode 100644 core-it-suite/src/test/resources/mng-5600/settings-template.xml 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 cc884b171..1ade8b303 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 @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng5600DependencyManagementImportExclusionsTest.class ); suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class ); suite.addTestSuite( MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java new file mode 100644 index 000000000..648f7450f --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java @@ -0,0 +1,82 @@ +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.util.Arrays; +import java.util.Map; +import java.util.Properties; + +import org.apache.maven.it.util.ResourceExtractor; + +import static junit.framework.Assert.assertEquals; + +/** + * [MNG-5600] Dependency management import should support exclusions. + * + * @author Christian Schulte + */ +public class MavenITmng5600DependencyManagementImportExclusionsTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5600DependencyManagementImportExclusionsTest() + { + super( "[3.4.0,)" ); + } + + public void testCanExcludeDependenciesFromImport() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5600/exclusions" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final Properties properties = verifier.loadProperties( "target/project.properties" ); + assertEquals( "1", properties.getProperty( "project.dependencyManagement.dependencies" ) ); + assertEquals( "commons-lang:commons-lang:jar", + properties.getProperty( "project.dependencyManagement.dependencies.0.managementKey" ) ); + + assertEquals( "2", properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions" ) ); + assertEquals( "commons-io", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.0.groupId" ) ); + + assertEquals( "commons-io", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.0.artifactId" ) ); + + assertEquals( "commons-logging", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.1.groupId" ) ); + + assertEquals( "commons-logging", + properties.getProperty( "project.dependencyManagement.dependencies.0.exclusions.1.artifactId" ) ); + } + +} diff --git a/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml b/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml new file mode 100644 index 000000000..dc068369d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml @@ -0,0 +1,84 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5600 + 0 + 20160619 + pom + + Maven Integration Test :: MNG-5600 + + + Tests that dependency management import exclusions are supported. + + + + + + org.apache.maven.its.mng5600 + bom + 0 + pom + import + + + + commons-io + commons-io + + + + commons-logging + commons-logging + + + + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + + verify + + eval + + + + project/dependencyManagement + + ${project.build.directory}/project.properties + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom b/core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom new file mode 100644 index 000000000..6598212c4 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5600/repo/org/apache/maven/its/mng5600/bom/0/bom-0.pom @@ -0,0 +1,44 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5600 + bom + 0 + pom + + + + + commons-io + commons-io + 2.5 + + + commons-lang + commons-lang + 2.6 + + + + diff --git a/core-it-suite/src/test/resources/mng-5600/settings-template.xml b/core-it-suite/src/test/resources/mng-5600/settings-template.xml new file mode 100644 index 000000000..f22a7f357 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5600/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/../repo + + ignore + + + false + + + + + + + maven-core-it-repo + + From 33dbd8c3bfa9909989ace6e4688de57aed35646b Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sat, 20 Feb 2016 14:42:20 +0100 Subject: [PATCH 05/16] [MNG-5971] Imported dependencies should be available to inheritance processing --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...nITmng5971HierarchicalImportScopeTest.java | 204 ++++++++++++++++++ .../test/resources/mng-5971/conflict/pom.xml | 100 +++++++++ .../include-properties/1/2/3/4/pom.xml | 47 ++++ .../mng-5971/include-properties/1/2/3/pom.xml | 51 +++++ .../mng-5971/include-properties/1/2/pom.xml | 50 +++++ .../mng-5971/include-properties/1/pom.xml | 50 +++++ .../mng-5971/include-properties/pom.xml | 80 +++++++ .../mng-5971/inheritance/1/2/3/pom.xml | 46 ++++ .../mng-5971/inheritance/1/2/pom.xml | 49 +++++ .../resources/mng-5971/inheritance/1/pom.xml | 49 +++++ .../resources/mng-5971/inheritance/pom.xml | 79 +++++++ .../test/resources/mng-5971/override/pom.xml | 87 ++++++++ .../mng-5971/properties/1/2/3/4/pom.xml | 47 ++++ .../mng-5971/properties/1/2/3/pom.xml | 51 +++++ .../resources/mng-5971/properties/1/2/pom.xml | 50 +++++ .../resources/mng-5971/properties/1/pom.xml | 50 +++++ .../resources/mng-5971/properties/pom.xml | 80 +++++++ .../its/mng5971/dependency/0/dependency-0.jar | Bin 0 -> 341 bytes .../its/mng5971/dependency/0/dependency-0.pom | 27 +++ .../its/mng5971/dependency/1/dependency-1.jar | Bin 0 -> 341 bytes .../its/mng5971/dependency/1/dependency-1.pom | 27 +++ .../its/mng5971/dependency/2/dependency-2.jar | Bin 0 -> 341 bytes .../its/mng5971/dependency/2/dependency-2.pom | 27 +++ .../its/mng5971/dependency/3/dependency-3.jar | Bin 0 -> 341 bytes .../its/mng5971/dependency/3/dependency-3.pom | 27 +++ .../maven/its/mng5971/import/0/import-0.pom | 39 ++++ .../maven/its/mng5971/import/1/import-1.pom | 39 ++++ .../maven/its/mng5971/import/2/import-2.pom | 39 ++++ .../maven/its/mng5971/import/3/import-3.pom | 39 ++++ .../resources/mng-5971/settings-template.xml | 43 ++++ 31 files changed, 1478 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java create mode 100644 core-it-suite/src/test/resources/mng-5971/conflict/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/4/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/include-properties/1/2/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/include-properties/1/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/include-properties/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/override/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/properties/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/0/dependency-0.jar create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/0/dependency-0.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/1/dependency-1.jar create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/1/dependency-1.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/2/dependency-2.jar create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/2/dependency-2.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/3/dependency-3.jar create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/3/dependency-3.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/0/import-0.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/1/import-1.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/2/import-2.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/3/import-3.pom create mode 100644 core-it-suite/src/test/resources/mng-5971/settings-template.xml 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 1ade8b303..46f964273 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 @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng5971HierarchicalImportScopeTest.class ); suite.addTestSuite( MavenITmng5600DependencyManagementImportExclusionsTest.class ); suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java new file mode 100644 index 000000000..b1411e319 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java @@ -0,0 +1,204 @@ +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.util.Arrays; +import java.util.List; +import java.util.Map; +import org.apache.maven.it.util.ResourceExtractor; +import static junit.framework.Assert.assertTrue; + +/** + * [MNG-5971] Imported dependencies should be available to inheritance processing. + * + * @author Christian Schulte + */ +public class MavenITmng5971HierarchicalImportScopeTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5971HierarchicalImportScopeTest() + { + super( "[3.4.0,)" ); + } + + public void testInheritanceProcessing() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/inheritance" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List dependencies0 = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies0, "org.apache.maven.its.mng5971:dependency:jar:0" ) ); + + final List dependencies1 = verifier.loadLines( "1/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies1, "org.apache.maven.its.mng5971:dependency:jar:1" ) ); + + final List dependencies2 = verifier.loadLines( "1/2/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies2, "org.apache.maven.its.mng5971:dependency:jar:2" ) ); + + final List dependencies3 = verifier.loadLines( "1/2/3/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies3, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + } + + public void testOverrideProcessing() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/override" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List dependencies = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + } + + public void testConflictResolution() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/conflict" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List dependencies = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + } + + public void testInheritanceProcessingWithProjectBasedProperties() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/properties" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List dependencies0 = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies0, "org.apache.maven.its.mng5971:dependency:jar:0" ) ); + + final List dependencies1 = verifier.loadLines( "1/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies1, "org.apache.maven.its.mng5971:dependency:jar:1" ) ); + + final List dependencies2 = verifier.loadLines( "1/2/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies2, "org.apache.maven.its.mng5971:dependency:jar:2" ) ); + + final List dependencies3 = verifier.loadLines( "1/2/3/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies3, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + + final List dependencies4 = verifier.loadLines( "1/2/3/4/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies4, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + } + + public void testIncludeInheritanceProcessingWithProjectBasedProperties() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/include-properties" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List dependencies0 = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies0, "org.apache.maven.its.mng5971:dependency:jar:0" ) ); + + final List dependencies1 = verifier.loadLines( "1/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies1, "org.apache.maven.its.mng5971:dependency:jar:1" ) ); + + final List dependencies2 = verifier.loadLines( "1/2/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies2, "org.apache.maven.its.mng5971:dependency:jar:2" ) ); + + final List dependencies3 = verifier.loadLines( "1/2/3/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies3, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + + final List dependencies4 = verifier.loadLines( "1/2/3/4/target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies4, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + } + + private static boolean contains( final List lines, final String pattern ) + { + for ( int i = 0, l0 = lines.size(); i < l0; i++ ) + { + if ( lines.get( i ).contains( pattern ) ) + { + return true; + } + } + + return false; + } + +} diff --git a/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml b/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml new file mode 100644 index 000000000..9df2c7d2d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml @@ -0,0 +1,100 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + 0 + 20160220 + pom + + Maven Integration Test :: MNG-5971 + + + Tests that imported dependencies will be overridden based on a first declaration wins strategy. + + + + + + + org.apache.maven.its.mng5971 + import + 3 + pom + import + + + org.apache.maven.its.mng5971 + import + 2 + pom + import + + + org.apache.maven.its.mng5971 + import + 1 + pom + import + + + org.apache.maven.its.mng5971 + import + 0 + pom + import + + + + + + + org.apache.maven.its.mng5971 + dependency + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + validate + + compile + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/4/pom.xml b/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/4/pom.xml new file mode 100644 index 000000000..50b717565 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/4/pom.xml @@ -0,0 +1,47 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 3 + 3 + + + 4 + pom + + + + + ${project.groupId} + import + + ${project.version} + pom + include + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/pom.xml b/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/pom.xml new file mode 100644 index 000000000..42bccc8a0 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/3/pom.xml @@ -0,0 +1,51 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 2 + 2 + + + 3 + 3 + pom + + + + + ${project.groupId} + import + ${project.version} + pom + include + + + + + + 4 + + + diff --git a/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/pom.xml b/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/pom.xml new file mode 100644 index 000000000..5b35e3a01 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/include-properties/1/2/pom.xml @@ -0,0 +1,50 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 1 + 1 + + + 2 + 2 + pom + + + + + ${project.groupId} + import + ${project.version} + pom + include + + + + + + 3 + + diff --git a/core-it-suite/src/test/resources/mng-5971/include-properties/1/pom.xml b/core-it-suite/src/test/resources/mng-5971/include-properties/1/pom.xml new file mode 100644 index 000000000..1f8f1a513 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/include-properties/1/pom.xml @@ -0,0 +1,50 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 0 + 0 + + + 1 + 1 + pom + + + + + ${project.groupId} + import + ${project.version} + pom + include + + + + + + 2 + + diff --git a/core-it-suite/src/test/resources/mng-5971/include-properties/pom.xml b/core-it-suite/src/test/resources/mng-5971/include-properties/pom.xml new file mode 100644 index 000000000..647cf5c7a --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/include-properties/pom.xml @@ -0,0 +1,80 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + 0 + 0 + pom + + Maven Integration Test :: MNG-5971 + + + Multi module project using dependency management include at each child level testing import are performed on each + level and overriden correctly when using inherited ${project.groupId} and ${project.version} expressions in + dependency management import declarations. + + + + + + ${project.groupId} + dependency + ${project.version} + + + + + + + org.apache.maven.its.mng5971 + dependency + + + + + 1 + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + validate + + compile + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml new file mode 100644 index 000000000..d0bcbd994 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml @@ -0,0 +1,46 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 2 + 20160220 + + + 3 + pom + + + + + org.apache.maven.its.mng5971 + import + 3 + pom + include + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml new file mode 100644 index 000000000..4797c6824 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml @@ -0,0 +1,49 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 1 + 20160220 + + + 2 + pom + + + + + org.apache.maven.its.mng5971 + import + 2 + pom + include + + + + + + 3 + + diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml new file mode 100644 index 000000000..c7e3f9c9d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml @@ -0,0 +1,49 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 0 + 20160220 + + + 1 + pom + + + + + org.apache.maven.its.mng5971 + import + 1 + pom + include + + + + + + 2 + + diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml new file mode 100644 index 000000000..2614416b9 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml @@ -0,0 +1,79 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + 0 + 20160220 + pom + + Maven Integration Test :: MNG-5971 + + + Multi module project using dependency management import at each child level testing import are performed on each + level and overriden correctly. + + + + + + org.apache.maven.its.mng5971 + dependency + 0 + + + + + + + org.apache.maven.its.mng5971 + dependency + + + + + 1 + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + validate + + compile + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/override/pom.xml b/core-it-suite/src/test/resources/mng-5971/override/pom.xml new file mode 100644 index 000000000..fc5fb4cae --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/override/pom.xml @@ -0,0 +1,87 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + 0 + 20160220 + pom + + Maven Integration Test :: MNG-5971 + + + Tests that imported dependencies will be overridden based on a first declaration wins strategy. + + + + + + + org.apache.maven.its.mng5971 + import + 0 + pom + import + + + + org.apache.maven.its.mng5971 + dependency + 3 + + + + + + + org.apache.maven.its.mng5971 + dependency + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + validate + + compile + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml new file mode 100644 index 000000000..c60f6d0b9 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml @@ -0,0 +1,47 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 3 + 3 + + + 4 + pom + + + + + ${project.groupId} + import + + ${project.version} + pom + import + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml new file mode 100644 index 000000000..501f19118 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml @@ -0,0 +1,51 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 2 + 2 + + + 3 + 3 + pom + + + + + ${project.groupId} + import + ${project.version} + pom + import + + + + + + 4 + + + diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml new file mode 100644 index 000000000..5e0b727a1 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml @@ -0,0 +1,50 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 1 + 1 + + + 2 + 2 + pom + + + + + ${project.groupId} + import + ${project.version} + pom + import + + + + + + 3 + + diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml new file mode 100644 index 000000000..e374e8806 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml @@ -0,0 +1,50 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng5971 + 0 + 0 + + + 1 + 1 + pom + + + + + ${project.groupId} + import + ${project.version} + pom + import + + + + + + 2 + + diff --git a/core-it-suite/src/test/resources/mng-5971/properties/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/pom.xml new file mode 100644 index 000000000..02f870e33 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/properties/pom.xml @@ -0,0 +1,80 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + 0 + 0 + pom + + Maven Integration Test :: MNG-5971 + + + Multi module project using dependency management import at each child level testing import are performed on each + level and overriden correctly when using inherited ${project.groupId} and ${project.version} expressions in + dependency management import declarations. + + + + + + ${project.groupId} + dependency + ${project.version} + + + + + + + org.apache.maven.its.mng5971 + dependency + + + + + 1 + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + validate + + compile + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/0/dependency-0.jar b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/0/dependency-0.jar new file mode 100644 index 0000000000000000000000000000000000000000..2f64208d1ea0a0200f59024855342ab6bbfc1137 GIT binary patch literal 341 zcmWIWW@Zs#;Nak3cvTwW!GHuf8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1gN&0 u0COP752yg{D3FiPwIUk}@&N+a0-12FNd5`%W@Q7ZVgkZiAbkkLVE_Oqghgur literal 0 HcmV?d00001 diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/0/dependency-0.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/0/dependency-0.pom new file mode 100644 index 000000000..b9829ba77 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/0/dependency-0.pom @@ -0,0 +1,27 @@ + + + + + + 4.0.0 + org.apache.maven.its.mng5971 + dependency + 0 + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/1/dependency-1.jar b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/1/dependency-1.jar new file mode 100644 index 0000000000000000000000000000000000000000..2f64208d1ea0a0200f59024855342ab6bbfc1137 GIT binary patch literal 341 zcmWIWW@Zs#;Nak3cvTwW!GHuf8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1gN&0 u0COP752yg{D3FiPwIUk}@&N+a0-12FNd5`%W@Q7ZVgkZiAbkkLVE_Oqghgur literal 0 HcmV?d00001 diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/1/dependency-1.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/1/dependency-1.pom new file mode 100644 index 000000000..52e7cc337 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/1/dependency-1.pom @@ -0,0 +1,27 @@ + + + + + + 4.0.0 + org.apache.maven.its.mng5971 + dependency + 1 + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/2/dependency-2.jar b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/2/dependency-2.jar new file mode 100644 index 0000000000000000000000000000000000000000..2f64208d1ea0a0200f59024855342ab6bbfc1137 GIT binary patch literal 341 zcmWIWW@Zs#;Nak3cvTwW!GHuf8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1gN&0 u0COP752yg{D3FiPwIUk}@&N+a0-12FNd5`%W@Q7ZVgkZiAbkkLVE_Oqghgur literal 0 HcmV?d00001 diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/2/dependency-2.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/2/dependency-2.pom new file mode 100644 index 000000000..ce892977f --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/2/dependency-2.pom @@ -0,0 +1,27 @@ + + + + + + 4.0.0 + org.apache.maven.its.mng5971 + dependency + 2 + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/3/dependency-3.jar b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/3/dependency-3.jar new file mode 100644 index 0000000000000000000000000000000000000000..2f64208d1ea0a0200f59024855342ab6bbfc1137 GIT binary patch literal 341 zcmWIWW@Zs#;Nak3cvTwW!GHuf8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1gN&0 u0COP752yg{D3FiPwIUk}@&N+a0-12FNd5`%W@Q7ZVgkZiAbkkLVE_Oqghgur literal 0 HcmV?d00001 diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/3/dependency-3.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/3/dependency-3.pom new file mode 100644 index 000000000..1ef1418dc --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/dependency/3/dependency-3.pom @@ -0,0 +1,27 @@ + + + + + + 4.0.0 + org.apache.maven.its.mng5971 + dependency + 3 + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/0/import-0.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/0/import-0.pom new file mode 100644 index 000000000..d0ff23f23 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/0/import-0.pom @@ -0,0 +1,39 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + import + 0 + pom + + + + + org.apache.maven.its.mng5971 + dependency + 0 + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/1/import-1.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/1/import-1.pom new file mode 100644 index 000000000..7b6ddb52d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/1/import-1.pom @@ -0,0 +1,39 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + import + 1 + pom + + + + + org.apache.maven.its.mng5971 + dependency + 1 + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/2/import-2.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/2/import-2.pom new file mode 100644 index 000000000..4938b9f85 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/2/import-2.pom @@ -0,0 +1,39 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + import + 2 + pom + + + + + org.apache.maven.its.mng5971 + dependency + 2 + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/3/import-3.pom b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/3/import-3.pom new file mode 100644 index 000000000..fa68b02e2 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/repo/org/apache/maven/its/mng5971/import/3/import-3.pom @@ -0,0 +1,39 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5971 + import + 3 + pom + + + + + org.apache.maven.its.mng5971 + dependency + 3 + + + + diff --git a/core-it-suite/src/test/resources/mng-5971/settings-template.xml b/core-it-suite/src/test/resources/mng-5971/settings-template.xml new file mode 100644 index 000000000..f22a7f357 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/../repo + + ignore + + + false + + + + + + + maven-core-it-repo + + From f6c0cc8c59d10ea00265b48273790a42e69705e2 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sat, 13 Aug 2016 02:04:02 +0200 Subject: [PATCH 06/16] [MNG-6079] 3.4 regression: cannot override version of a dependencyManagement in a submodule any more --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...encyManagementImportInterpolationTest.java | 81 +++++++++++++++++++ .../test/resources/mng-6079/parent-pom.xml | 49 +++++++++++ .../src/test/resources/mng-6079/pom.xml | 69 ++++++++++++++++ .../resources/mng-6079/settings-template.xml | 43 ++++++++++ 5 files changed, 243 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolationTest.java create mode 100644 core-it-suite/src/test/resources/mng-6079/parent-pom.xml create mode 100644 core-it-suite/src/test/resources/mng-6079/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-6079/settings-template.xml 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 46f964273..9d816f64f 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 @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng6079DependencyManagementImportInterpolationTest.class ); suite.addTestSuite( MavenITmng5971HierarchicalImportScopeTest.class ); suite.addTestSuite( MavenITmng5600DependencyManagementImportExclusionsTest.class ); suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolationTest.java new file mode 100644 index 000000000..21ca3e40a --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolationTest.java @@ -0,0 +1,81 @@ +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.util.Arrays; +import java.util.List; +import java.util.Map; + +import org.apache.maven.it.util.ResourceExtractor; + +import static junit.framework.Assert.assertTrue; + +/** + * [MNG-6079] 3.4 regression: cannot override version of a dependencyManagement in a submodule any more + * + * @author Christian Schulte + */ +public class MavenITmng6079DependencyManagementImportInterpolationTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng6079DependencyManagementImportInterpolationTest() + { + super( "[2.0.9,)" ); + } + + public void testInheritanceProcessing() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6079" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); + verifier.setAutoclean( false ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List dependencies0 = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies0, "org.apache.maven.surefire:surefire-api:jar:2.12" ) ); + } + + private static boolean contains( final List lines, final String pattern ) + { + for ( int i = 0, l0 = lines.size(); i < l0; i++ ) + { + if ( lines.get( i ).contains( pattern ) ) + { + return true; + } + } + + return false; + } + +} diff --git a/core-it-suite/src/test/resources/mng-6079/parent-pom.xml b/core-it-suite/src/test/resources/mng-6079/parent-pom.xml new file mode 100644 index 000000000..86cdcec9f --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6079/parent-pom.xml @@ -0,0 +1,49 @@ + + + + + + + 4.0.0 + org.apache.maven.its.mng6079 + parent + pom + 1.0-SNAPSHOT + + + 2.10 + + + + + + + org.apache.maven.surefire + surefire + ${surefire.version} + pom + import + + + + + diff --git a/core-it-suite/src/test/resources/mng-6079/pom.xml b/core-it-suite/src/test/resources/mng-6079/pom.xml new file mode 100644 index 000000000..bc2e24d6f --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6079/pom.xml @@ -0,0 +1,69 @@ + + + + + + + + org.apache.maven.its.mng6079 + parent + 1.0-SNAPSHOT + parent-pom.xml + + + 4.0.0 + jar + submodule + + + 2.12 + + + + + org.apache.maven.surefire + surefire-api + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + + + + validate + + compile + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-6079/settings-template.xml b/core-it-suite/src/test/resources/mng-6079/settings-template.xml new file mode 100644 index 000000000..f22a7f357 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6079/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/../repo + + ignore + + + false + + + + + + + maven-core-it-repo + + From 0f2a2076b8e426193f142e8b9109af8fc6157c44 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Wed, 27 Jan 2016 08:09:55 +0100 Subject: [PATCH 07/16] [MNG-5227] The 'optional' flag of a dependency should be manageable. [MNG-4600] [regression] Optional flag from dependency management applied to dependencies --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...0DependencyOptionalFlagManagementTest.java | 4 + ...7DependencyOptionalFlagManagementTest.java | 89 ++++++++++++++++++ .../src/test/resources/mng-5227/model/pom.xml | 77 +++++++++++++++ .../resources/mng-5227/resolution/pom.xml | 76 +++++++++++++++ .../its/mng5227/direct/0.2/direct-0.2.jar | Bin 0 -> 2054 bytes .../its/mng5227/direct/0.2/direct-0.2.pom | 46 +++++++++ .../its/mng5227/direct/maven-metadata.xml | 12 +++ .../mng5227/transitive/0.1/transitive-0.1.jar | Bin 0 -> 2038 bytes .../mng5227/transitive/0.1/transitive-0.1.pom | 38 ++++++++ .../its/mng5227/transitive/maven-metadata.xml | 12 +++ .../mng-5227/resolution/settings-template.xml | 43 +++++++++ 12 files changed, 398 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java create mode 100644 core-it-suite/src/test/resources/mng-5227/model/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/0.2/direct-0.2.jar create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/0.2/direct-0.2.pom create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/maven-metadata.xml create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/0.1/transitive-0.1.jar create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/0.1/transitive-0.1.pom create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/maven-metadata.xml create mode 100644 core-it-suite/src/test/resources/mng-5227/resolution/settings-template.xml 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 9d816f64f..f2aecf87d 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 @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng5227DependencyOptionalFlagManagementTest.class ); suite.addTestSuite( MavenITmng6079DependencyManagementImportInterpolationTest.class ); suite.addTestSuite( MavenITmng5971HierarchicalImportScopeTest.class ); suite.addTestSuite( MavenITmng5600DependencyManagementImportExclusionsTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java index 4051146b4..81b9370d4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java @@ -47,6 +47,8 @@ public MavenITmng4600DependencyOptionalFlagManagementTest() public void testitModel() throws Exception { + failingMavenVersions( "[3.4.0-alpha,)" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4600/model" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); @@ -68,6 +70,8 @@ public void testitModel() public void testitResolution() throws Exception { + failingMavenVersions( "[3.4.0-alpha,)" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4600/resolution" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java new file mode 100644 index 000000000..d527b8ddc --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java @@ -0,0 +1,89 @@ +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.util.List; +import java.util.Properties; +import org.apache.maven.it.util.ResourceExtractor; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertTrue; + +/** + * This is a test set for MNG-5227. + * + * @author Christian Schulte + */ +public class MavenITmng5227DependencyOptionalFlagManagementTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5227DependencyOptionalFlagManagementTest() + { + super( "[3.4.0,)" ); + } + + /** + * Verify that a dependency's optional flag is subject to dependency management. This part of the test checks + * the effective model. + */ + public void testitModel() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5227/model" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + Properties props = verifier.loadProperties( "target/pom.properties" ); + assertEquals( "dep", props.getProperty( "project.dependencies.0.artifactId" ) ); + assertEquals( "true", props.getProperty( "project.dependencies.0.optional" ) ); + } + + /** + * Verify that a transitive dependency's optional flag is subject to dependency management of the root artifat. + * This part of the test checks the artifact collector. + */ + public void testitResolution() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5227/resolution" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng5227" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.addCliOption( "--settings" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" ); + assertTrue( classpath.toString(), classpath.contains( "direct-0.2.jar" ) ); + assertFalse( classpath.toString(), classpath.contains( "transitive-0.1.jar" ) ); + } + +} diff --git a/core-it-suite/src/test/resources/mng-5227/model/pom.xml b/core-it-suite/src/test/resources/mng-5227/model/pom.xml new file mode 100644 index 000000000..0373e9a4d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5227/model/pom.xml @@ -0,0 +1,77 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5227 + test + 0.1 + pom + + Maven Integration Test :: MNG-5227 + + Verify that the optional flag of a dependency is controlled by dependency management. + + + + + + org.apache.maven.its.mng5227 + dep + 0.1 + + true + + + + + + org.apache.maven.its.mng5227 + dep + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + + test + validate + + + project/dependencies + + target/pom.properties + + + eval + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5227/resolution/pom.xml b/core-it-suite/src/test/resources/mng-5227/resolution/pom.xml new file mode 100644 index 000000000..a334b20fd --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5227/resolution/pom.xml @@ -0,0 +1,76 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5227 + test + 0.1 + + Maven Integration Test :: MNG-5227 + + Verify that the optional state of a transitive dependency is controlled by dependency management. + + + + + + org.apache.maven.its.mng5227 + transitive + 0.1 + + true + + + + + + + org.apache.maven.its.mng5227 + direct + 0.2 + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/classpath.txt + 1 + + + + test + validate + + compile + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/0.2/direct-0.2.jar b/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/0.2/direct-0.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..d756c3e31f198cfedaa939cb097aef240dd8908d GIT binary patch literal 2054 zcmWIWW@h1H0D%MhifzCQD8UJ&eO*Hwbv^yu^aG&EI2iTKp8LNVy^>_{8m;*cJ7=Ruu&v-{gj*u ztjns{KDxE-iP;mw0CO3p2l$a)mYZ0Xng{m=reYmT#rZ|)dWi*z$r-77VBLC|CB=HV zdFdu*1_pRcGA7Zal+2>kcrG^TPh0)vuxL(&>s8k4v7)B=J8uTDUBBS?7G*nZYhuZ-blw{l=3*w_@q%w#wx`thqU+ugE8n&kFvaiQdGK`s zm%hfq?`nVVK6z>#9=+L?BQs(7#}1w!Gm?`#G$yW^-DNy6ICuT42LCtjsyKF<^=z6c z%vfaX$DFpto*_DU)@F^Y+h!?!85*IIyoVO)o1Atn6BUS@U9YWmMM~t~jY3!B*!PX5 zM^w|ZlOi^Xy$M;XdoJhIJ*`bjcHVlByjZ99 z(TTS#8ztVJy>S0sYq6{OjL*F1J*R1uuW`{(eYak>B^lQPcQEK zK7HAR?@bG;`FkgQpE3JLpWV9D#?bwICo?U0mlu9fxfUrh-Rs?~EgmOk9$YfZb^(WF zZk_I_%jUtWWH!Zc2Djx$o zR&v#LO;=~cM6*rcYF_&4-aD?Xjhl^k#MSWVsQ&(c$+X=&XTmb2Pqi{TU&+0EU~)Cy z*wK00`I{RTM7Q={nG^SCUw=T4c;{ugCtpH2EM7i3`mt>Jsv~w{w_d#XdERt!KVSHM zC2kS-Z=2lv{x$S1t~YvF!S~1V72{(8>5aeZm&e>ZA+>mhLed|`|3zn(%EeZHy<)2V zNONi6g2%pba^K#Y!-@nBaG91gc}7+#Fbh=yu_O6esh}voAhoC@GqpIl%>S&nu9uFd zZ=lDjkPp5(-e(^_4Jy+<#j>eeghyAjr)RBCA526_w#1Q_0eyog+G!?a;9xj~9SU`eAokc1caNaZ*_i$NtU z1b{3)2xP)dfR(o}>#>)(2+i*>H4`X*ahnV(fgu3oEDJ^qXW=y&ULM0Nz+NK5tXR_6 tNuCAJ@);4n*pn;5o+~V5c?4t+BJl=zv$BDVWCubIU + + + + + 4.0.0 + + org.apache.maven.its.mng5227 + direct + 0.2 + jar + + Maven Integration Test :: MNG-5227 :: Direct Dependency + + + + maven-core-it + file:///${basedir}/repo + + + + + + org.apache.maven.its.mng5227 + transitive + 0.1 + + + diff --git a/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/maven-metadata.xml b/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/maven-metadata.xml new file mode 100644 index 000000000..d0a7451f9 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/direct/maven-metadata.xml @@ -0,0 +1,12 @@ + + + org.apache.maven.its.mng5227 + direct + 0.2 + + + 0.2 + + 20100319225359 + + diff --git a/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/0.1/transitive-0.1.jar b/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/0.1/transitive-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..2099b1ce0f298dbac68f40597c2268529cfc8e3d GIT binary patch literal 2038 zcmWIWW@h1H0D(FCifzCQD8UJ&eO*Hwbv^yu^aG&EI2dLFm9^}D&YJ<0t_NZfWM#gN zex7cw!6ACSZl8V6oc8h7)w{^+t*dqJ%=yhh23L$9JT21kI(I_HTi1z${mGKBDPr0O zR4R7P=?)V14hk-rtF=}{hFfT|agb<@@adq>Kp8LNVy^>_{8m;*cJ7=Ruu&v-{gj*u ztjns{KDxE-iP;mw0CO3p2l$a)mYZ0Xng{m=reYmT#rZ|)dWi*z$r-77VBLC|CB=HV zdFdu*1_pRcGAGfblA^@C;>?oFvQ)UC91N3yp?r-iOyVRH0|O%~1A`s;h8E=K>Q&_C zl!ip-&o&ULbAMz%XQAzypoWrF%T_K9iM*YYp*xW)_NqI(Uq|$YnT885Zu!42Sz&ta zt>C2JKdkRRo$=t)R;|S5RS$z=ESBH9!YDHH%uWrxIqfCy>PqySZ*N-rp!fByYr5wH zOlCAsTX3CY^Q_b_lTS>2H^XVh>98k0!V-ICt9}+2Dc4(Th04{Gpp2u_*DmWV zI=~#JafGWi&!&N8BYVGiW=SctcHE`6bIcFxX5A~?yNv6egZfqOH5?sJEzNTyIb$xk zU7fr^x0N;6jd$zX?Oo#8yqknoD$ZuVnkprDvc`RhWJ3G2C576z0}oBSb+LuBM!u%` z`#q6+fsMJAk7pKtTDd=Zqb|qFg}EOZcz(=ET-&KJan-9y#uG2z4ZJEh|AuX^K+#Ic z(9LlyC$1Js8svUrjL43i|GVybsod+%svyySelzO5d9+sM)WK!4hLfse9NY}Oj?7dQQ01$c zry6L~cwFP}t_qKbg=O{j-IrgeH6FE%(S7tT4Hk~}HodYY@n>Czc)V=>cJUFK@X+Fm?0;Sjz4_k+o{ zul;K0x5boK@Nb=Te#XlS5%M8M$BSgzKb)Ceb@{;m=HTX4W#(Id}Uhu)f zw@$TdGk@@|ovUB1H(2_!D|ObjD8q{Z9MU|07Qfw>Q*-#?6>Hu$v+hg-YC$6cga=ZI!y0-__gpxp+tS{vB=8e$Ic#dBF6V$GeUk=^wU-I=1=G zF?csaVe{F|?`B?Dc_>P#A>?*p`?m_YZ*n^%Yh`2BG0%VAemQLF!b%g9oBwXl_jZ$) zUsv~&P2`GZCDJaS>NG&SK zOf44e*~oRsK)~UtB+n?&k-`c*%l`nPaaniQg zUvS*ZbM?DJ8x5PS8|{0V<=f?+eP-TM8n)UiCdqHIso&}YKR4gMrde#TTunk9|B + + + + + 4.0.0 + + org.apache.maven.its.mng5227 + transitive + 0.1 + jar + + Maven Integration Test :: MNG-5227 :: Transitive Dependency + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/maven-metadata.xml b/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/maven-metadata.xml new file mode 100644 index 000000000..2c7722615 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5227/resolution/repo/org/apache/maven/its/mng5227/transitive/maven-metadata.xml @@ -0,0 +1,12 @@ + + + org.apache.maven.its.mng5227 + transitive + 0.1 + + + 0.1 + + 20100319225254 + + diff --git a/core-it-suite/src/test/resources/mng-5227/resolution/settings-template.xml b/core-it-suite/src/test/resources/mng-5227/resolution/settings-template.xml new file mode 100644 index 000000000..c985d1a68 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5227/resolution/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + + From cda6c80c301bb45458dc7286f8ab469a48edc1b7 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Tue, 13 Dec 2016 23:28:45 +0100 Subject: [PATCH 08/16] [MNG-5761] Dependency management is not transitive. --- ...ependencyManagementExclusionMergeTest.java | 37 +++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java index 752ef8763..c623411ad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java @@ -27,7 +27,7 @@ /** * This is a test set for MNG-4720. - * + * * @author Benjamin Bentmann */ public class MavenITmng4720DependencyManagementExclusionMergeTest @@ -43,9 +43,11 @@ public MavenITmng4720DependencyManagementExclusionMergeTest() * Verify the effective exclusions applied during transitive dependency resolution when both the regular * dependency section and dependency management declare exclusions for a particular dependency. */ - public void testit() + public void testitMaven2Compat() throws Exception { + // Gave up on Maven 2 compat in 3.4. + failingMavenVersions( "[3.4.0,)" ); File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4720" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); @@ -65,8 +67,37 @@ public void testit() assertFalse( classpath.toString(), classpath.contains( "b-0.1.jar" ) ); - // should better have been excluded as well, now it's a matter of backward-compat + // This comment is obsolete as of 3.6: should better have been excluded as well, now it's a matter of backward-compat assertTrue( classpath.toString(), classpath.contains( "d-0.1.jar" ) ); } + /** + * Verify the effective exclusions applied during transitive dependency resolution when both the regular + * dependency section and dependency management declare exclusions for a particular dependency. + */ + public void testitMaven340() + throws Exception + { + failingMavenVersions( "(,3.4.0)" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4720" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4720" ); + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" ); + + assertTrue( classpath.toString(), classpath.contains( "a-0.1.jar" ) ); + assertTrue( classpath.toString(), classpath.contains( "c-0.1.jar" ) ); + + assertFalse( classpath.toString(), classpath.contains( "b-0.1.jar" ) ); + assertFalse( classpath.toString(), classpath.contains( "d-0.1.jar" ) ); + } + } From 3d0045f2a73478f7b75822f0663ce2400354ddf7 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Mon, 19 Dec 2016 01:51:44 +0100 Subject: [PATCH 09/16] [MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects. o Updated to add all missing POMs to the test repository. Due to core extensions getting resolved as projects, the POMs of all dependencies need to be available in that repository even if the dependency is filtered out during resolution. --- .../repo/org/apache/apache/6/apache-6.pom | 333 ++++++++ .../3.0.3/maven-aether-provider-3.0.3.pom | 86 ++ .../3.0.3/maven-artifact-3.0.3.pom | 49 ++ .../maven-core/3.0.3/maven-core-3.0.3.pom | 200 +++++ .../3.0.3/maven-model-builder-3.0.3.pom | 59 ++ .../maven-model/3.0.3/maven-model-3.0.3.pom | 122 +++ .../maven/maven-parent/15/maven-parent-15.pom | 760 ++++++++++++++++++ .../3.0.3/maven-plugin-api-3.0.3.pom | 70 ++ .../3.0.3/maven-repository-metadata-3.0.3.pom | 57 ++ .../3.0.3/maven-settings-builder-3.0.3.pom | 67 ++ .../3.0.3/maven-settings-3.0.3.pom | 57 ++ .../apache/maven/maven/3.0.3/maven-3.0.3.pom | 600 ++++++++++++++ .../2.4/plexus-classworlds-2.4.pom | 106 +++ .../plexus-component-annotations-1.5.5.pom | 20 + .../1.1.18/plexus-components-1.1.18.pom | 168 ++++ .../1.5.5/plexus-containers-1.5.5.pom | 122 +++ .../1.14/plexus-interpolation-1.14.pom | 20 + .../plexus-utils/2.0.6/plexus-utils-2.0.6.pom | 80 ++ .../plexus/plexus/2.0.7/plexus-2.0.7.pom | 535 ++++++++++++ .../aether-api/1.11/aether-api-1.11.pom | 47 ++ .../aether-impl/1.11/aether-impl-1.11.pom | 98 +++ .../aether-parent/1.11/aether-parent-1.11.pom | 326 ++++++++ .../aether-spi/1.11/aether-spi-1.11.pom | 46 ++ .../aether-util/1.11/aether-util-1.11.pom | 56 ++ .../forge/forge-parent/4/forge-parent-4.pom | 225 ++++++ .../forge/forge-parent/6/forge-parent-6.pom | 253 ++++++ .../forge/forge-parent/7/forge-parent-7.pom | 303 +++++++ .../plexus-cipher/1.4/plexus-cipher-1.4.pom | 67 ++ .../1.3/plexus-sec-dispatcher-1.3.pom | 97 +++ .../guice-bean/2.1.1/guice-bean-2.1.1.pom | 91 +++ .../guice-parent/2.9.4/guice-parent-2.9.4.pom | 385 +++++++++ .../guice-plexus/2.1.1/guice-plexus-2.1.1.pom | 106 +++ .../sisu-guice/2.9.4/sisu-guice-2.9.4.pom | 257 ++++++ .../2.1.1/sisu-inject-bean-2.1.1.pom | 91 +++ .../2.1.1/sisu-inject-plexus-2.1.1.pom | 92 +++ .../sisu-inject/2.1.1/sisu-inject-2.1.1.pom | 61 ++ .../sisu-parent/2.1.1/sisu-parent-2.1.1.pom | 304 +++++++ .../spice/spice-parent/12/spice-parent-12.pom | 214 +++++ 38 files changed, 6630 insertions(+) create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/apache/6/apache-6.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-aether-provider/3.0.3/maven-aether-provider-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-artifact/3.0.3/maven-artifact-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-core/3.0.3/maven-core-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model-builder/3.0.3/maven-model-builder-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-parent/15/maven-parent-15.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-plugin-api/3.0.3/maven-plugin-api-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-repository-metadata/3.0.3/maven-repository-metadata-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings-builder/3.0.3/maven-settings-builder-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings/3.0.3/maven-settings-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven/3.0.3/maven-3.0.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-api/1.11/aether-api-1.11.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-impl/1.11/aether-impl-1.11.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-parent/1.11/aether-parent-1.11.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-spi/1.11/aether-spi-1.11.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-util/1.11/aether-util-1.11.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/4/forge-parent-4.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/6/forge-parent-6.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/7/forge-parent-7.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-bean/2.1.1/guice-bean-2.1.1.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-parent/2.9.4/guice-parent-2.9.4.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-plexus/2.1.1/guice-plexus-2.1.1.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-plexus/2.1.1/sisu-inject-plexus-2.1.1.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject/2.1.1/sisu-inject-2.1.1.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-parent/2.1.1/sisu-parent-2.1.1.pom create mode 100644 core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/spice/spice-parent/12/spice-parent-12.pom diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/apache/6/apache-6.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/apache/6/apache-6.pom new file mode 100644 index 000000000..c2f6a0e76 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/apache/6/apache-6.pom @@ -0,0 +1,333 @@ + + + + + + 4.0.0 + + + org.apache + apache + 6 + pom + The Apache Software Foundation + + The Apache Software Foundation provides support for the Apache community of open-source software projects. + The Apache projects are characterized by a collaborative, consensus based development process, an open and + pragmatic software license, and a desire to create high quality software that leads the way in its field. + We consider ourselves not simply a group of projects sharing a server, but rather a community of developers + and users. + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + The Apache Software Foundation + http://www.apache.org/ + + http://www.apache.org/ + + + apache.snapshots + Apache Snapshot Repository + http://repository.apache.org/snapshots + + false + + + + + + + + apache.releases.https + Apache Release Distribution Repository + https://repository.apache.org/service/local/staging/deploy/maven2 + + + apache.snapshots.https + ${distMgmtSnapshotsName} + ${distMgmtSnapshotsUrl} + + + + + Apache Announce List + announce-subscribe@apache.org + announce-unsubscribe@apache.org + announce@apache.org + http://mail-archives.apache.org/mod_mbox/www-announce/ + + + + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + http://www.apache.org/images/asf_logo_wide.gif + UTF-8 + + + scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-6 + scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-6 + http://svn.apache.org/viewvc/maven/pom/tags/apache-6 + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.3 + + + org.apache.maven.plugins + maven-clean-plugin + 2.3 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.4 + 1.4 + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.4 + + + org.apache.maven.plugins + maven-docck-plugin + 1.0 + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0-beta-1 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.0-alpha-4 + + + org.apache.maven.plugins + maven-install-plugin + 2.2 + + + org.apache.maven.plugins + maven-invoker-plugin + 1.3 + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + true + true + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + org.apache.maven.plugins + maven-plugin-plugin + 2.5 + + + + org.apache.maven.plugins + maven-release-plugin + 2.0-beta-9 + + false + deploy + -Papache-release + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.0 + + + org.apache.maven.plugins + maven-resources-plugin + 2.3 + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-scm-plugin + 1.2 + + + org.apache.maven.plugins + maven-site-plugin + 2.0 + + + org.apache.maven.plugins + maven-source-plugin + 2.0.4 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.3 + + + org.codehaus.mojo + clirr-maven-plugin + 2.2.2 + + + org.codehaus.plexus + plexus-maven-plugin + 1.3.8 + + + org.codehaus.modello + modello-maven-plugin + 1.0.1 + + + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + + process + + + + org.apache:apache-jar-resource-bundle:1.4 + + + + + + + + + + + + maven-project-info-reports-plugin + 2.1.1 + + + + + + + + apache-release + + + + + org.apache.maven.plugins + maven-gpg-plugin + + ${gpg.passphrase} + + + + + sign + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.sourceEncoding} + + + + attach-javadocs + + jar + + + + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-aether-provider/3.0.3/maven-aether-provider-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-aether-provider/3.0.3/maven-aether-provider-3.0.3.pom new file mode 100644 index 000000000..a2564a7dc --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-aether-provider/3.0.3/maven-aether-provider-3.0.3.pom @@ -0,0 +1,86 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-aether-provider + + Maven Aether Provider + + This module provides extensions to Aether for utilizing the Maven POM and Maven metadata. + + + + + org.apache.maven + maven-model + + + org.apache.maven + maven-model-builder + + + org.apache.maven + maven-repository-metadata + + + org.sonatype.aether + aether-api + + + org.sonatype.aether + aether-spi + + + org.sonatype.aether + aether-util + + + org.sonatype.aether + aether-impl + + + org.codehaus.plexus + plexus-component-annotations + + + org.codehaus.plexus + plexus-utils + + + + + + + org.codehaus.plexus + plexus-component-metadata + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-artifact/3.0.3/maven-artifact-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-artifact/3.0.3/maven-artifact-3.0.3.pom new file mode 100644 index 000000000..d6294d97e --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-artifact/3.0.3/maven-artifact-3.0.3.pom @@ -0,0 +1,49 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-artifact + + Maven Artifact + + + + org.codehaus.plexus + plexus-utils + + + + + + + org.codehaus.plexus + plexus-component-metadata + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-core/3.0.3/maven-core-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-core/3.0.3/maven-core-3.0.3.pom new file mode 100644 index 000000000..c48e20c50 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-core/3.0.3/maven-core-3.0.3.pom @@ -0,0 +1,200 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-core + + Maven Core + + + + + org.apache.maven + maven-model + + + org.apache.maven + maven-settings + + + org.apache.maven + maven-settings-builder + + + org.apache.maven + maven-repository-metadata + + + org.apache.maven + maven-artifact + + + org.apache.maven + maven-plugin-api + + + org.apache.maven + maven-model-builder + + + org.apache.maven + maven-aether-provider + + + org.sonatype.aether + aether-impl + ${aetherVersion} + + + org.sonatype.aether + aether-api + ${aetherVersion} + + + org.sonatype.aether + aether-util + ${aetherVersion} + + + + org.sonatype.sisu + sisu-inject-plexus + + + org.codehaus.plexus + plexus-interpolation + + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-classworlds + + + org.codehaus.plexus + plexus-component-annotations + + + org.sonatype.plexus + plexus-sec-dispatcher + + + commons-jxpath + commons-jxpath + test + + + + + + + src/main/resources + true + + + + + org.codehaus.plexus + plexus-component-metadata + + + org.codehaus.modello + modello-maven-plugin + + 1.0.0 + + src/main/mdo/toolchains.mdo + + + + + + + + + svn-buildnumber + + + .svn + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0-beta-4 + + + generate-resources + + create + + + + + false + false + + javasvn + + + + + + + + non-canonical-buildnumber + + + .svn + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0-beta-1 + + + generate-resources + + create + + + + + false + false + NON-CANONICAL_{0,date,yyyy-MM-dd_HH-mm}_{1} + + timestamp + ${user.name} + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model-builder/3.0.3/maven-model-builder-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model-builder/3.0.3/maven-model-builder-3.0.3.pom new file mode 100644 index 000000000..8372a3ad4 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model-builder/3.0.3/maven-model-builder-3.0.3.pom @@ -0,0 +1,59 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-model-builder + + Maven Model Builder + + + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-interpolation + + + org.codehaus.plexus + plexus-component-annotations + + + org.apache.maven + maven-model + + + org.sonatype.sisu + sisu-inject-plexus + test + + + + + + + org.codehaus.plexus + plexus-component-metadata + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3.pom new file mode 100644 index 000000000..c04b515c2 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3.pom @@ -0,0 +1,122 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-model + + Maven Model + Maven Model + + + + org.codehaus.plexus + plexus-utils + + + + + + + org.codehaus.modello + modello-maven-plugin + + 4.0.0 + + src/main/mdo/maven.mdo + + + + + standard + + java + xpp3-reader + xpp3-extended-reader + xpp3-writer + + + + + + org.apache.maven.plugins + maven-site-plugin + + + + navigation.xml + + + + + + + + + all-models + + + + org.codehaus.modello + modello-maven-plugin + + + v3 + + java + xpp3-writer + xpp3-reader + xsd + + + 3.0.0 + true + + + + + + maven-jar-plugin + + + package + + jar + + + all + + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-parent/15/maven-parent-15.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-parent/15/maven-parent-15.pom new file mode 100644 index 000000000..623be778c --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-parent/15/maven-parent-15.pom @@ -0,0 +1,760 @@ + + + + + + 4.0.0 + + + org.apache + apache + 6 + ../asf/pom.xml + + + org.apache.maven + maven-parent + 15 + pom + + Apache Maven + Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information. + http://maven.apache.org/ + 2002 + + + + + brianf + Brian Fox + brianf@apache.org + ASF + + PMC Chair + + -5 + + + aheritier + Arnaud Héritier + aheritier@apache.org + + PMC Member + + +1 + + + baerrach + Barrie Treloar + + PMC Member + + + + bentmann + Benjamin Bentmann + bentmann@apache.org + + PMC Member + + +1 + + + brett + Brett Porter + brett@apache.org + ASF + + PMC Member + + +10 + + + carlos + Carlos Sanchez + carlos@apache.org + ASF + + PMC Member + + +1 + + + dennisl + Dennis Lundberg + dennisl@apache.org + ASF + + PMC Member + + +1 + + + dfabulich + Daniel Fabulich + dfabulich@apache.org + + PMC Member + + -8 + + + dkulp + Daniel Kulp + dkulp@apache.org + IONA + + PMC Member + + -5 + + + evenisse + Emmanuel Venisse + evenisse@apache.org + ASF + + PMC Member + + +1 + + + fgiust + Fabrizio Giustina + fgiust@apache.org + openmind + + PMC Member + + +1 + + + hboutemy + Hervé Boutemy + hboutemy@apache.org + + PMC Member + + +1 + + + jdcasey + John Casey + jdcasey@apache.org + ASF + + PMC Member + + -5 + + + jmcconnell + Jesse McConnell + jmcconnell@apache.org + ASF + + PMC Member + + -6 + + + joakime + Joakim Erdfelt + joakime@apache.org + ASF + + PMC Member + + -5 + + + jstrachan + James Strachan + + PMC Member + + + + jtolentino + Ernesto Tolentino Jr. + jtolentino@apache.org + ASF + + PMC Member + + +8 + + + jvanzyl + Jason van Zyl + jason@maven.org + ASF + + PMC Member + + -5 + + + kenney + Kenney Westerhof + kenney@apache.org + Neonics + + PMC Member + + +1 + + + ltheussl + Lukas Theussl + ltheussl@apache.org + ASF + + PMC Member + + +1 + + + mkleint + Milos Kleint + + PMC Member + + + + mperham + Mike Perham + mperham@gmail.com + IBM + + PMC Member + + -6 + + + oching + Maria Odea B. Ching + + PMC Member + + + + olamy + Olivier Lamy + olamy@apache.org + + PMC Member + + +1 + + + rgoers + Ralph Goers + rgoers@apache.org + Intuit + -8 + + PMC Member + + + + snicoll + Stephane Nicoll + snicoll@apache.org + ASF + + PMC Member + + +1 + + + trygvis + Trygve Laugstol + trygvis@apache.org + ASF + + PMC Member + + +1 + + + vmassol + Vincent Massol + vmassol@apache.org + ASF + + PMC Member + + +1 + + + vsiveton + Vincent Siveton + vsiveton@apache.org + ASF + + PMC Member + + -5 + + + wsmoak + Wendy Smoak + wsmoak@apache.org + + PMC Member + + -7 + + + + + aramirez + Allan Q. Ramirez + + Committer + + + + bayard + Henri Yandell + + Committer + + + + bellingard + Fabrice Bellingard + + Committer + + + + chrisjs + Chris Stevenson + + Committer + + + + dantran + Dan Tran + + Committer + + + + dblevins + David Blevins + + Committer + + + + dlr + Daniel Rall + + Committer + + + + epunzalan + Edwin Punzalan + epunzalan@apache.org + + Committer + + -8 + + + felipeal + Felipe Leme + + Committer + + + + handyande + Andrew Williams + handyande@apache.org + + Committer + + 0 + + + jjensen + Jeff Jensen + + Committer + + + + nicolas + Nicolas De Loof + nicolas@apache.org + Capgemini + + Committer + + +1 + + + ogusakov + Oleg Gusakov + + Committer + + + + pgier + Paul Gier + pgier@apache.org + + Committer + + -6 + + + pschneider + Patrick Schneider + pschneider@gmail.com + + Committer + + -6 + + + ptahchiev + Petar Tahchiev + ptahchiev@apache.org + + Committer + + +2 + + + rafale + Raphaël Piéroni + rafale@apache.org + Dexem + + Committer + + +1 + + + rinku + Rahul Thakur + + Committer + + + + shinobu + Shinobu Kuwai + + Committer + + + + smorgrav + Torbjorn Eikli Smorgrav + + Committer + + + + stephenc + Stephen Connolly + stephenc@apache.org + + Committer + + 0 + + + + + + + Maven Announcements List + announce@maven.apache.org + announce-subscribe@maven.apache.org + announce-unsubscribe@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-announce/ + + http://www.mail-archive.com/announce@maven.apache.org + http://www.nabble.com/Maven-Announcements-f15617.html + http://markmail.org/list/org.apache.maven.announce + + + + Maven Notifications List + notifications-subscribe@maven.apache.org + notifications-unsubscribe@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-notifications/ + + http://www.mail-archive.com/notifications@maven.apache.org + http://www.nabble.com/Maven---Notifications-f15574.html + http://markmail.org/list/org.apache.maven.notifications + + + + + + scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-15 + scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-15 + http://svn.apache.org/viewvc/maven/pom/tags/maven-parent-15 + + + Hudson + http://grid.sonatype.org/ci + + + mail + +
notifications@maven.apache.org
+ + + + + + + apache.website + scp://people.apache.org/www/maven.apache.org + + + + + + + + maven-assembly-plugin + 2.2-beta-4 + + + + + + + + apache-release + + + + maven-assembly-plugin + + + org.apache.apache.resources + apache-source-release-assembly-descriptor + 1.0.1 + + + + org.codehaus.plexus + plexus-utils + 2.0.1 + + + + + source-release-assembly + package + + single + + + true + + source-release + + gnu + + + + + + + + + quality-checks + + + quality-checks + true + + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 2.4 + + + ${project.build.directory}/generated-sources/modello + ${project.build.directory}/generated-sources/plugin + + + + + cpd-check + verify + + cpd-check + + + + + + + + + reporting + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.2 + + + clean + + clean + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.1.2 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.4.3 + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.3 + + config/maven_checks.xml + config/maven-header.txt + + + + org.apache.maven.plugins + maven-pmd-plugin + 2.4 + + + http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/rulesets/maven.xml + + + ${project.build.directory}/generated-sources/modello + ${project.build.directory}/generated-sources/plugin + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.3 + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + org.apache.maven.plugins + maven-jxr-plugin + 2.1 + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.6.1 + + ${project.build.sourceEncoding} + + http://java.sun.com/j2se/1.4.2/docs/api + http://java.sun.com/j2ee/1.4/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/ + http://commons.apache.org/dbcp/apidocs/ + http://commons.apache.org/fileupload/apidocs/ + http://commons.apache.org/httpclient/apidocs/ + http://commons.apache.org/logging/apidocs/ + http://commons.apache.org/pool/apidocs/ + http://junit.sourceforge.net/javadoc/ + http://logging.apache.org/log4j/1.2/apidocs/ + http://jakarta.apache.org/regexp/apidocs/ + http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/ + http://plexus.codehaus.org/plexus-utils/apidocs/ + http://plexus.codehaus.org/plexus-classworlds/apidocs/ + http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/ + + + + + + javadoc + test-javadoc + + + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-plugin-api/3.0.3/maven-plugin-api-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-plugin-api/3.0.3/maven-plugin-api-3.0.3.pom new file mode 100644 index 000000000..89677541b --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-plugin-api/3.0.3/maven-plugin-api-3.0.3.pom @@ -0,0 +1,70 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-plugin-api + + Maven Plugin API + + + + org.apache.maven + maven-model + + + org.apache.maven + maven-artifact + + + wagon-provider-api + org.apache.maven.wagon + + + + + org.sonatype.sisu + sisu-inject-plexus + + + + + + + org.codehaus.modello + modello-maven-plugin + + + src/main/mdo/lifecycle.mdo + + 1.0.0 + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-repository-metadata/3.0.3/maven-repository-metadata-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-repository-metadata/3.0.3/maven-repository-metadata-3.0.3.pom new file mode 100644 index 000000000..b318f3062 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-repository-metadata/3.0.3/maven-repository-metadata-3.0.3.pom @@ -0,0 +1,57 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-repository-metadata + + Maven Repository Metadata Model + Per-directory repository metadata. + + + + org.codehaus.plexus + plexus-utils + + + + + + + org.codehaus.modello + modello-maven-plugin + + 1.1.0 + + src/main/mdo/metadata.mdo + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings-builder/3.0.3/maven-settings-builder-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings-builder/3.0.3/maven-settings-builder-3.0.3.pom new file mode 100644 index 000000000..80e64420c --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings-builder/3.0.3/maven-settings-builder-3.0.3.pom @@ -0,0 +1,67 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-settings-builder + + Maven Settings Builder + + + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-interpolation + + + org.codehaus.plexus + plexus-component-annotations + + + org.apache.maven + maven-settings + + + org.sonatype.plexus + plexus-sec-dispatcher + + + + + + + org.codehaus.plexus + plexus-component-metadata + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings/3.0.3/maven-settings-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings/3.0.3/maven-settings-3.0.3.pom new file mode 100644 index 000000000..4b166f287 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven-settings/3.0.3/maven-settings-3.0.3.pom @@ -0,0 +1,57 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven + 3.0.3 + + + maven-settings + + Maven Settings + Maven Settings + + + + org.codehaus.plexus + plexus-utils + + + + + + + org.codehaus.modello + modello-maven-plugin + + 1.1.0 + + src/main/mdo/settings.mdo + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven/3.0.3/maven-3.0.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven/3.0.3/maven-3.0.3.pom new file mode 100644 index 000000000..e2f2cd04e --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/maven/3.0.3/maven-3.0.3.pom @@ -0,0 +1,600 @@ + + + + + + 4.0.0 + + + org.apache.maven + maven-parent + 15 + ../pom/maven/pom.xml + + + maven + 3.0.3 + pom + + Apache Maven + Maven is a project development management and + comprehension tool. Based on the concept of a project object model: + builds, dependency management, documentation creation, site + publication, and distribution publication are all controlled from + the declarative file. Maven can be extended by plugins to utilise a + number of other development tools for reporting or the build + process. + + http://maven.apache.org/ + 2001 + + + 2.4 + 1.2 + 1.2_Java1.3 + 3.8.2 + 1.5.5 + 1.14 + 2.0.6 + 2.1.1 + 1.0-beta-7 + 1.3 + 1.4 + 1.4.1 + 1.3 + 1.11 + true + + + + + Maven Developer List + dev-subscribe@maven.apache.org + dev-unsubscribe@maven.apache.org + dev@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-dev + + http://www.mail-archive.com/dev@maven.apache.org/ + http://old.nabble.com/Maven-Developers-f179.html + http://maven.dev.markmail.org/ + + + + Maven User List + users-subscribe@maven.apache.org + users-unsubscribe@maven.apache.org + users@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-users + + http://www.mail-archive.com/users@maven.apache.org/ + http://old.nabble.com/Maven---Users-f178.html + http://maven.users.markmail.org/ + + + + Maven Issues List + issues-subscribe@maven.apache.org + issues-unsubscribe@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-issues/ + + http://www.mail-archive.com/issues@maven.apache.org + http://old.nabble.com/Maven---Issues-f15573.html + http://maven.issues.markmail.org/ + + + + Maven Commits List + commits-subscribe@maven.apache.org + commits-unsubscribe@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-commits + + http://www.mail-archive.com/commits@maven.apache.org + http://old.nabble.com/Maven---Commits-f15575.html + http://maven.commits.markmail.org/ + + + + + Maven Announcements List + announce@maven.apache.org + announce-subscribe@maven.apache.org + announce-unsubscribe@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-announce/ + + http://www.mail-archive.com/announce@maven.apache.org + http://old.nabble.com/Maven-Announcements-f15617.html + http://maven.announce.markmail.org/ + + + + Maven Notifications List + notifications-subscribe@maven.apache.org + notifications-unsubscribe@maven.apache.org + http://mail-archives.apache.org/mod_mbox/maven-notifications/ + + http://www.mail-archive.com/notifications@maven.apache.org + http://old.nabble.com/Maven---Notifications-f15574.html + http://maven.notifications.markmail.org/ + + + + + + maven-core + apache-maven + maven-model + maven-settings + maven-settings-builder + maven-artifact + maven-aether-provider + maven-repository-metadata + maven-plugin-api + maven-model-builder + maven-embedder + maven-compat + + + + scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0.3 + scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0.3 + http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.0.3 + + + jira + http://jira.codehaus.org/browse/MNG + + + + apache.website + scp://people.apache.org/www/maven.apache.org/ref/${project.version}/ + + + + + + + + + + + org.apache.maven + maven-model + ${project.version} + + + org.apache.maven + maven-settings + ${project.version} + + + org.apache.maven + maven-settings-builder + ${project.version} + + + org.apache.maven + maven-plugin-api + ${project.version} + + + org.apache.maven + maven-embedder + ${project.version} + + + org.apache.maven + maven-core + ${project.version} + + + org.apache.maven + maven-model-builder + ${project.version} + + + org.apache.maven + maven-compat + ${project.version} + + + org.apache.maven + maven-artifact + ${project.version} + + + org.apache.maven + maven-aether-provider + ${project.version} + + + org.apache.maven + maven-repository-metadata + ${project.version} + + + + + org.codehaus.plexus + plexus-utils + ${plexusUtilsVersion} + + + org.sonatype.sisu + sisu-inject-plexus + ${sisuInjectVersion} + + + + org.sonatype.sisu.inject + cglib + + + + + org.codehaus.plexus + plexus-component-annotations + ${plexusVersion} + + + junit + junit + + + + + org.codehaus.plexus + plexus-classworlds + ${classWorldsVersion} + + + org.codehaus.plexus + plexus-interpolation + ${plexusInterpolationVersion} + + + + org.apache.maven.wagon + wagon-provider-api + ${wagonVersion} + + + org.apache.maven.wagon + wagon-file + ${wagonVersion} + + + org.apache.maven.wagon + wagon-http-lightweight + ${wagonVersion} + + + commons-logging + commons-logging + + + + + + org.sonatype.aether + aether-api + ${aetherVersion} + + + org.sonatype.aether + aether-spi + ${aetherVersion} + + + org.sonatype.aether + aether-impl + ${aetherVersion} + + + org.sonatype.aether + aether-util + ${aetherVersion} + + + org.sonatype.aether + aether-connector-wagon + ${aetherVersion} + + + org.codehaus.plexus + plexus-container-default + + + + + + commons-cli + commons-cli + ${commonsCliVersion} + + + commons-lang + commons-lang + + + commons-logging + commons-logging + + + + + commons-jxpath + commons-jxpath + ${jxpathVersion} + + + org.sonatype.plexus + plexus-sec-dispatcher + ${securityDispatcherVersion} + + + org.sonatype.plexus + plexus-cipher + ${cipherVersion} + + + + easymock + easymock + ${easyMockVersion} + test + + + + + + + + + + junit + junit + ${junitVersion} + test + + + + + + + + + org.codehaus.plexus + plexus-component-metadata + ${plexusVersion} + + + + generate-metadata + generate-test-metadata + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + maven-release-plugin + + https://svn.apache.org/repos/asf/maven/maven-3/tags + true + + + + maven-surefire-plugin + 2.7.2 + + -Xmx256m + + + + org.codehaus.modello + modello-maven-plugin + ${modelloVersion} + + true + + + + site-docs + pre-site + + xdoc + xsd + + + + standard + + java + xpp3-reader + xpp3-writer + + + + + + org.apache.felix + maven-bundle-plugin + 1.0.0 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-5 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.2 + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.1 + + + org.apache.maven.plugins + maven-site-plugin + 2.1 + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.6 + + + org.codehaus.mojo.signature + java15 + 1.0 + + + + + check-java-1.5-compat + process-classes + + check + + + + + + + + + + apache-release + + + + maven-assembly-plugin + + + source-release-assembly + + + true + + + + + + + + + reporting + + + + maven-javadoc-plugin + 2.5 + + + maven-pmd-plugin + + 1.5 + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.2 + + + + + + + + + + + + maven-repo-local + + + maven.repo.local + + + + + + maven-surefire-plugin + + + + + maven.repo.local + ${maven.repo.local} + + + + + + + + + m2e + + target + + + + m2e.version + + + + ${m2BuildDirectory} + + + org.maven.ide.eclipse + lifecycle-mapping + 0.10.0 + + customizable + + + + + + + org.apache.maven.plugins:maven-resources-plugin:: + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.pom new file mode 100644 index 000000000..b06f641eb --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.pom @@ -0,0 +1,106 @@ + + + + 4.0.0 + + + plexus + org.codehaus.plexus + 2.0.7 + + + org.codehaus.plexus + plexus-classworlds + 2.4 + + Plexus Classworlds + A class loader framework + 2002 + + + scm:git:git@github.com:sonatype/plexus-classworlds.git + scm:git:git@github.com:sonatype/plexus-classworlds.git + http://github.com/sonatype/plexus-classworlds + + + + + junit + junit + 3.8.2 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.2 + + true + -ea:org.codehaus.classworlds:org.codehaus.plexus.classworlds + once + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org/codehaus/plexus/classworlds/event/* + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.0 + + + generate-test-resources + + copy + + + + + ant + ant + 1.6.5 + + + commons-logging + commons-logging + 1.0.3 + + + xml-apis + xml-apis + 1.3.02 + + + ${project.build.directory}/test-lib + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom new file mode 100644 index 000000000..01868b124 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom @@ -0,0 +1,20 @@ + + + + + 4.0.0 + + + org.codehaus.plexus + plexus-containers + 1.5.5 + + + plexus-component-annotations + + Plexus :: Component Annotations + + Plexus Component "Java 5" Annotations, to describe plexus components properties in java sources with + standard annotations instead of javadoc annotations. + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom new file mode 100644 index 000000000..67d3f467a --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom @@ -0,0 +1,168 @@ + + + + 4.0.0 + + + plexus + org.codehaus.plexus + 2.0.7 + ../pom/pom.xml + + + org.codehaus.plexus + plexus-components + 1.1.18 + pom + + Plexus Components + http://plexus.codehaus.org/plexus-components + + + + plexus-archiver + plexus-cli + plexus-compiler + plexus-digest + plexus-i18n + plexus-interactivity + plexus-interpolation + plexus-io + plexus-resources + + plexus-velocity + + + + scm:svn:http://svn.codehaus.org/plexus/plexus-components/tags/plexus-components-1.1.18 + scm:svn:https://svn.codehaus.org/plexus/plexus-components/tags/plexus-components-1.1.18 + http://fisheye.codehaus.org/browse/plexus/plexus-components/tags/plexus-components-1.1.18 + + + JIRA + http://jira.codehaus.org/browse/PLXCOMP + + + + + + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9-stable-1 + + + org.codehaus.plexus + plexus-utils + 1.5.5 + + + junit + junit + 3.8.2 + test + + + + + + + + maven-compiler-plugin + + 1.4 + 1.4 + + + + org.codehaus.plexus + plexus-component-metadata + 1.5.4 + + + + generate-metadata + + + + + + + + + + parent-release + + + + maven-release-plugin + + -N -Pplexus-release + + + + + + + maven-3 + + + + ${basedir} + + + + + + org.apache.maven.plugins + maven-site-plugin + 2.1 + false + + + attach-descriptor + + attach-descriptor + + + + + + + + + m2e + + + m2e.version + + + + target + + + ${m2BuildDirectory} + + + org.maven.ide.eclipse + lifecycle-mapping + 0.10.0 + + customizable + + + + + + + org.apache.maven.plugins:maven-resources-plugin:: + + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom new file mode 100644 index 000000000..ad40ba65c --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom @@ -0,0 +1,122 @@ + + + 4.0.0 + + + org.codehaus.plexus + plexus + 2.0.7 + + + plexus-containers + 1.5.5 + pom + + Plexus Containers + + Plexus IoC Container core with companion tools. + + + + plexus-component-annotations + plexus-component-metadata + plexus-component-javadoc + plexus-container-default + + + + scm:svn:https://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.5.5 + scm:svn:https://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.5.5 + http://fisheye.codehaus.org/browse/plexus/plexus-containers/tags/plexus-containers-1.5.5 + + + + 2.2.2 + 1.4.5 + 3.4 + UTF-8 + + + + + + org.codehaus.plexus + plexus-container-default + ${project.version} + + + org.codehaus.plexus + plexus-component-annotations + ${project.version} + + + org.codehaus.plexus + plexus-component-metadata + ${project.version} + + + org.codehaus.plexus + plexus-classworlds + ${classWorldsVersion} + + + org.codehaus.plexus + plexus-utils + ${plexusUtilsVersion} + + + org.apache.xbean + xbean-reflect + ${xbeanReflectVersion} + + + com.thoughtworks.qdox + qdox + 1.9.2 + + + jdom + jdom + 1.0 + + + org.apache.maven + maven-plugin-api + 2.0.9 + + + org.apache.maven + maven-model + 2.0.9 + + + org.apache.maven + maven-project + 2.0.9 + + + com.google.collections + google-collections + 1.0 + + + junit + junit + 3.8.2 + + + + + + + + maven-compiler-plugin + + 1.5 + 1.5 + ${project.build.sourceEncoding} + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom new file mode 100644 index 000000000..27882ac08 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom @@ -0,0 +1,20 @@ + + 4.0.0 + + + org.codehaus.plexus + plexus-components + 1.1.18 + + + plexus-interpolation + 1.14 + + Plexus Interpolation API + + + scm:svn:http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interpolation-1.14 + scm:svn:https://svn.codehaus.org/plexus/plexus-components/tags/plexus-interpolation-1.14 + http://fisheye.codehaus.org/browse/plexus/plexus-components/tags/plexus-interpolation-1.14 + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom new file mode 100644 index 000000000..9dd8320dd --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom @@ -0,0 +1,80 @@ + + + + + + 4.0.0 + + + org.codehaus.plexus + plexus + 2.0.7 + ../pom/pom.xml + + + plexus-utils + 2.0.6 + + Plexus Common Utilities + A collection of various utility classes to ease working with strings, files, command lines, XML and more. + http://plexus.codehaus.org/plexus-utils + + + scm:git:git@github.com:sonatype/plexus-utils.git + scm:git:git@github.com:sonatype/plexus-utils.git + http://github.com/sonatype/plexus-utils + + + JIRA + http://jira.codehaus.org/browse/PLXUTILS + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + + + + org.apache.maven.plugins + maven-surefire-plugin + + + true + + org/codehaus/plexus/util/FileBasedTestCase.java + **/Test*.java + + + + JAVA_HOME + ${JAVA_HOME} + + + M2_HOME + ${M2_HOME} + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom new file mode 100644 index 000000000..2f8cf16ba --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom @@ -0,0 +1,535 @@ + + + + + + 4.0.0 + + org.codehaus.plexus + plexus + pom + 2.0.7 + + Plexus + The Plexus project provides a full software stack for creating and executing software projects. + http://plexus.codehaus.org/ + 2001 + + Codehaus + http://www.codehaus.org/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + jvanzyl + Jason van Zyl + jason@maven.org + + Developer + Release Manager + + + + kaz + Pete Kazmier + + + + Developer + + + + jtaylor + James Taylor + james@jamestaylor.org + + + Developer + + + + dandiep + Dan Diephouse + dan@envoisolutions.com + Envoi solutions + + Developer + + + + kasper + Kasper Nielsen + apache@kav.dk + + + Developer + + + + bwalding + Ben Walding + bwalding@codehaus.org + Walding Consulting Services + + Developer + + + + mhw + Mark Wilkinson + mhw@kremvax.net + + Developer + + + + michal + Michal Maczka + mmaczka@interia.pl + + Developer + + + + evenisse + Emmanuel Venisse + evenisse@codehaus.org + + Developer + + + + Trygve Laugstøl + trygvis + trygvis@codehaus.org + + Developer + + + + Kenney Westerhof + kenney + kenney@codehaus.org + + Developer + + + + Carlos Sanchez + carlos + carlos@codehaus.org + + Developer + + + + Brett Porter + brett + brett@codehaus.org + + Developer + + + + John Casey + jdcasey + jdcasey@codehaus.org + + Developer + + + + Andrew Williams + handyande + andy@handyande.co.uk + + Developer + + + + Rahul Thakur + rahul + rahul.thakur.xdev@gmail.com + + Developer + + + + Joakim Erdfelt + joakime + joakim@erdfelt.com + + Developer + + + + Olivier Lamy + olamy + olamy@codehaus.org + + Developer + + + + Hervé Boutemy + hboutemy + hboutemy@codehaus.org + + Developer + + + + Oleg Gusakov + oleg + olegy@codehaus.org + + Developer + + + + Vincent Siveton + vsiveton + vsiveton@codehaus.org + + Developer + + + + + + + Plexus User List + http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org + http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org + http://archive.plexus.codehaus.org/user + user@plexus.codehaus.org + + + Plexus Developer List + http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org + http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org + http://archive.plexus.codehaus.org/dev + dev@plexus.codehaus.org + + + Plexus Announce List + http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org + http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org + http://archive.plexus.codehaus.org/announce + + + Plexus Commit List + http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org + http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org + http://archive.plexus.codehaus.org/scm + + + + + scm:svn:http://svn.codehaus.org/plexus/pom/tags/plexus-2.0.7 + scm:svn:https://svn.codehaus.org/plexus/pom/tags/plexus-2.0.7 + http://fisheye.codehaus.org/browse/plexus/pom/tags/plexus-2.0.7 + + + JIRA + http://jira.codehaus.org/browse/PLX + + + + + mail + +
dev@plexus.codehaus.org
+ + + + + + + plexus-releases + Plexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + plexus-snapshots + Plexus Snapshot Repository + ${plexusDistMgmtSnapshotsUrl} + + + codehaus.org + dav:https://dav.codehaus.org/plexus + + + + + UTF-8 + https://oss.sonatype.org/content/repositories/plexus-snapshots + + + + + junit + junit + 3.8.2 + test + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.1 + + 1.4 + 1.4 + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + org.apache.maven.plugins + maven-plugin-plugin + 2.6 + + + maven-release-plugin + 2.0 + + deploy + false + -Pplexus-release + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + + org.apache.maven.plugins + maven-site-plugin + 2.1 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + + + + + + + + maven-project-info-reports-plugin + 2.1.2 + + + + + + + reporting + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.1.2 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.4.3 + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.2 + + http://svn.apache.org/repos/asf/maven/plugins/tags/maven-checkstyle-plugin-2.2/src/main/resources/config/maven_checks.xml + http://svn.codehaus.org/plexus/pom/trunk/src/main/resources/config/plexus-header.txt + + + + org.apache.maven.plugins + maven-pmd-plugin + 2.4 + + + http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/src/main/resources/rulesets/maven.xml + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + org.apache.maven.plugins + maven-jxr-plugin + 2.1 + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + http://java.sun.com/j2ee/1.4/docs/api + http://junit.sourceforge.net/javadoc/ + + + + + + javadoc + test-javadoc + + + + + + + + + plexus-release + + + + org.apache.maven.plugins + maven-gpg-plugin + + ${gpg.passphrase} + + + + sign-artifacts + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + maven-3 + + + + ${basedir} + + + + + + org.apache.maven.plugins + maven-site-plugin + 2.1 + false + + + attach-descriptor + + attach-descriptor + + + + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-api/1.11/aether-api-1.11.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-api/1.11/aether-api-1.11.pom new file mode 100644 index 000000000..24264b9ec --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-api/1.11/aether-api-1.11.pom @@ -0,0 +1,47 @@ + + + + + + 4.0.0 + + + org.sonatype.aether + aether-parent + 1.11 + + + aether-api + + Aether :: API + + The application programming interface for the repository system. + + + + + junit + junit + test + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-impl/1.11/aether-impl-1.11.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-impl/1.11/aether-impl-1.11.pom new file mode 100644 index 000000000..a5e67a130 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-impl/1.11/aether-impl-1.11.pom @@ -0,0 +1,98 @@ + + + + + + 4.0.0 + + + org.sonatype.aether + aether-parent + 1.11 + + + aether-impl + + Aether :: Implementation + + An implementation of the repository system. + + + + + org.sonatype.aether + aether-api + + + org.sonatype.aether + aether-spi + + + org.sonatype.aether + aether-util + + + org.codehaus.plexus + plexus-component-annotations + provided + + + org.codehaus.plexus + plexus-container-default + provided + + + org.codehaus.plexus + plexus-classworlds + + + org.apache.xbean + xbean-reflect + + + com.google.collections + google-collections + + + + + org.slf4j + slf4j-api + 1.6.1 + provided + + + junit + junit + test + + + org.sonatype.aether + aether-test-util + test + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + org.codehaus.plexus + plexus-component-metadata + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-parent/1.11/aether-parent-1.11.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-parent/1.11/aether-parent-1.11.pom new file mode 100644 index 000000000..0347d9f2d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-parent/1.11/aether-parent-1.11.pom @@ -0,0 +1,326 @@ + + + + + + 4.0.0 + + + org.sonatype.forge + forge-parent + 6 + + + org.sonatype.aether + aether-parent + 1.11 + pom + + Aether + + The parent and aggregator for the repository system. + + http://aether.sonatype.org/ + 2010 + + + Sonatype, Inc. + http://www.sonatype.com/ + + + + + Aether Developers List + aether-dev-subscribe@sonatype.org + aether-dev-unsubscribe@sonatype.org + aether-dev@sonatype.org + + + + Aether Users List + aether-user-subscribe@sonatype.org + aether-user-unsubscribe@sonatype.org + aether-user@sonatype.org + + + + Aether Commits List + aether-scm-subscribe@sonatype.org + aether-scm-unsubscribe@sonatype.org + + + + + scm:git:git@github.com:sonatype/sonatype-aether.git + scm:git:git@github.com:sonatype/sonatype-aether.git + http://github.com/sonatype/sonatype-aether + + + + jira + https://issues.sonatype.org/browse/AETHER + + + + Hudson + https://grid.sonatype.org/ci/job/Aether/ + + + + + Eclipse Public License, Version 1.0 + http://www.eclipse.org/legal/epl-v10.html + repo + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + aether-api + aether-spi + aether-util + aether-impl + aether-test-util + aether-connector-file + aether-connector-wagon + aether-connector-asynchttpclient + + + + UTF-8 + https://repository.sonatype.org/service/local/staging/deploy/maven2 + true + + + + + + org.sonatype.aether + aether-api + ${project.version} + + + org.sonatype.aether + aether-spi + ${project.version} + + + org.sonatype.aether + aether-util + ${project.version} + + + org.sonatype.aether + aether-impl + ${project.version} + + + org.sonatype.aether + aether-connector-file + ${project.version} + + + org.sonatype.aether + aether-connector-wagon + ${project.version} + + + org.sonatype.aether + aether-connector-asynchttpclient + ${project.version} + + + org.sonatype.aether + aether-test-util + ${project.version} + test + + + + junit + junit + 4.8.1 + test + + + + org.codehaus.plexus + plexus-component-annotations + 1.5.5 + provided + + + org.codehaus.plexus + plexus-container-default + 1.5.5 + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-5 + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + http://java.sun.com/javase/6/docs/api/ + + + + + org.apache.maven.plugins + maven-release-plugin + 2.0 + + true + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7.2 + + -Xmx128m + ${surefire.redirectTestOutputToFile} + + ${project.build.directory}/surefire-tmp + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.6 + + + org.codehaus.mojo.signature + java15 + 1.0 + + + + + check-java-1.5-compat + process-classes + + check + + + + + + org.codehaus.plexus + plexus-component-metadata + 1.5.5 + + + generate-components-xml + + generate-metadata + + + + + + + + + + + demo + + aether-demo + + + + release + + + + org.apache.maven.plugins + maven-assembly-plugin + + + org.apache.apache.resources + apache-source-release-assembly-descriptor + 1.0.2 + + + + + attach-source-release-distro + package + + single + + + true + + source-release + + gnu + + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-spi/1.11/aether-spi-1.11.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-spi/1.11/aether-spi-1.11.pom new file mode 100644 index 000000000..c49aa4214 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-spi/1.11/aether-spi-1.11.pom @@ -0,0 +1,46 @@ + + + + + + 4.0.0 + + + org.sonatype.aether + aether-parent + 1.11 + + + aether-spi + + Aether :: SPI + + The service provider interface for repository system implementations and repository connectors. + + + + + org.sonatype.aether + aether-api + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-util/1.11/aether-util-1.11.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-util/1.11/aether-util-1.11.pom new file mode 100644 index 000000000..21e72cf72 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/aether/aether-util/1.11/aether-util-1.11.pom @@ -0,0 +1,56 @@ + + + + + + 4.0.0 + + + org.sonatype.aether + aether-parent + 1.11 + + + aether-util + + Aether :: Utilities + + A collection of utility classes to ease usage of the repository system. + + + + + org.sonatype.aether + aether-api + + + org.sonatype.aether + aether-test-util + test + + + junit + junit + test + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/4/forge-parent-4.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/4/forge-parent-4.pom new file mode 100644 index 000000000..f2dec6e6a --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/4/forge-parent-4.pom @@ -0,0 +1,225 @@ + + 4.0.0 + org.sonatype.forge + forge-parent + pom + 4 + Sonatype Forge Parent Pom + 2008 + http://forge.sonatype.com/ + + scm:svn:http://svn.sonatype.org/forge/tags/forge-parent-4 + http://svn.sonatype.org/forge/tags/forge-parent-4 + scm:svn:https://svn.sonatype.org/forge/tags/forge-parent-4 + + + + + forge-releases + http://repository.sonatype.org/content/repositories/releases + forge-snapshots + http://repository.sonatype.org/content/repositories/snapshots + + + + ${forgeReleaseId} + ${forgeReleaseUrl} + + + ${forgeSnapshotId} + ${forgeSnapshotUrl} + + + + + + + + + + + maven-enforcer-plugin + 1.0-alpha-4-sonatype + + + maven-eclipse-plugin + 2.4 + + + maven-surefire-plugin + 2.3 + + + maven-clean-plugin + 2.2 + + + maven-deploy-plugin + 2.3 + + + maven-dependency-plugin + 2.0 + + + maven-site-plugin + 2.0-beta-6 + + + maven-jar-plugin + 2.1 + + + maven-help-plugin + 2.0.2 + + + maven-resources-plugin + 2.2 + + + maven-install-plugin + 2.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-1 + + + org.apache.maven.plugins + maven-release-plugin + 2.0-beta-8 + + false + deploy + -Prelease + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.0-alpha-4 + + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + org.codehaus.mojo + findbugs-maven-plugin + 1.1.1 + + UnreadFields + + + + maven-jxr-plugin + 2.0 + + + maven-pmd-plugin + 2.3 + + 1.5 + + + + + + + + + + release + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + ${gpg.passphrase} + + + + + sign + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + ${deploy.altRepository} + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.sourceEncoding} + + + + attach-javadocs + + jar + + + + + + + + + + + \ No newline at end of file diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/6/forge-parent-6.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/6/forge-parent-6.pom new file mode 100644 index 000000000..316569800 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/6/forge-parent-6.pom @@ -0,0 +1,253 @@ + + + + 4.0.0 + + org.sonatype.forge + forge-parent + pom + 6 + Sonatype Forge Parent Pom + + 2008 + http://forge.sonatype.com/ + + + scm:svn:http://svn.sonatype.org/forge/tags/forge-parent-6 + http://svn.sonatype.org/forge/tags/forge-parent-6 + scm:svn:https://svn.sonatype.org/forge/tags/forge-parent-6 + + + + forge-releases + http://repository.sonatype.org:8081/service/local/staging/deploy/maven2 + forge-snapshots + http://repository.sonatype.org/content/repositories/snapshots + + + + + ${forgeReleaseId} + ${forgeReleaseUrl} + + + ${forgeSnapshotId} + ${forgeSnapshotUrl} + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0-beta-1 + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.4 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + true + + + + org.apache.maven.plugins + maven-clean-plugin + 2.4 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.4 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.1 + + + org.apache.maven.plugins + maven-site-plugin + 2.0-beta-7 + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + org.apache.maven.plugins + maven-resources-plugin + 2.3 + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.1 + + + org.apache.maven.plugins + maven-install-plugin + 2.2 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-3 + + + org.apache.maven.plugins + maven-release-plugin + 2.0-beta-9 + + false + deploy + -Prelease + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.0 + + + org.apache.maven.plugins + maven-scm-plugin + 1.2 + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + org.codehaus.mojo + findbugs-maven-plugin + 1.1.1 + + UnreadFields + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.1 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.1.1 + + + org.apache.maven.plugins + maven-pmd-plugin + 2.4 + + 1.5 + + + + + + + + release + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + ${gpg.passphrase} + + + + + sign + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + ${deploy.altRepository} + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.sourceEncoding} + + + + attach-javadocs + + jar + + + + + + + + + + + \ No newline at end of file diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/7/forge-parent-7.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/7/forge-parent-7.pom new file mode 100644 index 000000000..3855f0e6d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/forge/forge-parent/7/forge-parent-7.pom @@ -0,0 +1,303 @@ + + + + 4.0.0 + + org.sonatype.forge + forge-parent + pom + 7 + Sonatype Forge Parent Pom + + 2008 + ${forgeSiteUrl} + + + Sonatype, Inc. + http://www.sonatype.com/ + + + + scm:svn:http://svn.sonatype.org/forge/tags/forge-parent-7 + http://svn.sonatype.org/forge/tags/forge-parent-7 + scm:svn:https://svn.sonatype.org/forge/tags/forge-parent-7 + + + + UTF-8 + forge-releases + https://repository.sonatype.org/service/local/staging/deploy/maven2 + forge-snapshots + https://repository.sonatype.org/content/repositories/snapshots + forge-sites + https://repository.sonatype.org/content/sites/maven-sites/forge-parent + + + + + ${forgeReleaseId} + ${forgeReleaseUrl} + + + ${forgeSnapshotId} + ${forgeSnapshotUrl} + + + ${forgeSiteId} + dav:${forgeSiteUrl} + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-3 + + + org.apache.maven.plugins + maven-clean-plugin + 2.4 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.1 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.4 + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.4 + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0-beta-1 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + org.apache.maven.plugins + maven-install-plugin + 2.2 + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + org.apache.maven.plugins + maven-release-plugin + 2.0-beta-9 + + false + deploy + -Prelease + + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.1 + + + org.apache.maven.plugins + maven-resources-plugin + 2.3 + + + org.apache.maven.plugins + maven-scm-plugin + 1.2 + + + org.apache.maven.plugins + maven-site-plugin + 3.0-beta-3 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + true + + + + + + + maven-site-plugin + + + attach-descriptor + + attach-descriptor + + + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.3 + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.1 + + UnreadFields + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.1 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.2 + + + org.apache.maven.plugins + maven-pmd-plugin + 2.4 + + 1.5 + + + + + + + + release + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + ${gpg.passphrase} + + + + + sign + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + ${deploy.altRepository} + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.sourceEncoding} + + + + attach-javadocs + + jar + + + + + + + + + + + \ No newline at end of file diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom new file mode 100644 index 000000000..556cc844f --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom @@ -0,0 +1,67 @@ + + + + org.sonatype.spice + spice-parent + 12 + + + 4.0.0 + org.sonatype.plexus + plexus-cipher + http://spice.sonatype.org/${project.artifactId} + + Plexus Cipher: encryption/decryption Component + 1.4 + + + + sonatype.org-sites + ${spiceSiteBaseUrl}/${project.artifactId} + + + + + + + org.codehaus.plexus + plexus-maven-plugin + 1.3.5 + + + + descriptor + + + + + + maven-compiler-plugin + + 1.4 + 1.4 + + + + + + + + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9-stable-1 + provided + + + junit + junit + 3.8.2 + + + + + scm:svn:http://svn.sonatype.org/spice/tags/plexus-cipher-1.4 + scm:svn:https://svn.sonatype.org/spice/tags/plexus-cipher-1.4 + http://svn.sonatype.org/spice/tags/plexus-cipher-1.4 + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom new file mode 100644 index 000000000..6ff4d3406 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom @@ -0,0 +1,97 @@ + + + + org.sonatype.spice + spice-parent + 12 + + + 4.0.0 + org.sonatype.plexus + plexus-sec-dispatcher + http://spice.sonatype.org/${project.artifactId} + + Plexus Security Dispatcher Component + 1.3 + + + + sonatype.org-sites + ${spiceSiteBaseUrl}/${project.artifactId} + + + + + + + org.codehaus.plexus + plexus-maven-plugin + 1.3.5 + + + + descriptor + + + + + + maven-compiler-plugin + + + 1.4 + 1.4 + + + + org.codehaus.modello + modello-maven-plugin + + 1.0.0 + + src/main/mdo/settings-security.mdo + + + + + standard + + java + xpp3-reader + xpp3-writer + + + + + + + + + + org.codehaus.plexus + plexus-utils + + + org.sonatype.plexus + plexus-cipher + 1.4 + + + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9-stable-1 + provided + + + junit + junit + 3.8.2 + + + + + scm:svn:http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.3 + scm:svn:https://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.3 + http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.3 + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-bean/2.1.1/guice-bean-2.1.1.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-bean/2.1.1/guice-bean-2.1.1.pom new file mode 100644 index 000000000..8ca4122ca --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-bean/2.1.1/guice-bean-2.1.1.pom @@ -0,0 +1,91 @@ + + + + + + + 4.0.0 + + + org.sonatype.sisu + sisu-inject + 2.1.1 + + + pom + + org.sonatype.sisu.inject + guice-bean + + Guice - Bean + + + guice-bean-reflect + guice-bean-inject + guice-bean-scanners + guice-bean-converters + guice-bean-locators + guice-bean-binders + guice-bean-containers + sisu-inject-bean + + + + + + + org.sonatype.sisu.inject + guice-bean-reflect + ${project.version} + + + org.sonatype.sisu.inject + guice-bean-inject + ${project.version} + + + org.sonatype.sisu.inject + guice-bean-scanners + ${project.version} + + + org.sonatype.sisu.inject + guice-bean-converters + ${project.version} + + + org.sonatype.sisu.inject + guice-bean-locators + ${project.version} + + + org.sonatype.sisu.inject + guice-bean-binders + ${project.version} + + + org.sonatype.sisu.inject + guice-bean-containers + ${project.version} + + + + org.sonatype.sisu + sisu-inject-bean + ${project.version} + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-parent/2.9.4/guice-parent-2.9.4.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-parent/2.9.4/guice-parent-2.9.4.pom new file mode 100644 index 000000000..1ae728d21 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-parent/2.9.4/guice-parent-2.9.4.pom @@ -0,0 +1,385 @@ + + + + + + + 4.0.0 + + + org.sonatype.forge + forge-parent + 6 + + + pom + + org.sonatype.sisu.inject + guice-parent + 2.9.4 + + Google Guice + + + Guice is a lightweight dependency injection framework for Java 5 and above + + + http://code.google.com/p/google-guice/ + 2006 + + + Google, Inc. + http://www.google.com + + + + + Guice Users List + http://groups.google.com/group/google-guice/topics + http://groups.google.com/group/google-guice/subscribe + http://groups.google.com/group/google-guice/subscribe + http://groups.google.com/group/google-guice/post + + + Guice Developers List + http://groups.google.com/group/google-guice-dev/topics + http://groups.google.com/group/google-guice-dev/subscribe + http://groups.google.com/group/google-guice-dev/subscribe + http://groups.google.com/group/google-guice-dev/post + + + + + scm:git:git@github.com:sonatype/sisu-guice.git + scm:git:git@github.com:sonatype/sisu-guice.git + http://github.com/sonatype/sisu-guice + + + + Google Code + http://code.google.com/p/google-guice/issues/ + + + + Hudson + https://grid.sonatype.org/ci/job/sisu-guice/ + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + core + extensions + + + + 3.0 + + + + + 1.3 + UTF-8 + https://repository.sonatype.org/service/local/staging/deploy/maven2 + + true + + true + + + + + + org.testng + testng + 5.11 + jdk15 + test + + + + + + ${project.basedir}/src + + + false + ${project.basedir}/src + + **/*.java + + + + ${project.basedir}/test + + + false + ${project.basedir}/test + + **/*.java + + + + + + + + maven-remote-resources-plugin + 1.1 + + + + process + + + + org.apache:apache-jar-resource-bundle:1.4 + + + + + + + + maven-compiler-plugin + 2.3.2 + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.6 + + + org.codehaus.mojo.signature + java15 + 1.0 + + + + + check-java-1.5-compat + process-classes + + check + + + + + + + org.sonatype.plugins + jarjar-maven-plugin + 1.3 + + + + net.sf.cglib.* + com.google.inject.internal.cglib.$@1 + + + net.sf.cglib.**.* + com.google.inject.internal.cglib.@1.$@2 + + + org.objectweb.asm.* + com.google.inject.internal.asm.$@1 + + + org.objectweb.asm.**.* + com.google.inject.internal.asm.@1.$@2 + + + com.google.inject.internal.util.* + com.google.inject.internal.util.$@1 + + + com.google.inject.internal.util.**.* + com.google.inject.internal.util.@1.$@2 + + + com.google.inject.** + + + com.googlecode.** + + + + + + + jarjar-classes + process-test-classes + + jarjar + + + {classes} + + + + jarjar-test-classes + process-test-classes + + jarjar + + + {test-classes} + + + + + + maven-surefire-plugin + 2.5 + + true + + + + + org.apache.felix + maven-bundle-plugin + 2.1.0 + + + Sonatype, Inc. + Copyright (C) 2006 Google Inc. + http://code.google.com/p/google-guice/ + ${project.artifactId} + + J2SE-1.5,JavaSE-1.6 + + !com.google.inject.*,* + <_exportcontents>!*.internal.*,com.google.inject.*;version=${guice.api.version} + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) + <_nouses>true + <_removeheaders> + Embed-Dependency,Embed-Transitive, + Built-By,Tool,Created-By,Build-Jdk, + Originally-Created-By,Archiver-Version, + Include-Resource,Private-Package, + Ignore-Package,Bnd-LastModified + + + + + + prepare-package + + manifest + + + + + + + maven-jar-plugin + 2.3.1 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + false + + + + + package + + test-jar + + + + + + maven-javadoc-plugin + 2.7 + + + maven-source-plugin + 2.1.2 + + + maven-gpg-plugin + 1.1 + + + maven-release-plugin + 2.1 + + true + + + + maven-deploy-plugin + 2.5 + + + + + + + + + sonatype-grid + + forge-releases + http://repository.sonatype.org:8081/service/local/staging/deploy/maven2 + forge-snapshots + http://repository.sonatype.org/content/repositories/snapshots + + + + ${forgeReleaseId} + ${forgeReleaseUrl} + + + ${forgeSnapshotId} + ${forgeSnapshotUrl} + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-plexus/2.1.1/guice-plexus-2.1.1.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-plexus/2.1.1/guice-plexus-2.1.1.pom new file mode 100644 index 000000000..56ff0bf09 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/inject/guice-plexus/2.1.1/guice-plexus-2.1.1.pom @@ -0,0 +1,106 @@ + + + + + + + 4.0.0 + + + ../guice-bean + org.sonatype.sisu.inject + guice-bean + 2.1.1 + + + pom + + guice-plexus + + Guice - Plexus + + + guice-plexus-metadata + guice-plexus-scanners + guice-plexus-converters + guice-plexus-locators + guice-plexus-binders + guice-plexus-shim + sisu-inject-plexus + + + + + + + org.codehaus.plexus + plexus-component-annotations + 1.5.5 + + + org.codehaus.plexus + plexus-classworlds + 2.4 + + + org.codehaus.plexus + plexus-utils + 2.0.5 + + + + org.sonatype.sisu.inject + guice-plexus-metadata + ${project.version} + + + org.sonatype.sisu.inject + guice-plexus-scanners + ${project.version} + + + org.sonatype.sisu.inject + guice-plexus-converters + ${project.version} + + + org.sonatype.sisu.inject + guice-plexus-locators + ${project.version} + + + org.sonatype.sisu.inject + guice-plexus-binders + ${project.version} + + + org.sonatype.sisu.inject + guice-plexus-shim + ${project.version} + + + org.sonatype.sisu.inject + guice-plexus-tck + ${project.version} + + + + org.sonatype.sisu + sisu-inject-plexus + ${project.version} + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4.pom new file mode 100644 index 000000000..5f155d7f1 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4.pom @@ -0,0 +1,257 @@ + + + + 4.0.0 + + + org.sonatype.sisu.inject + guice-parent + 2.9.4 + + + org.sonatype.sisu + sisu-guice + + Google Guice - Core Library + + + 2.2.1-v20090111 + + + + + javax.inject + javax.inject + 1 + + + aopalliance + aopalliance + 1.0 + + + + org.slf4j + slf4j-api + 1.6.1 + true + + + org.sonatype.sisu.inject + cglib + ${cglib.version} + + + javax.inject + javax.inject-tck + 1 + test + + + org.springframework + spring-beans + 3.0.5.RELEASE + test + + + biz.aQute + bnd + 0.0.384 + test + + + org.apache.felix + org.apache.felix.framework + 3.0.5 + test + + + + + + + + maven-remote-resources-plugin + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + maven-surefire-plugin + 2.6 + + + + org.slf4j:slf4j-api + + + + **/OSGiContainerTest* + + + + + + org.apache.felix + maven-bundle-plugin + + + org.slf4j + + + + + + maven-jar-plugin + + + LICENSE + NOTICE + + + + + + + + + + guice.with.no_aop + + + guice.with.no_aop + !false + + + + + + org.sonatype.plugins + munge-maven-plugin + 1.0 + + + prepare-package + + munge-fork + + + NO_AOP + + **/InterceptorBinding.java, + **/InterceptorBindingProcessor.java, + **/InterceptorStackCallback.java, + **/LineNumbers.java, + **/MethodAspect.java, + **/ProxyFactory.java, + **/BytecodeGenTest.java, + **/IntegrationTest.java, + **/MethodInterceptionTest.java, + **/ProxyFactoryTest.java + + + + + + + + maven-jar-plugin + + + no_aop + package + + jar + + + ${project.build.directory}/munged/classes + no_aop + + ${project.build.directory}/munged/classes/META-INF/MANIFEST.MF + + + + + + + + + + + guice.with.jarjar + + + guice.with.jarjar + !false + + + + + + org.sonatype.sisu.inject + cglib + ${cglib.version} + true + + + + + + org.sonatype.plugins + jarjar-maven-plugin + + + *:asm + *:cglib + + + + + + maven-jar-plugin + + + no_deps + package + + jar + + + ${project.build.directory}/original-classes + no_deps + + + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1.pom new file mode 100644 index 000000000..f9fcbee57 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1.pom @@ -0,0 +1,91 @@ + + + + + + + 4.0.0 + + + org.sonatype.sisu.inject + guice-bean + 2.1.1 + + + bundle + + org.sonatype.sisu + sisu-inject-bean + + Sisu - Inject (JSR330 bean support) + + + + org.sonatype.sisu + sisu-guice + no_aop + + + javax.inject + javax.inject + + + aopalliance + aopalliance + + + + + org.sonatype.sisu.inject + guice-bean-containers + true + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.sonatype.guice.bean.containers.Main + + + org.sonatype.inject;singleton:=true + + + org.sonatype.guice.bean.containers.SisuActivator + + + org.slf4j,junit.framework + + + org.sonatype.inject;-noimport:=true;-split-package:=merge-first;version=${project.version}, + javax.*|org.aopalliance.*;version=1 + + + org.sonatype.guice.bean.* + + + *.inject,javax.*;resolution:=optional,* + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-plexus/2.1.1/sisu-inject-plexus-2.1.1.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-plexus/2.1.1/sisu-inject-plexus-2.1.1.pom new file mode 100644 index 000000000..19046f519 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject-plexus/2.1.1/sisu-inject-plexus-2.1.1.pom @@ -0,0 +1,92 @@ + + + + + + + 4.0.0 + + + org.sonatype.sisu.inject + guice-plexus + 2.1.1 + + + bundle + + org.sonatype.sisu + sisu-inject-plexus + + Sisu - Inject (Plexus bean support) + + + + org.codehaus.plexus + plexus-component-annotations + + + org.codehaus.plexus + plexus-classworlds + + + org.codehaus.plexus + plexus-utils + + + org.sonatype.sisu + sisu-inject-bean + + + org.sonatype.sisu.inject + guice-plexus-shim + true + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + *;groupId=org.codehaus.plexus + + + + org.sonatype.inject.plexus;singleton:=true + + + org.sonatype.inject + + + org.slf4j,junit.framework + + + org.codehaus.plexus.*;-noimport:=true;-split-package:=merge-first + + + META-INF.plexus,org.sonatype.guice.plexus.* + + + !org.sonatype.guice.bean.*,* + + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject/2.1.1/sisu-inject-2.1.1.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject/2.1.1/sisu-inject-2.1.1.pom new file mode 100644 index 000000000..31ef4667b --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-inject/2.1.1/sisu-inject-2.1.1.pom @@ -0,0 +1,61 @@ + + + + + + + 4.0.0 + + + org.sonatype.sisu + sisu-parent + 2.1.1 + + + pom + + sisu-inject + + Sisu - Dependency Injection + + + guice-bean + + guice-plexus + + + + 2.9.4 + + + + + + + org.sonatype.sisu + sisu-guice + ${sisu.guice.version} + + + org.sonatype.sisu + sisu-guice + ${sisu.guice.version} + no_aop + + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-parent/2.1.1/sisu-parent-2.1.1.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-parent/2.1.1/sisu-parent-2.1.1.pom new file mode 100644 index 000000000..dd106cb98 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/sisu/sisu-parent/2.1.1/sisu-parent-2.1.1.pom @@ -0,0 +1,304 @@ + + + + + + + 4.0.0 + + + org.sonatype.forge + forge-parent + 7 + + + pom + + org.sonatype.sisu + sisu-parent + 2.1.1 + + Sisu + + http://sisu.sonatype.org/ + 2010 + + + Sonatype, Inc. + http://www.sonatype.com + + + + + Sisu Developers List + sisu-dev-subscribe@sonatype.org + sisu-dev-unsubscribe@sonatype.org + sisu-dev@sonatype.org + + + + Sisu Users List + sisu-user-subscribe@sonatype.org + sisu-user-unsubscribe@sonatype.org + sisu-user@sonatype.org + + + + Sisu Commits List + sisu-scm-subscribe@sonatype.org + sisu-scm-unsubscribe@sonatype.org + + + + + scm:git:git@github.com:sonatype/sisu.git + scm:git:git@github.com:sonatype/sisu.git + git@github.com:sonatype/sisu.git + + + + jira + https://issues.sonatype.org/browse/SISU + + + + Hudson + https://grid.sonatype.org/ci/job/Sisu/ + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + Eclipse Public License, Version 1.0 + http://www.eclipse.org/legal/epl-v10.html + repo + + + + + sisu-inject + + + + UTF-8 + https://repository.sonatype.org/service/local/staging/deploy/maven2 + + + + + ch.qos.logback + logback-classic + 0.9.28 + test + + + org.testng + testng + 5.14.9 + test + + + + + + + + javax.inject + javax.inject + 1 + + + aopalliance + aopalliance + 1.0 + + + + org.slf4j + slf4j-api + 1.6.1 + + + + org.osgi + org.osgi.core + 4.2.0 + + + org.osgi + org.osgi.compendium + 4.2.0 + + + org.apache.felix + org.apache.felix.framework + 3.0.8 + + + + junit + junit + 4.8.2 + + + + + + + + + + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + + + maven-jar-plugin + 2.3.1 + + + org.apache.felix + maven-bundle-plugin + 2.1.0 + + + + J2SE-1.5,JavaSE-1.6 + + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) + <_nouses>true + <_removeheaders> + Embed-Dependency,Embed-Transitive, + Built-By,Tool,Created-By,Build-Jdk, + Include-Resource,Private-Package, + Bnd-LastModified + + + + + + maven-javadoc-plugin + 2.7 + + + maven-source-plugin + 2.1.2 + + + maven-surefire-plugin + 2.7.2 + + true + false + + + + maven-site-plugin + 3.0-beta-3 + + + maven-gpg-plugin + 1.1 + + + maven-release-plugin + 2.1 + + true + + + + + + + maven-enforcer-plugin + 1.0 + + + enforce-java + + enforce + + + + + 3.0 + + + 1.6.0 + + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.6 + + + org.codehaus.mojo.signature + java15 + 1.0 + + + javax.annotation.processing.* + javax.lang.model.* + javax.tools.* + + + + + check-java-1.5-compat + process-classes + + check + + + + + + + + + + + maven-project-info-reports-plugin + 2.3.1 + + + maven-javadoc-plugin + 2.7 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.4 + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.1 + + + + + diff --git a/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/spice/spice-parent/12/spice-parent-12.pom b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/spice/spice-parent/12/spice-parent-12.pom new file mode 100644 index 000000000..76f588723 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/sonatype/spice/spice-parent/12/spice-parent-12.pom @@ -0,0 +1,214 @@ + + 4.0.0 + + org.sonatype.forge + forge-parent + 4 + + org.sonatype.spice + spice-parent + 12 + pom + Sonatype Spice Components + + + scm:svn:http://svn.sonatype.org/spice/tags/spice-parent-12 + http://svn.sonatype.org/spice/tags/spice-parent-12 + scm:svn:https://svn.sonatype.org/spice/tags/spice-parent-12 + + + + + Apache Public License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + + Hudson + https://grid.sonatype.org/ci/view/Spice/ + + + + JIRA + https://issues.sonatype.org/browse/SPICE + + + + + 6.1.12 + 1.0-beta-3.0.5 + + + + + + org.codehaus.plexus + plexus-container-default + ${plexus.version} + provided + + + commons-logging + commons-logging + + + commons-logging + commons-logging-api + + + log4j + log4j + + + + + org.codehaus.plexus + plexus-component-annotations + ${plexus.version} + provided + + + org.codehaus.plexus + plexus-utils + 1.5.5 + + + org.mortbay.jetty + jetty + ${jetty.version} + + + org.mortbay.jetty + jetty-client + ${jetty.version} + + + org.mortbay.jetty + jetty-util + ${jetty.version} + + + junit + junit + 4.5 + test + + + + + + + + + org.codehaus.plexus + plexus-component-metadata + ${plexus.version} + + + process-classes + + generate-metadata + + + + process-test-classes + + generate-test-metadata + + + + + + org.codehaus.plexus + plexus-maven-plugin + 1.3.8 + + + + descriptor + + + + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.2 + + + org.codehaus.mojo + findbugs-maven-plugin + 1.2 + + UnreadFields + + + + maven-jxr-plugin + 2.1 + + + maven-pmd-plugin + 2.4 + + 1.5 + + + + org.apache.maven.plugins + maven-plugin-plugin + 2.5 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.5 + + + + org.apache.maven.plugin-tools + maven-plugin-tools-javadoc + 2.5 + + + org.codehaus.plexus + plexus-javadoc + 1.0 + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.1.1 + + + + + dependencies + project-team + mailing-list + cim + issue-tracking + license + scm + + + + + + + + \ No newline at end of file From c22eddb71b3b0c760f932ce95ae86cc41550c23e Mon Sep 17 00:00:00 2001 From: Igor Fedorenko Date: Sun, 7 May 2017 17:43:15 -0400 Subject: [PATCH 10/16] MNG-6210 shortened test project file names Signed-off-by: Igor Fedorenko --- ...nITmng6210CoreExtensionsCustomScopesTest.java | 2 +- ...aven-it-core-extensions-custom-scopes-0.1.jar | Bin 5359 -> 0 bytes .../maven-metadata.xml | 12 ------------ ...-core-extensions-custom-scopes-client-0.1.jar | Bin 6719 -> 0 bytes .../client/.mvn/extensions.xml | 4 ++-- .../client/pom.xml | 4 ++-- .../maven-it-core-extensions}/.gitignore | 0 .../repo-src/maven-it-core-extensions}/pom.xml | 6 +++--- .../TestMojoExecutionScopedComponent.java | 2 +- .../extensions}/TestSessionScopedComponent.java | 2 +- .../main/resources/META-INF/maven/extension.xml | 4 ++-- .../repo-src/maven-it-plugin}/.gitignore | 0 .../repo-src/maven-it-plugin}/pom.xml | 8 ++++---- .../plugin/ValidateMojoExecutionScopedMojo.java | 4 ++-- .../its}/plugin/ValidateSessionScopedMojo.java | 4 ++-- .../0.1/maven-it-core-extensions-0.1.jar | Bin 0 -> 5061 bytes .../0.1/maven-it-core-extensions-0.1.pom} | 6 +++--- .../maven-it-core-extensions/maven-metadata.xml | 12 ++++++++++++ .../maven-it-plugin/0.1/maven-it-plugin-0.1.jar | Bin 0 -> 5954 bytes .../maven-it-plugin/0.1/maven-it-plugin-0.1.pom} | 8 ++++---- .../maven-it-plugin}/maven-metadata.xml | 6 +++--- .../maven-metadata.xml | 4 ++-- .../settings-template.xml | 0 23 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.jar delete mode 100644 core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml delete mode 100644 core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.jar rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes => mng-6210-core-extensions-scopes}/client/.mvn/extensions.xml (85%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes => mng-6210-core-extensions-scopes}/client/pom.xml (91%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes => mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions}/.gitignore (100%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes => mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions}/pom.xml (89%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes => mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions}/TestMojoExecutionScopedComponent.java (73%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes => mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions}/TestSessionScopedComponent.java (69%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes => mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions}/src/main/resources/META-INF/maven/extension.xml (81%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client => mng-6210-core-extensions-scopes/repo-src/maven-it-plugin}/.gitignore (100%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client => mng-6210-core-extensions-scopes/repo-src/maven-it-plugin}/pom.xml (86%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes => mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its}/plugin/ValidateMojoExecutionScopedMojo.java (81%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes => mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its}/plugin/ValidateSessionScopedMojo.java (81%) create mode 100644 core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.jar rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom => mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom} (89%) create mode 100644 core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml create mode 100644 core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.jar rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom => mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom} (86%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client => mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin}/maven-metadata.xml (50%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes => mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes}/maven-metadata.xml (59%) rename core-it-suite/src/test/resources/{mng-6210-core-extensions-custom-scopes => mng-6210-core-extensions-scopes}/settings-template.xml (100%) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java index 133a3913e..d0098210c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java @@ -21,7 +21,7 @@ public MavenITmng6210CoreExtensionsCustomScopesTest() public void testCoreExtensionCustomScopes() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6210-core-extensions-custom-scopes" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6210-core-extensions-scopes" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.jar deleted file mode 100644 index 779faaf7a9e5227277fcad014bc690ea193aeebf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5359 zcmc&&2{@E%8=kDmK8P$GWM>8`OO|5^F~+`xvNR^yW-w#Tnq5($m89&1EMr%+Sdy&S zMN+7g^$>>t8wwSjbDjVE=YL)A%y;oT&wIb$^FHr$-*jQbBzr)F5q#l-=Gw#84+`KL zu4Wg(q483&~(R@)a0)r^;CLc*Lj@v6-&Er{?pecdT#NHChVGJNk8DUO+ha8=8 zm0?chyPA>~@RWlR94n#ExQ@U*cNCu?^kYGXq`@0(_;F~$z#_6u7Qz!vRl`wI)ouNKzM)`&C6Ul`JV zZ}?{@nYJ^x!(x81g2YZP2(&BG66uLWqA+%76vh(ahQXqpEHMbQGjcQFdg?1_GJe-0 z0)gy+t+N9Ge|W7MQJ|hqj!v<9=y)-@xnvgY z@jZ;CfLu`5RHWL@*&(>}^*M_h7G=?F!I>zd8V;j#h0^hf#2l>w#`Q&kW(JWh&-Rr$ za*$@7lo?7@x~C_@w#z2mcLIBrzhwS?3{!z}?|^zoc`OP}(Wac#t>R`POU|LU>vR{`|P1N+DZ z?@~%9lkEMNcW&l4eEQ+Rb8R$c=flba*aD*tXewvLYr67YnqaCj;V(+}C9T3H#CYX_ zX5ULwmm;XfOl7-HMAx0{Qmw4JP$XCvlr=@%bN%!@*PVmKx=d!2WUIKgOYx16$xuZS zOR&XL*-5`euUVC}SGTy(Mlz?|uTM`MqM@NSrmPE`xVDXN2PtN4krXTjHXivg} z=-K#9PLvu%a;^ANjVtSb_aB2UHBQc`ma0(c&=0ctSjjz_s;McK`c~Y#*Y2q{m(ds# z;Pl-ECg;{uxK^+B*6!AxP&<@85`l$kTRS0bZao*L2~wmw+M4)y0W84FG;Shn8y8TN z$b_J)qn*uc^YfKQp|h(N$vfW%-seTWpeD8DE)p~JF)3h@k+sng;Lr6*n3T`6ez4?V z^MUFp&2n=B7ry1e_n>g&v>2&fAkYDzJWK&lgp1*8*{@eKp*(+GYlcV+7LK+@t9l|4 zZdjlg4G1-8qk?vFMx&4@EEM5rjltmb;4orw#)MgeE_;W$;ntv}{Ztl}h9rXCX2RXQ z4jS$1@on&DeCCTKauoZQcdZCaO=R(t>hMjzif;(Maj9hfnh9vM`@F7NcJ#oJULqU} z0WSp${C1m)ROqA>SKw(!k+}jJt#QRD=I2F-^p~eH^kd(M7JyIJQp(jrZ)xHTz10rt z2^X}Hh~i*&M?WZbvf1K~*(#LUjNr^;t`Seae$h10bQ8PxcuVsajV@l8Z9{0ZVuy!m z)_CWLg}VPq>GoUNdGx=xEZCORgylF`5$eF*BI&BW6nCci;GW z?%d_4rR|EOMu988%UL8{;lDzOOrQ2kNPo(ux$N=v@ge;%Oc69w0t}-!J zGGu3APcQ4i2f}o;PM6bXlY$z@2eZ3iI6WeMosg*`$@%U#g9g|TRns+wL(&wo=9x_~ z`l3rh$@^pz@Gq7h-|ag}?G{+)?|V~GHs!J~@|~*~b%b;D9{*#~=S1TVN?vb>A)d=- z4!1=Kg|o1wmY(OReb+@)Seo$pO7|0muIm-VxsV}-Z>jmY8>?=u?)5SP>I%AESJ1Uz zK!LgfCWKI0kc|d}fvmSN$PaDo=OrBfsU_CXK>jk4-5@N$rNq-^CW44Tpayaf2=gx^ zaYj24`gD{b9MdOBSM|ok(M|KTmcE_$SVj@}aIu*-gI#T0d;>kV2_rjLaaT*siZ3&# zonG;hON@J2_x!5|q;0fyX`$+ej0L>py_j|Q0}6CgFTI=_@hiOGm*{g{;_3>W>c>I> zT{DpyLFcoBle>-{hT63!mv*n43(xMjU|d)th(SE2U`S$1mm!3j^^qSnZogu-xrH1_}=5mf%vGSXCNRg+NPYud9|dU5+zLi+;qG%pM-+ zU-DHnS^JXT?#zyNjLk7&gjnY<)~?hWOPK^5;vlL?mQ0kTXY_MD9_@})oNpXzy3b0P z&p@gXW7H@dtl1g~dq~L&KX6Z~8C(+6j}E4!MD$R~i=XFyxZImTF4CXy?v`ZMlk$20 z6$81bbUW9}Gr1{O^m1N2ler97)KE3l^hrwbwW9!+?YQcQdL&+jLsTf7vO`e3UJOn&SPTwv~G2q=}JR2IC1$E+0PH^JZttRgAm; z2&sexKHzz8=nk=L_sXwNnG4YusxG(qxzpIl4mCm;;Fw~fa~;zWmN@5~Hh~lGkx*k>Sd;N@`J}d!pn_mw@o@q=7#gz>W3AFA~uVPEtSg z$2X>e}4ID@?pWm?qzXi8Y(;kpx-j5u#3a%oa8$E^qhENd4LBk|566?j3wpaV@P z5xzGB$)?-(qLpAw7%74Lz~_eB774o3!e0c!&vMxY(_8>^mO%JuN9vgymXGel0-E>5M@A&7tBuLav_r&eo z*9Gg&2ndpOGeql7A%0D&H#4!lg#ETeN+37D+&40@zQGMXL1>g)BN1}?qYT-MlmVn^ zBhn6{W9r}@}&PmHSr^iABpiMj1Odg8^*6_@+N?vxfy}}tq(fT>T2ljEpK%_ zKYy1D?tJD5bZ~RY@qcQ`HMoC;9DYN#Jw5z}EhP{G{DW@ei2XM&<1ZrnN)|V>wSBMJ e1QHY_RNwOvY diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml deleted file mode 100644 index 037f7ac8f..000000000 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/maven-metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-core-extensions-custom-scopes - - 0.1 - - 0.1 - - 20170413003607 - - diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.jar deleted file mode 100644 index 124e07400527c7a1c93814186de51ac63a790590..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6719 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 PKoH>XBhcfc#eMq^_YE*s diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/.mvn/extensions.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/.mvn/extensions.xml similarity index 85% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/.mvn/extensions.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/.mvn/extensions.xml index cf000814a..96a493a23 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/.mvn/extensions.xml +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/.mvn/extensions.xml @@ -21,8 +21,8 @@ under the License. - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-core-extensions-custom-scopes + org.apache.maven.its.6210-core-extensions-scopes + maven-it-core-extensions 0.1 diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml similarity index 91% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/pom.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml index c884723ca..9cd5adb0a 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/client/pom.xml +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml @@ -36,8 +36,8 @@ under the License. - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-plugin-core-extensions-custom-scopes-client + org.apache.maven.its.6210-core-extensions-scopes + maven-it-plugin 0.1 diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/.gitignore b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/.gitignore similarity index 100% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/.gitignore rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/.gitignore diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml similarity index 89% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/pom.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml index cf027ad56..e2e1c1808 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/pom.xml +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml @@ -22,12 +22,12 @@ under the License. 4.0.0 - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-core-extensions-custom-scopes + org.apache.maven.its.6210-core-extensions-scopes + maven-it-core-extensions 0.1 jar - Maven Integration Test :: maven-it-core-extensions-custom-scopes + Maven Integration Test :: maven-it-core-extensions Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestMojoExecutionScopedComponent.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestMojoExecutionScopedComponent.java similarity index 73% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestMojoExecutionScopedComponent.java rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestMojoExecutionScopedComponent.java index 24a6c7942..810b9992c 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestMojoExecutionScopedComponent.java +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestMojoExecutionScopedComponent.java @@ -1,4 +1,4 @@ -package org.apache.maven.its.core_extensions_custom_scopes; +package org.apache.maven.its.extensions; import javax.inject.Named; diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestSessionScopedComponent.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestSessionScopedComponent.java similarity index 69% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestSessionScopedComponent.java rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestSessionScopedComponent.java index e4491881c..1f3769164 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/TestSessionScopedComponent.java +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/java/org/apache/maven/its/extensions/TestSessionScopedComponent.java @@ -1,4 +1,4 @@ -package org.apache.maven.its.core_extensions_custom_scopes; +package org.apache.maven.its.extensions; import javax.inject.Named; diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/resources/META-INF/maven/extension.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/resources/META-INF/maven/extension.xml similarity index 81% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/resources/META-INF/maven/extension.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/resources/META-INF/maven/extension.xml index 7ca43c11f..aee3251d6 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-core-extensions-custom-scopes/src/main/resources/META-INF/maven/extension.xml +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/src/main/resources/META-INF/maven/extension.xml @@ -21,9 +21,9 @@ under the License. - org.apache.maven.its.core_extensions_custom_scopes + org.apache.maven.its.extensions - org.apache.maven.its.it-core-extensions:maven-it-core-extensions-custom-scopes + org.apache.maven.its.6210-core-extensions-scopes:maven-it-core-extensions \ No newline at end of file diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/.gitignore b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/.gitignore similarity index 100% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/.gitignore rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/.gitignore diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/pom.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml similarity index 86% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/pom.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml index a5d1434ab..5b65b0cff 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/pom.xml +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml @@ -22,8 +22,8 @@ under the License. 4.0.0 - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-plugin-core-extensions-custom-scopes-client + org.apache.maven.its.6210-core-extensions-scopes + maven-it-plugin 0.1 maven-plugin @@ -57,8 +57,8 @@ under the License. - org.apache.maven.its.it-core-extensions - maven-it-core-extensions-custom-scopes + org.apache.maven.its.6210-core-extensions-scopes + maven-it-core-extensions 0.1 provided diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateMojoExecutionScopedMojo.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateMojoExecutionScopedMojo.java similarity index 81% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateMojoExecutionScopedMojo.java rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateMojoExecutionScopedMojo.java index 50d7e3cea..83f7f653c 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateMojoExecutionScopedMojo.java +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateMojoExecutionScopedMojo.java @@ -1,6 +1,6 @@ -package org.apache.maven.its.core_extensions_custom_scopes.plugin; +package org.apache.maven.its.plugin; -import org.apache.maven.its.core_extensions_custom_scopes.TestMojoExecutionScopedComponent; +import org.apache.maven.its.extensions.TestMojoExecutionScopedComponent; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateSessionScopedMojo.java b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateSessionScopedMojo.java similarity index 81% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateSessionScopedMojo.java rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateSessionScopedMojo.java index a259ebeb2..38c0cf28c 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo-src/maven-it-plugin-core-extensions-custom-scopes-client/src/main/java/org/apache/maven/its/core_extensions_custom_scopes/plugin/ValidateSessionScopedMojo.java +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/src/main/java/org/apache/maven/its/plugin/ValidateSessionScopedMojo.java @@ -1,6 +1,6 @@ -package org.apache.maven.its.core_extensions_custom_scopes.plugin; +package org.apache.maven.its.plugin; -import org.apache.maven.its.core_extensions_custom_scopes.TestSessionScopedComponent; +import org.apache.maven.its.extensions.TestSessionScopedComponent; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..aeef57034072cfbebd9356739c54331323ebccc7 GIT binary patch literal 5061 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 G|N0NS+$666 literal 0 HcmV?d00001 diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom similarity index 89% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom index cf027ad56..e2e1c1808 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-core-extensions-custom-scopes/0.1/maven-it-core-extensions-custom-scopes-0.1.pom +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom @@ -22,12 +22,12 @@ under the License. 4.0.0 - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-core-extensions-custom-scopes + org.apache.maven.its.6210-core-extensions-scopes + maven-it-core-extensions 0.1 jar - Maven Integration Test :: maven-it-core-extensions-custom-scopes + Maven Integration Test :: maven-it-core-extensions Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml new file mode 100644 index 000000000..ac57587cc --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/maven-metadata.xml @@ -0,0 +1,12 @@ + + + org.apache.maven.its.6210-core-extensions-scopes + maven-it-core-extensions + + 0.1 + + 0.1 + + 20170507213501 + + diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.jar b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..9bb5b8aef6a014abe14706d1e04d7cf317805d47 GIT binary patch literal 5954 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 EUtK;dTL1t6 literal 0 HcmV?d00001 diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom similarity index 86% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom index a5d1434ab..5b65b0cff 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/0.1/maven-it-plugin-core-extensions-custom-scopes-client-0.1.pom +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom @@ -22,8 +22,8 @@ under the License. 4.0.0 - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-plugin-core-extensions-custom-scopes-client + org.apache.maven.its.6210-core-extensions-scopes + maven-it-plugin 0.1 maven-plugin @@ -57,8 +57,8 @@ under the License. - org.apache.maven.its.it-core-extensions - maven-it-core-extensions-custom-scopes + org.apache.maven.its.6210-core-extensions-scopes + maven-it-core-extensions 0.1 provided diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/maven-metadata.xml similarity index 50% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/maven-metadata.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/maven-metadata.xml index 46aea9ceb..0ed5ded46 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-it-plugin-core-extensions-custom-scopes-client/maven-metadata.xml +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/maven-metadata.xml @@ -1,13 +1,13 @@ - org.apache.maven.its.it-core-extensions-custom-scopes - maven-it-plugin-core-extensions-custom-scopes-client + org.apache.maven.its.6210-core-extensions-scopes + maven-it-plugin 0.1 0.1 0.1 - 20170413003615 + 20170507211324 diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-metadata.xml similarity index 59% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-metadata.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-metadata.xml index e2ae4e137..8e0697003 100644 --- a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/repo/org/apache/maven/its/it-core-extensions-custom-scopes/maven-metadata.xml +++ b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-metadata.xml @@ -3,8 +3,8 @@ Maven Integration Test :: maven-it-plugin-core-extensions-custom-scopes-client - itcore-extensions-custom-scopes-client - maven-it-plugin-core-extensions-custom-scopes-client + it + maven-it-plugin diff --git a/core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/settings-template.xml b/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/settings-template.xml similarity index 100% rename from core-it-suite/src/test/resources/mng-6210-core-extensions-custom-scopes/settings-template.xml rename to core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/settings-template.xml From 8015782d153415c0b10110d71d715996bb27dae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 6 May 2017 18:31:28 +0200 Subject: [PATCH 11/16] [MNG-6223] support -f path/to/dir when detecting .mvn --- .../apache/maven/it/IntegrationTestSuite.java | 1 + .../maven/it/MavenITmng5889FindBasedir.java | 17 +++- .../maven/it/MavenITmng6223FindBasedir.java | 77 +++++++++++++++++++ 3 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.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 f2aecf87d..808e58a36 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 @@ -113,6 +113,7 @@ public static Test suite() suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class ); suite.addTestSuite( MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.class ); + suite.addTestSuite( MavenITmng6223FindBasedir.class ); suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class ); suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class ); suite.addTestSuite( MavenITmng5895CIFriendlyUsageWithPropertyTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java index 254c03d0f..1936ee5ac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java @@ -14,7 +14,12 @@ public class MavenITmng5889FindBasedir { public MavenITmng5889FindBasedir() { - super( "[3.5.0,)" ); + super( "[3.5.0,3.5.1)" ); + } + + protected MavenITmng5889FindBasedir( String constraint ) + { + super( constraint ); } /** @@ -55,10 +60,16 @@ public void testMvnFileShortOptionModule() private void runCoreExtensionWithOption( String option, String subdir ) throws Exception + { + runCoreExtensionWithOption( option, subdir, true ); + } + + protected void runCoreExtensionWithOption( String option, String subdir, boolean pom ) + throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5889-find.mvn" ); - File basedir = new File( testDir, "../mng-5889-find.mvn" + option ); + File basedir = new File( testDir, "../mng-" + ( pom ? "5889" : "6223" ) + "-find.mvn" + option + ( pom ? "Pom" : "Dir" ) ); basedir.mkdir(); if ( subdir != null ) @@ -71,7 +82,7 @@ private void runCoreExtensionWithOption( String option, String subdir ) Verifier verifier = newVerifier( basedir.getAbsolutePath() ); verifier.getCliOptions().add( "-Dexpression.outputFile=" + new File( basedir, "expression.properties" ).getAbsolutePath() ); verifier.getCliOptions().add( option ); // -f/--file client/pom.xml - verifier.getCliOptions().add( new File( testDir, "pom.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( ( pom ? new File( testDir, "pom.xml" ) : testDir ).getAbsolutePath() ); verifier.setForkJvm( true ); // force forked JVM since we need the shell script to detect .mvn/ location verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java new file mode 100644 index 000000000..ac1100191 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java @@ -0,0 +1,77 @@ +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. + */ + +/** + * This is a test set for MNG-6223: + * check that extensions in .mvn/ are found when Maven is run with -f path/to/dir. + * @see MavenITmng5889FindBasedir + */ +public class MavenITmng6223FindBasedir + extends MavenITmng5889FindBasedir +{ + public MavenITmng6223FindBasedir() + { + super( "[3.5.1,)" ); + } + + /** + * check that path/to/.mvn/ is found when path to POM set by --file path/to/dir + */ + public void testMvnFileLongOptionToDir() + throws Exception + { + runCoreExtensionWithOptionToDir( "--file", null ); + } + + /** + * check that path/to/.mvn/ is found when path to POM set by -f path/to/dir + */ + public void testMvnFileShortOptionToDir() + throws Exception + { + runCoreExtensionWithOptionToDir( "-f", null ); + } + + /** + * check that path/to/.mvn/ is found when path to POM set by --file path/to/module + */ + public void testMvnFileLongOptionModuleToDir() + throws Exception + { + runCoreExtensionWithOptionToDir( "--file", "module" ); + } + + /** + * check that path/to/.mvn/ is found when path to POM set by -f path/to/module + */ + public void testMvnFileShortOptionModuleToDir() + throws Exception + { + runCoreExtensionWithOptionToDir( "-f", "module" ); + } + + private void runCoreExtensionWithOptionToDir( String option, String subdir ) + throws Exception + { + runCoreExtensionWithOption( option, subdir, false ); + } + +} From ac1deaf9af2814f430da71a3e2fa8f98481938f7 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 9 May 2017 23:26:51 +0200 Subject: [PATCH 12/16] [MNG-6229] Write out optionality in Core IT Plugins for collection and resolution Write out " (optional)" in the log entry as well as to the file for later analysis. --- .../it/MavenITmng0947OptionalDependencyTest.java | 14 +++++++------- .../plugin/coreit/AbstractDependencyMojo.java | 8 +++++++- .../plugin/coreit/AbstractDependencyMojo.java | 8 +++++++- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java index 78c48e82a..b0ca8f2e4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java @@ -27,7 +27,7 @@ /** * This is a test set for MNG-947. - * + * * @author Benjamin Bentmann */ public class MavenITmng0947OptionalDependencyTest @@ -60,20 +60,20 @@ public void testit() verifier.resetStreams(); List compile = verifier.loadLines( "target/compile.txt", "UTF-8" ); - assertTrue( compile.toString(), compile.contains( "org.apache.maven.its.mng0947:d:jar:0.1" ) ); - assertTrue( compile.toString(), compile.contains( "org.apache.maven.its.mng0947:e:jar:0.1" ) ); + assertTrue( compile.toString(), compile.contains( "org.apache.maven.its.mng0947:d:jar:0.1 (optional)" ) ); + assertTrue( compile.toString(), compile.contains( "org.apache.maven.its.mng0947:e:jar:0.1 (optional)" ) ); assertEquals( 2, compile.size() ); List runtime = verifier.loadLines( "target/runtime.txt", "UTF-8" ); assertTrue( runtime.toString(), runtime.contains( "org.apache.maven.its.mng0947:c:jar:0.1" ) ); - assertTrue( runtime.toString(), runtime.contains( "org.apache.maven.its.mng0947:d:jar:0.1" ) ); - assertTrue( runtime.toString(), runtime.contains( "org.apache.maven.its.mng0947:e:jar:0.1" ) ); + assertTrue( runtime.toString(), runtime.contains( "org.apache.maven.its.mng0947:d:jar:0.1 (optional)" ) ); + assertTrue( runtime.toString(), runtime.contains( "org.apache.maven.its.mng0947:e:jar:0.1 (optional)" ) ); assertEquals( 3, runtime.size() ); List test = verifier.loadLines( "target/test.txt", "UTF-8" ); assertTrue( test.toString(), test.contains( "org.apache.maven.its.mng0947:c:jar:0.1" ) ); - assertTrue( test.toString(), test.contains( "org.apache.maven.its.mng0947:d:jar:0.1" ) ); - assertTrue( test.toString(), test.contains( "org.apache.maven.its.mng0947:e:jar:0.1" ) ); + assertTrue( test.toString(), test.contains( "org.apache.maven.its.mng0947:d:jar:0.1 (optional)" ) ); + assertTrue( test.toString(), test.contains( "org.apache.maven.its.mng0947:e:jar:0.1 (optional)" ) ); assertEquals( 3, test.size() ); } diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java index 68e64307b..8b4e9ee17 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java @@ -83,8 +83,14 @@ protected void writeArtifacts( String pathname, Collection artifacts ) { Artifact artifact = (Artifact) artifact1; writer.write( artifact.getId() ); + String optional = ""; + if ( artifact.isOptional() ) + { + optional = " (optional)"; + writer.write( optional ); + } writer.newLine(); - getLog().info( "[MAVEN-CORE-IT-LOG] " + artifact.getId() ); + getLog().info( "[MAVEN-CORE-IT-LOG] " + artifact.getId() + optional ); } } } diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java index 6990a6d62..3ecf9b23b 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java @@ -100,8 +100,14 @@ protected void writeArtifacts( String pathname, Collection artifacts ) Artifact artifact = (Artifact) artifact1; String id = getId( artifact ); writer.write( id ); + String optional = ""; + if ( artifact.isOptional() ) + { + optional = " (optional)"; + writer.write( optional ); + } writer.newLine(); - getLog().info( "[MAVEN-CORE-IT-LOG] " + id ); + getLog().info( "[MAVEN-CORE-IT-LOG] " + id + optional ); } } } From 12d35b19d8b3fe168491d44dc50cf5077b5898b6 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 9 May 2017 08:19:42 +0200 Subject: [PATCH 13/16] [MNG-5935] Optional true getting lost in managed dependencies when transitive --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...ostInTranstiveManagedDependenciesTest.java | 61 ++++++++++++++ .../pom.xml | 83 +++++++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java create mode 100644 core-it-suite/src/test/resources/mng-5935-optional-lost-in-transtive-managed-dependencies/pom.xml 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 808e58a36..3647a0fdd 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 @@ -121,6 +121,7 @@ public static Test suite() suite.addTestSuite( MavenITmng6173GetProjectsAndDependencyGraphTest.class ); suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class ); suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class ); + suite.addTestSuite( MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.class ); suite.addTestSuite( MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class ); suite.addTestSuite( MavenITmng5889FindBasedir.class ); suite.addTestSuite( MavenITmng5840ParentVersionRanges.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java new file mode 100644 index 000000000..054a307e8 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java @@ -0,0 +1,61 @@ +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.util.List; + +import org.apache.maven.it.util.ResourceExtractor; + +/** + * This is a test set for MNG-5935. + * + */ +public class MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest() + { + super( "[3.5.1,)" ); + } + + public void testitMNG5935() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5935-optional-lost-in-transtive-managed-dependencies" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List dependencies = verifier.loadLines( "target/dependencies.txt", "UTF-8" ); + assertEquals( 5, dependencies.size() ); + assertEquals( "com.mysema.querydsl:querydsl-core:jar:3.4.3 (optional)", dependencies.get( 0 ) ); + assertEquals( "com.google.guava:guava:jar:17.0 (optional)", dependencies.get( 1 ) ); + assertEquals( "com.google.code.findbugs:jsr305:jar:2.0.3 (optional)", dependencies.get( 2 ) ); + assertEquals( "com.mysema.commons:mysema-commons-lang:jar:0.2.4 (optional)", dependencies.get( 3 ) ); + assertEquals( "com.infradna.tool:bridge-method-annotation:jar:1.13 (optional)", dependencies.get( 4 ) ); + } + +} diff --git a/core-it-suite/src/test/resources/mng-5935-optional-lost-in-transtive-managed-dependencies/pom.xml b/core-it-suite/src/test/resources/mng-5935-optional-lost-in-transtive-managed-dependencies/pom.xml new file mode 100644 index 000000000..6e8426cb8 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5935-optional-lost-in-transtive-managed-dependencies/pom.xml @@ -0,0 +1,83 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng5935 + test + 0.1 + + Maven Integration Test :: MNG-5935 + + Verify that optional state true does not get lost in managed dependencies when transitive. + + + + + + com.mysema.querydsl + querydsl-core + 3.4.3 + + + com.google.guava + guava + 17.0 + + + com.google.code.findbugs + jsr305 + 2.0.3 + + + + + + + com.mysema.querydsl + querydsl-core + true + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/dependencies.txt + + + + test + validate + + compile + + + + + + + From 2081280b188398dd9a93ad083c11400cb08a5900 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sun, 14 May 2017 00:15:07 +0200 Subject: [PATCH 14/16] Expect fail for MNG-947 with Maven 3.0.5 Due to the addition of MNG-6229 it turns out that Maven 3.0.5 resolves optional dependencies differently than other versions. The oldest version to pass this IT is 3.1.0-alpha-1. --- .../apache/maven/it/MavenITmng0947OptionalDependencyTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java index b0ca8f2e4..3a324fd00 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java @@ -46,6 +46,8 @@ public MavenITmng0947OptionalDependencyTest() public void testit() throws Exception { + failingMavenVersions( "(,3.1.0-alpha-1)" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0947" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); From a1f2b330d25868190dd9dd49d43eac9c28608f55 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Wed, 24 May 2017 11:11:39 +0200 Subject: [PATCH 15/16] Remove superfluous Eclipse configuration files --- .../main/resources/archetype-resources/.classpath | 11 ----------- .../src/main/resources/archetype-resources/.project | 13 ------------- 2 files changed, 24 deletions(-) delete mode 100644 core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.classpath delete mode 100644 core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.project diff --git a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.classpath b/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.classpath deleted file mode 100644 index 76079e5a0..000000000 --- a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.project b/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.project deleted file mode 100644 index 4eb9c7547..000000000 --- a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/.project +++ /dev/null @@ -1,13 +0,0 @@ - - ${artifactId} - - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file From b9c863266d935f2d6a279d025c9942d41669a4ff Mon Sep 17 00:00:00 2001 From: Dan Tran Date: Sun, 11 Sep 2016 23:24:24 -0700 Subject: [PATCH 16/16] [MNG-6084] Support JSR 250 annotations --- .../apache/maven/it/IntegrationTestSuite.java | 1 + .../it/MavenITmng6084Jsr250PluginTest.java | 82 +++++++++++++++++++ .../resources/mng-6084-jsr250-support/pom.xml | 82 +++++++++++++++++++ .../apache/maven/plugins/Jsr250Component.java | 60 ++++++++++++++ .../org/apache/maven/plugins/Jsr250Mojo.java | 50 +++++++++++ 5 files changed, 275 insertions(+) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java create mode 100644 core-it-suite/src/test/resources/mng-6084-jsr250-support/pom.xml create mode 100644 core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Component.java create mode 100644 core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Mojo.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 3647a0fdd..5b1879d59 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 @@ -118,6 +118,7 @@ public static Test suite() suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class ); suite.addTestSuite( MavenITmng5895CIFriendlyUsageWithPropertyTest.class ); suite.addTestSuite( MavenITmng6090CIFriendlyTest.class ); + suite.addTestSuite( MavenITmng6084Jsr250PluginTest.class ); suite.addTestSuite( MavenITmng6173GetProjectsAndDependencyGraphTest.class ); suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class ); suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java new file mode 100644 index 000000000..1096eca80 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java @@ -0,0 +1,82 @@ +package org.apache.maven.it; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; + +/** + * This is a test set for MNG-6084. + */ +public class MavenITmng6084Jsr250PluginTest + extends AbstractMavenIntegrationTestCase +{ + + private File testDir; + + public MavenITmng6084Jsr250PluginTest() + { + super( "[3.5.1,)" ); + } + + public void setUp() + throws Exception + { + super.setUp(); + + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6084-jsr250-support" ); + + } + + protected void tearDown() + throws Exception + { + + super.tearDown(); + } + + public void testJsr250PluginExecution() + throws Exception + { + // + // Build a plugin that uses JSR 250 annotations + // + Verifier v0 = newVerifier( testDir.getAbsolutePath(), "remote" ); + v0.setAutoclean( false ); + v0.deleteDirectory( "target" ); + v0.deleteArtifacts( "org.apache.maven.its.mng6084" ); + v0.executeGoal( "install" ); + v0.verifyErrorFreeLog(); + v0.resetStreams(); + + // + // Execute the JSR 250 plugin + // + Verifier v1 = newVerifier( testDir.getAbsolutePath(), "remote" ); + v1.setAutoclean( false ); + v1.executeGoal( "org.apache.maven.its.mng6084:jsr250-maven-plugin:0.0.1-SNAPSHOT:hello" ); + v1.verifyErrorFreeLog(); + v1.resetStreams(); + v1.verifyTextInLog( "Hello! I am a component using JSR 250 with @PostConstruct support" ); + + } + +} diff --git a/core-it-suite/src/test/resources/mng-6084-jsr250-support/pom.xml b/core-it-suite/src/test/resources/mng-6084-jsr250-support/pom.xml new file mode 100644 index 000000000..a2a6609d5 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6084-jsr250-support/pom.xml @@ -0,0 +1,82 @@ + + 4.0.0 + + org.apache.maven.its.mng6084 + jsr250-maven-plugin + 0.0.1-SNAPSHOT + maven-plugin + + JSR 250 Maven Plugin + http://maven.apache.org + + + UTF-8 + 3.5.0 + 3.2 + + + + + javax.inject + javax.inject + 1 + + + javax.annotation + jsr250-api + 1.0 + + + org.apache.maven + maven-plugin-api + ${mavenVersion} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${mavenPluginPluginVersion} + provided + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + ${mavenPluginPluginVersion} + + true + + + + mojo-descriptor + + descriptor + + + + help-goal + + helpmojo + + + + + + org.sonatype.plugins + sisu-maven-plugin + 1.1 + + + generate-index + + main-index + + + + + + + diff --git a/core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Component.java b/core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Component.java new file mode 100644 index 000000000..526e05ccb --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Component.java @@ -0,0 +1,60 @@ +package org.apache.maven.plugins; + +/* + * 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 javax.inject.Named; +import javax.inject.Singleton; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +@Named +@Singleton +public class Jsr250Component +{ + + @PostConstruct + public void init() + { + System.out.println(); + System.out.println(); + System.out.println( "Hello! I am a component using JSR 250 with @PostConstruct support" ); + System.out.println(); + System.out.println(); + } + + public void hello() + { + System.out.println(); + System.out.println(); + System.out.println( "Hello! I am a component that is being used via constructor injection! That's right, I'm a JSR 330 badass." ); + System.out.println(); + System.out.println(); + } + + @PreDestroy + public void cleanup() + { + System.out.println(); + System.out.println(); + System.out.println( "Hello! I am a component using JSR 250 with @PreDestroy support" ); + System.out.println(); + System.out.println(); + } +} diff --git a/core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Mojo.java b/core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Mojo.java new file mode 100644 index 000000000..0f5cf1248 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6084-jsr250-support/src/main/java/org/apache/maven/plugins/Jsr250Mojo.java @@ -0,0 +1,50 @@ +package org.apache.maven.plugins; + +/* + * 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 javax.inject.Inject; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; + +@Mojo( name = "hello", defaultPhase = LifecyclePhase.VALIDATE, requiresProject = false ) +public class Jsr250Mojo + extends AbstractMojo +{ + + private Jsr250Component component; + + @Inject + public Jsr250Mojo( Jsr250Component component ) + { + this.component = component; + } + + public void execute() + throws MojoExecutionException + { + // + // Say hello to the world, my little constructor-injected component! + // + component.hello(); + } +}