Repository: maven-integration-testing Updated Branches: refs/heads/master cfc6098c1 -> a2777f151
[MNG-6049] Add behavior to filter resolved version ranges of an artifact Appropriate IT for the issue. This closes #14 Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/a2777f15 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a2777f15 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a2777f15 Branch: refs/heads/master Commit: a2777f15199514c32862e96f22d8e6e2864f149d Parents: cfc6098 Author: barthel <bart...@users.noreply.github.com> Authored: Mon Feb 15 18:31:38 2016 +0100 Committer: Michael Osipov <1983-01...@gmx.net> Committed: Wed Jun 22 21:34:43 2016 +0200 ---------------------------------------------------------------------- .../apache/maven/it/IntegrationTestSuite.java | 2 +- ...92SnapshotsExcludedFromVersionRangeTest.java | 68 ---------- ...49VersionRangeResultFilterExtensionTest.java | 130 +++++++++++++++++++ .../src/test/resources/mng-3092/pom.xml | 75 ----------- .../apache/maven/its/mng3092/a/1.1/a-1.1.jar | Bin 1933 -> 0 bytes .../apache/maven/its/mng3092/a/1.1/a-1.1.pom | 36 ----- .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar | Bin 1950 -> 0 bytes .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom | 36 ----- .../mng3092/a/1.2-SNAPSHOT/maven-metadata.xml | 13 -- .../maven/its/mng3092/a/maven-metadata.xml | 13 -- .../b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.jar | Bin 1949 -> 0 bytes .../b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.pom | 36 ----- .../mng3092/b/1.0-SNAPSHOT/maven-metadata.xml | 13 -- .../maven/its/mng3092/b/maven-metadata.xml | 12 -- .../c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.jar | Bin 1950 -> 0 bytes .../c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.pom | 36 ----- .../mng3092/c/1.1-SNAPSHOT/maven-metadata.xml | 13 -- .../maven/its/mng3092/c/maven-metadata.xml | 12 -- .../resources/mng-3092/settings-template.xml | 43 ------ .../src/test/resources/mng-6049/extension.xml | 29 +++++ .../resources/mng-6049/filter-extension/pom.xml | 66 ++++++++++ .../MavenITVersionRangeResultFilter.java | 77 +++++++++++ .../test/resources/mng-6049/pom-mng-6049.xml | 63 +++++++++ .../apache/maven/its/mng6049/a/1.1/a-1.1.jar | Bin 0 -> 1933 bytes .../apache/maven/its/mng6049/a/1.1/a-1.1.pom | 36 +++++ .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar | Bin 0 -> 1950 bytes .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom | 36 +++++ .../mng6049/a/1.2-SNAPSHOT/maven-metadata.xml | 13 ++ .../apache/maven/its/mng6049/a/1.2/a-1.2.jar | Bin 0 -> 1933 bytes .../apache/maven/its/mng6049/a/1.2/a-1.2.pom | 36 +++++ .../a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.jar | Bin 0 -> 1933 bytes .../a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.pom | 36 +++++ .../mng6049/a/2.0-SNAPSHOT/maven-metadata.xml | 13 ++ .../apache/maven/its/mng6049/a/2.0/a-2.0.jar | Bin 0 -> 1933 bytes .../apache/maven/its/mng6049/a/2.0/a-2.0.pom | 36 +++++ .../maven/its/mng6049/a/maven-metadata.xml | 16 +++ .../resources/mng-6049/settings-template.xml | 59 +++++++++ 37 files changed, 647 insertions(+), 407 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 706297c..86abcbc 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 @@ -96,7 +96,6 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenITmng4148DepPomInterpWithSettingsProfilesTest.class ); // suite.addTestSuite( MavenITmng3890TransitiveDependencyScopeUpdateTest.class ); - // suite.addTestSuite( MavenITmng3092SnapshotsExcludedFromVersionRangeTest.class ); // suite.addTestSuite( MavenITmng3038TransitiveDepManVersionTest.class ); // suite.addTestSuite( MavenITmng2771PomExtensionComponentOverrideTest.class ); // suite.addTestSuite( MavenITmng0612NewestConflictResolverTest.class ); @@ -106,6 +105,7 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng6049VersionRangeResultFilterExtensionTest.class ); suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); suite.addTestSuite( MavenITmng5600DependencyManagementImportExclusionsTest.class ); suite.addTestSuite( MavenITmng5971HierarchicalImportScopeTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java deleted file mode 100644 index cb06f30..0000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.apache.maven.it; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; -import java.util.List; - -/** - * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3092";>MNG-3092</a>. - * - * @author Benjamin Bentmann - */ -public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest - extends AbstractMavenIntegrationTestCase -{ - - public MavenITmng3092SnapshotsExcludedFromVersionRangeTest() - { - super( "[3.0-beta-1,)" ); - } - - /** - * Verify that snapshots are not included in version ranges unless explicitly declared as the lower/upper bound - * of the range. - */ - public void testit() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3092" ); - - Verifier verifier = newVerifier( testDir.getAbsolutePath() ); - verifier.setAutoclean( false ); - verifier.deleteDirectory( "target" ); - verifier.deleteArtifacts( "org.apache.maven.its.mng3092" ); - 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<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" ); - assertTrue( classpath.toString(), classpath.contains( "a-1.1.jar" ) ); - assertTrue( classpath.toString(), classpath.contains( "b-1.0-SNAPSHOT.jar" ) ); - assertTrue( classpath.toString(), classpath.contains( "c-1.1-SNAPSHOT.jar" ) ); - } - -} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6049VersionRangeResultFilterExtensionTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6049VersionRangeResultFilterExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6049VersionRangeResultFilterExtensionTest.java new file mode 100644 index 0000000..3cb63ca --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6049VersionRangeResultFilterExtensionTest.java @@ -0,0 +1,130 @@ +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.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-6049";>MNG-6049</a>. + * + * <pre> + * <dependencies> + * <dependency> + * <groupId>org.apache.maven.its.mng6049</groupId> + * <artifactId>a</artifactId> + * <version>[1.0,2.0)</version> + * </dependency> + * </dependencies> + * </pre> + */ +public class MavenITmng6049VersionRangeResultFilterExtensionTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng6049VersionRangeResultFilterExtensionTest() + { + super( "[3.4.0,)" ); + } + + /** + * Verify that the Maven default behavior will be used without a VersionRangeResultFilter extension. + */ + public void testDefault() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6049" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng6049" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.filterFile( "pom-mng-6049.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.addCliOption( "--settings" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" ); + assertTrue( classpath.toString(), classpath.contains( "a-2.0-SNAPSHOT.jar" ) ); + } + + /** + * Verify that the Maven VersionRangeResultFilter extension behavior is active and checks that non-snapshot + * version will be used. + */ + public void testVersionRangeResultFilterExtensionSystemProperties() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6049" ); + File extensionDir = new File( testDir, "filter-extension" ); + + final Map<String, String> filterProperties = new HashMap<>(); + filterProperties.put( "@baseurl@", "file://" + testDir.getAbsolutePath() ); + + Verifier verifier; + verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProperties ); + verifier.filterFile( "extension.xml", ".mvn/extension.xml", "UTF-8", filterProperties ); + + // install the test extension + verifier = newVerifier( extensionDir.getAbsolutePath(), "remote" ); + verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", filterProperties ); + verifier.addCliOption( "-f" ); + verifier.addCliOption( extensionDir.getAbsolutePath() + "/pom.xml" ); + verifier.addCliOption( "-Drat.skip=true" ); + verifier.setLogFileName( "install-extension.log" ); + + verifier.executeGoal( "install" ); + verifier.resetStreams(); + verifier.verifyErrorFreeLog(); + + // validate the test project + verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( true ); + verifier.setDebug( true ); + verifier.setMavenDebug( true ); + verifier.filterFile( "pom-mng-6049.xml", "pom.xml", "UTF-8", filterProperties ); + + verifier.addCliOption( "--settings" ); + verifier.addCliOption( testDir.getAbsolutePath() + "/settings.xml" ); + + verifier.addCliOption( "-Dmaven.ext.class.path=" + + verifier.getArtifactPath( "org.apache.maven.its.extensions", "versionrange-resultfilter-extension", + "1.0-SNAPSHOT", "jar" ) ); + + verifier.setLogFileName( "validate-extension.log" ); + verifier.executeGoal( "validate" ); + + verifier.displayStreamBuffers(); + verifier.verifyErrorFreeLog(); + + List<String> classpath = verifier.loadLines( "target/classpath.txt", "UTF-8" ); + assertTrue( classpath.toString(), classpath.contains( "a-1.2.jar" ) ); + } + +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/pom.xml b/core-it-suite/src/test/resources/mng-3092/pom.xml deleted file mode 100644 index 1acb82b..0000000 --- a/core-it-suite/src/test/resources/mng-3092/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>test</artifactId> - <version>0.1</version> - - <name>Maven Integration Test :: MNG-3092</name> - <description> - Verify that snapshots are not included in version ranges unless explicitly declared as the lower/upper bound - of the range. - </description> - - <dependencies> - <dependency> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>a</artifactId> - <version>[1.0,2.0)</version> - </dependency> - <dependency> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>b</artifactId> - <version>[1.0-SNAPSHOT,)</version> - </dependency> - <dependency> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>c</artifactId> - <version>(,1.1-SNAPSHOT]</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.its.plugins</groupId> - <artifactId>maven-it-plugin-dependency-resolution</artifactId> - <version>2.1-SNAPSHOT</version> - <configuration> - <compileClassPath>target/classpath.txt</compileClassPath> - <significantPathLevels>1</significantPathLevels> - </configuration> - <executions> - <execution> - <id>test</id> - <phase>validate</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.jar b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.jar deleted file mode 100644 index 1124371..0000000 Binary files a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.pom b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.pom deleted file mode 100644 index d151739..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.1/a-1.1.pom +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>a</artifactId> - <version>1.1</version> - <packaging>jar</packaging> - - <distributionManagement> - <repository> - <id>maven-core-it</id> - <url>file:///${basedir}/repo</url> - </repository> - </distributionManagement> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar deleted file mode 100644 index b5db31e..0000000 Binary files a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom deleted file mode 100644 index 96b020d..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>a</artifactId> - <version>1.2-SNAPSHOT</version> - <packaging>jar</packaging> - - <distributionManagement> - <repository> - <id>maven-core-it</id> - <url>file:///${basedir}/repo</url> - </repository> - </distributionManagement> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/maven-metadata.xml deleted file mode 100644 index daaf3af..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/1.2-SNAPSHOT/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>a</artifactId> - <version>1.2-SNAPSHOT</version> - <versioning> - <snapshot> - <timestamp>20100408.111215</timestamp> - <buildNumber>1</buildNumber> - </snapshot> - <lastUpdated>20100408111215</lastUpdated> - </versioning> -</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/maven-metadata.xml deleted file mode 100644 index 51767b7..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/a/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>a</artifactId> - <version>1.1</version> - <versioning> - <versions> - <version>1.1</version> - <version>1.2-SNAPSHOT</version> - </versions> - <lastUpdated>20100408111215</lastUpdated> - </versioning> -</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.jar b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.jar deleted file mode 100644 index 8cbe72b..0000000 Binary files a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.pom b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.pom deleted file mode 100644 index ce2016f..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.pom +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>b</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <distributionManagement> - <repository> - <id>maven-core-it</id> - <url>file:///${basedir}/repo</url> - </repository> - </distributionManagement> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/maven-metadata.xml deleted file mode 100644 index da0961e..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/1.0-SNAPSHOT/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>b</artifactId> - <version>1.0-SNAPSHOT</version> - <versioning> - <snapshot> - <timestamp>20100408.111303</timestamp> - <buildNumber>1</buildNumber> - </snapshot> - <lastUpdated>20100408111303</lastUpdated> - </versioning> -</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/maven-metadata.xml deleted file mode 100644 index 85ea219..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/b/maven-metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>b</artifactId> - <version>1.0-SNAPSHOT</version> - <versioning> - <versions> - <version>1.0-SNAPSHOT</version> - </versions> - <lastUpdated>20100408111303</lastUpdated> - </versioning> -</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.jar b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.jar deleted file mode 100644 index 9b6c60c..0000000 Binary files a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.pom b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.pom deleted file mode 100644 index b840111..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.pom +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>c</artifactId> - <version>1.1-SNAPSHOT</version> - <packaging>jar</packaging> - - <distributionManagement> - <repository> - <id>maven-core-it</id> - <url>file:///${basedir}/repo</url> - </repository> - </distributionManagement> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/maven-metadata.xml deleted file mode 100644 index 3fad63a..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/1.1-SNAPSHOT/maven-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>c</artifactId> - <version>1.1-SNAPSHOT</version> - <versioning> - <snapshot> - <timestamp>20100408.111330</timestamp> - <buildNumber>1</buildNumber> - </snapshot> - <lastUpdated>20100408111330</lastUpdated> - </versioning> -</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/maven-metadata.xml deleted file mode 100644 index fd326d0..0000000 --- a/core-it-suite/src/test/resources/mng-3092/repo/org/apache/maven/its/mng3092/c/maven-metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>org.apache.maven.its.mng3092</groupId> - <artifactId>c</artifactId> - <version>1.1-SNAPSHOT</version> - <versioning> - <versions> - <version>1.1-SNAPSHOT</version> - </versions> - <lastUpdated>20100408111330</lastUpdated> - </versioning> -</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-3092/settings-template.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3092/settings-template.xml b/core-it-suite/src/test/resources/mng-3092/settings-template.xml deleted file mode 100644 index 84f73bc..0000000 --- a/core-it-suite/src/test/resources/mng-3092/settings-template.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<settings> - <profiles> - <profile> - <id>maven-core-it-repo</id> - <repositories> - <repository> - <id>maven-core-it</id> - <url>@baseurl@/repo</url> - <releases> - <checksumPolicy>ignore</checksumPolicy> - </releases> - <snapshots> - <checksumPolicy>ignore</checksumPolicy> - </snapshots> - </repository> - </repositories> - </profile> - </profiles> - <activeProfiles> - <activeProfile>maven-core-it-repo</activeProfile> - </activeProfiles> -</settings> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/extension.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/extension.xml b/core-it-suite/src/test/resources/mng-6049/extension.xml new file mode 100644 index 0000000..ace77c2 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/extension.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<extension> + <exportedPackages> + <exportedPackage>org.apache.maven.its.extensions</exportedPackage> + </exportedPackages> + <exportedArtifacts> + <exportedArtifact>org.apache.maven.its.extensions:versionrange-resultfilter-extension</exportedArtifact> + </exportedArtifacts> +</extension> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/filter-extension/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/filter-extension/pom.xml b/core-it-suite/src/test/resources/mng-6049/filter-extension/pom.xml new file mode 100644 index 0000000..d0149ab --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/filter-extension/pom.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.extensions</groupId> + <artifactId>versionrange-resultfilter-extension</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> + + <name>Maven IT Plugin :: MNG-6049 :: VersionRangeResultFilter extension</name> + <description>This extension provides an very easy VersionRangeResultFilter for use in Maven ITs.</description> + + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>sisu-maven-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <id>generate-index</id> + <goals> + <goal>main-index</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/filter-extension/src/main/java/org/apache/maven/its/extensions/MavenITVersionRangeResultFilter.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/filter-extension/src/main/java/org/apache/maven/its/extensions/MavenITVersionRangeResultFilter.java b/core-it-suite/src/test/resources/mng-6049/filter-extension/src/main/java/org/apache/maven/its/extensions/MavenITVersionRangeResultFilter.java new file mode 100644 index 0000000..126c31c --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/filter-extension/src/main/java/org/apache/maven/its/extensions/MavenITVersionRangeResultFilter.java @@ -0,0 +1,77 @@ +package org.apache.maven.its.extensions; + +/* + * 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 java.util.Iterator; +import javax.inject.Inject; +import org.apache.maven.repository.internal.VersionRangeResultFilter; +import org.eclipse.aether.resolution.VersionRangeResolutionException; +import org.eclipse.aether.resolution.VersionRangeResult; +import org.eclipse.aether.spi.log.Logger; +import org.eclipse.aether.spi.log.LoggerFactory; +import org.eclipse.aether.spi.log.NullLoggerFactory; +import org.eclipse.aether.version.Version; +import org.eclipse.sisu.Nullable; + +/** + * Example implementation for use in ITs. + * <p> + * This implementation removes <b>all</b> SNAPSHOT dependencies. + * <p> + * Part of the test set <a href="https://issues.apache.org/jira/browse/MNG-6049";>MNG-6049</a> + * and only works with Maven >= 3.4.0. + */ +@Named +public class MavenITVersionRangeResultFilter implements VersionRangeResultFilter +{ + + private final Logger logger; + + @Inject + public MavenITVersionRangeResultFilter( @Nullable LoggerFactory loggerfactory ) + { + this.logger = ( ( null == loggerfactory ) ? NullLoggerFactory.LOGGER : loggerfactory.getLogger( + VersionRangeResultFilter.class.getName() ) ); + } + + @Override + public VersionRangeResult filterVersionRangeResult( VersionRangeResult versionRangeResult ) + throws VersionRangeResolutionException + { + if ( !"org.apache.maven.its.mng6049".equals( versionRangeResult.getRequest().getArtifact().getGroupId() ) ) + { + return versionRangeResult; + } + this.logger.debug( "[MAVEN-IT-CORE-MNG-6049] Version range result instance: " + versionRangeResult ); + for ( Iterator<Version> it = versionRangeResult.getVersions().iterator(); it.hasNext(); ) + { + final Version version = it.next(); + // XXX: better way to identify a SNAPSHOT version + if ( String.valueOf( version ).endsWith( "SNAPSHOT" ) ) + { + this.logger.debug( "[MAVEN-IT-CORE-MNG-6049] Remove version: " + version ); + it.remove(); + } + } + return versionRangeResult; + } + +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/pom-mng-6049.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/pom-mng-6049.xml b/core-it-suite/src/test/resources/mng-6049/pom-mng-6049.xml new file mode 100644 index 0000000..4076d86 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/pom-mng-6049.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>test-mng6049</artifactId> + <version>0.1</version> + <packaging>jar</packaging> + + <name>Maven Integration Test :: MNG-6049</name> + + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>[1.0,2.0)</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-dependency-resolution</artifactId> + <version>2.1-SNAPSHOT</version> + <extensions>true</extensions> + <configuration> + <compileClassPath>target/classpath.txt</compileClassPath> + <significantPathLevels>1</significantPathLevels> + </configuration> + <executions> + <execution> + <id>test</id> + <phase>validate</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.jar b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.jar new file mode 100644 index 0000000..1124371 Binary files /dev/null and b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.pom b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.pom new file mode 100644 index 0000000..284889b --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.1/a-1.1.pom @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>1.1</version> + <packaging>jar</packaging> + + <distributionManagement> + <repository> + <id>maven-core-it</id> + <url>file:///${basedir}/repo</url> + </repository> + </distributionManagement> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar new file mode 100644 index 0000000..b5db31e Binary files /dev/null and b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom new file mode 100644 index 0000000..9971004 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>1.2-SNAPSHOT</version> + <packaging>jar</packaging> + + <distributionManagement> + <repository> + <id>maven-core-it</id> + <url>file:///${basedir}/repo</url> + </repository> + </distributionManagement> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/maven-metadata.xml new file mode 100644 index 0000000..96694a5 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2-SNAPSHOT/maven-metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>1.2-SNAPSHOT</version> + <versioning> + <snapshot> + <timestamp>20100408.111215</timestamp> + <buildNumber>1</buildNumber> + </snapshot> + <lastUpdated>20100408111215</lastUpdated> + </versioning> +</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.jar b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.jar new file mode 100644 index 0000000..1124371 Binary files /dev/null and b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.pom b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.pom new file mode 100644 index 0000000..3ea6e24 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/1.2/a-1.2.pom @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>1.2</version> + <packaging>jar</packaging> + + <distributionManagement> + <repository> + <id>maven-core-it</id> + <url>file:///${basedir}/repo</url> + </repository> + </distributionManagement> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.jar b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.jar new file mode 100644 index 0000000..1124371 Binary files /dev/null and b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.pom b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.pom new file mode 100644 index 0000000..9bf8aa9 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.pom @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>2.0</version> + <packaging>jar</packaging> + + <distributionManagement> + <repository> + <id>maven-core-it</id> + <url>file:///${basedir}/repo</url> + </repository> + </distributionManagement> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/maven-metadata.xml new file mode 100644 index 0000000..7cbdad3 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0-SNAPSHOT/maven-metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>2.0-SNAPSHOT</version> + <versioning> + <snapshot> + <timestamp>20100408.111215</timestamp> + <buildNumber>1</buildNumber> + </snapshot> + <lastUpdated>20100408111215</lastUpdated> + </versioning> +</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.jar ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.jar b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.jar new file mode 100644 index 0000000..1124371 Binary files /dev/null and b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.jar differ http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.pom ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.pom b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.pom new file mode 100644 index 0000000..9bf8aa9 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/2.0/a-2.0.pom @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>2.0</version> + <packaging>jar</packaging> + + <distributionManagement> + <repository> + <id>maven-core-it</id> + <url>file:///${basedir}/repo</url> + </repository> + </distributionManagement> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/maven-metadata.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/maven-metadata.xml b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/maven-metadata.xml new file mode 100644 index 0000000..1b744cd --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/repo/org/apache/maven/its/mng6049/a/maven-metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>org.apache.maven.its.mng6049</groupId> + <artifactId>a</artifactId> + <version>2.0</version> + <versioning> + <versions> + <version>1.1</version> + <version>1.2-SNAPSHOT</version> + <version>1.2</version> + <version>2.0-SNAPSHOT</version> + <version>2.0</version> + </versions> + <lastUpdated>20100408111215</lastUpdated> + </versioning> +</metadata> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/resources/mng-6049/settings-template.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6049/settings-template.xml b/core-it-suite/src/test/resources/mng-6049/settings-template.xml new file mode 100644 index 0000000..3eb0981 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6049/settings-template.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<settings> + <profiles> + <profile> + <id>maven-core-it-repo</id> + <repositories> + <repository> + <id>maven-core-it</id> + <url>@baseurl@/repo</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>maven-core-it-plugins</id> + <url>@baseurl@/repo</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> + <activeProfiles> + <activeProfile>maven-core-it-repo</activeProfile> + </activeProfiles> +</settings>
