Repository: maven-integration-testing Updated Branches: refs/heads/master c68f7072b -> dec1deb3f
[MNG-6057], [MNG-6090], [MNG-5895] o Added IT's for MNG-5895, MNG-6057, MNG-6090 o Added flatten-maven-plugin for usage during the IT's. 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/dec1deb3 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/dec1deb3 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/dec1deb3 Branch: refs/heads/master Commit: dec1deb3f1bb86cf08c6b593d10161ddbf732b8e Parents: c68f707 Author: Karl Heinz Marbaise <khmarba...@apache.org> Authored: Wed Mar 8 00:12:31 2017 +0100 Committer: Karl Heinz Marbaise <khmarba...@apache.org> Committed: Mon Mar 13 22:06:57 2017 +0100 ---------------------------------------------------------------------- .gitignore | 1 + .../apache/maven/it/IntegrationTestSuite.java | 3 + ...Tmng5895CIFriendlyUsageWithPropertyTest.java | 70 +++++++++++ .../it/MavenITmng6057CheckReactorOrderTest.java | 119 +++++++++++++++++++ .../maven/it/MavenITmng6090CIFriendlyTest.java | 80 +++++++++++++ .../test/resources/bootstrap/group-6/pom.xml | 72 +++++++++++ .../src/test/resources/bootstrap/pom.xml | 10 ++ .../module-1/pom.xml | 33 +++++ .../module-2/pom.xml | 33 +++++ .../module-3/jar-with-prod.xml | 17 +++ .../module-3/pom.xml | 56 +++++++++ .../pom.xml | 55 +++++++++ .../module-1/pom.xml | 34 ++++++ .../module-2/pom.xml | 40 +++++++ .../mng-6057-check-reactor-order/pom.xml | 35 ++++++ .../mng-6090-ci-friendly/module-1/pom.xml | 33 +++++ .../mng-6090-ci-friendly/module-2/pom.xml | 33 +++++ .../module-3/jar-with-prod.xml | 17 +++ .../mng-6090-ci-friendly/module-3/pom.xml | 57 +++++++++ .../test/resources/mng-6090-ci-friendly/pom.xml | 86 ++++++++++++++ 20 files changed, 884 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index fa65a79..5fb5e3a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ bin .DS_Store .idea jvz-* +.flattened-pom.xml http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/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 272a859..bbc7c9e 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,9 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class ); + suite.addTestSuite( MavenITmng5895CIFriendlyUsageWithPropertyTest.class ); + suite.addTestSuite( MavenITmng6090CIFriendlyTest.class ); suite.addTestSuite( MavenITmng6173GetProjectsAndDependencyGraphTest.class ); suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class ); suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java new file mode 100644 index 0000000..7d13fd4 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java @@ -0,0 +1,70 @@ +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; + +/** + * The usage of a <code>${revision}</code> for the version in the pom file and furthermore + * defining the property in the pom file and overwrite it via command line. + * <a href="https://issues.apache.org/jira/browse/MNG-5895";>MNG-5895</a>. + * + * This will result in a failure without the fix for this issue. + * + * @author Karl Heinz Marbaise khmarba...@apache.org + */ +public class MavenITmng5895CIFriendlyUsageWithPropertyTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5895CIFriendlyUsageWithPropertyTest() + { + // The first version which contains the fix for the MNG-issue. + // TODO: Think about it! + super( "[3.5.0-alpha-2,)" ); + } + + /** + * Check that the resulting run will not fail in case + * of defining the property via command line which is + * already defined inside the pom. + */ + public void testitShouldResolveTheDependencies() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5895-ci-friendly-usage-with-property" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath(), false ); + verifier.setMavenDebug( false ); + verifier.setAutoclean( false ); + + //verifier.setLogFileName( "log-only.txt" ); + verifier.addCliOption( "-Drevision=1.2" ); + verifier.executeGoal( "clean" ); + verifier.executeGoal( "package" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + } + +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java new file mode 100644 index 0000000..13a009c --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java @@ -0,0 +1,119 @@ +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.LinkedList; +import java.util.List; + +/** + * Using a <code>${revision}</code> in the version will change the reactor order before fixing + * <a href="https://issues.apache.org/jira/browse/MNG-6057";>MNG-6057</a>. Without the fix for this issue the order of + * the reactor is changed in that way that the parent is ordered to the last position instead of the first position. + * + * @author Karl Heinz Marbaise khmarba...@apache.org + */ +public class MavenITmng6057CheckReactorOrderTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng6057CheckReactorOrderTest() + { + // The first version which contains the fix for the MNG-6057 issue. + // TODO: Think about it! + super( "[3.5.0-alpha-2,)" ); + } + + /** + * Verify that the result shows the reactor order as expected. + */ + public void testitReactorShouldResultInExpectedOrder() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6057-check-reactor-order" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath(), false ); + verifier.setMavenDebug( false ); + verifier.setAutoclean( false ); + + verifier.setLogFileName( "log-only.txt" ); + verifier.addCliOption( "-Drevision=1.3.0-SNAPSHOT" ); + verifier.executeGoal( "clean" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List<String> loadedLines = verifier.loadLines( "log-only.txt", "UTF-8" ); + List<String> resultingLines = extractReactorBuildOrder( loadedLines ); + + // We expecting exactly three lines as result. + assertEquals( 3, resultingLines.size() ); + + // We expect those lines in the following exact order. + assertEquals( "[INFO] base-project", resultingLines.get( 0 ) ); + assertEquals( "[INFO] module-1", resultingLines.get( 1 ) ); + assertEquals( "[INFO] module-2", resultingLines.get( 2 ) ); + } + + /** + * Extract the lines at the beginning of the Maven output: + * + * <pre> + * [INFO] Reactor Build Order: + * [INFO] + * [INFO] module-1 + * [INFO] module-2 + * [INFO] base-project + * [INFO] + * </pre> + */ + private List<String> extractReactorBuildOrder( List<String> loadedLines ) + { + List<String> resultingLines = new LinkedList<String>(); + boolean start = false; + for ( String line : loadedLines ) + { + if ( start ) + { + if ( line.startsWith( "[INFO] ----------------------------" ) ) + { + start = false; + } + else if ( !line.endsWith( "[INFO] " ) ) + { + resultingLines.add( line ); + } + } + else + { + if ( line.startsWith( "[INFO] Reactor Build Order:" ) ) + { + start = true; + } + + } + } + return resultingLines; + + } + +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java new file mode 100644 index 0000000..77b7248 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java @@ -0,0 +1,80 @@ +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.Arrays; + +/** + * The usage of a <code>${revision}</code> for the version in the pom file and furthermore + * defining the property in the pom file and overwrite it via command line and + * try to build a partial reactor via <code>mvn -pl ..</code> + * <a href="https://issues.apache.org/jira/browse/MNG-6090";>MNG-6090</a>. + * + * @author Karl Heinz Marbaise khmarba...@apache.org + */ +public class MavenITmng6090CIFriendlyTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng6090CIFriendlyTest() + { + // The first version which contains the fix for the MNG-issue. + // TODO: Think about it! + super( "[3.5.0-alpha-2,)" ); + } + + /** + * Check that the resulting run will not fail in case + * of defining the property via command line and + * install the projects and afterwards just build + * a part of the whole reactor. + */ + public void testitShouldResolveTheDependencies() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6090-ci-friendly" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath(), false ); + verifier.setMavenDebug( false ); + verifier.setAutoclean( false ); + + verifier.addCliOption( "-Drevision=1.2" ); + verifier.setLogFileName( "install-log.txt" ); + verifier.executeGoals( Arrays.asList( "clean", "install" ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier = newVerifier( testDir.getAbsolutePath(), false ); + verifier.setMavenDebug( false ); + verifier.setAutoclean( false ); + + verifier.addCliOption( "-Drevision=1.2" ); + verifier.addCliOption( "-pl module-3" ); + verifier.executeGoal( "package" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + } + +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml index b48464e..7c5c03c 100644 --- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml +++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml @@ -88,5 +88,77 @@ under the License. <version>3.1</version> <scope>runtime</scope> </dependency> + <!-- IT MNG-6057 --> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings-builder</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-spi</artifactId> + <version>0.9.0.M2</version> + </dependency> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-impl</artifactId> + <version>0.9.0.M2</version> + </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <version>0.0.0.M5</version> + </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.inject</artifactId> + <version>0.0.0.M5</version> + </dependency> + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + <version>3.1.0</version> + <classifier>no_aop</classifier> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>10.0.1</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>1.3.9</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-classworlds</artifactId> + <version>2.5.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.1</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/bootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/bootstrap/pom.xml b/core-it-suite/src/test/resources/bootstrap/pom.xml index e7aa995..8ef3a14 100644 --- a/core-it-suite/src/test/resources/bootstrap/pom.xml +++ b/core-it-suite/src/test/resources/bootstrap/pom.xml @@ -89,6 +89,16 @@ under the License. <version>2.12.4</version> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml new file mode 100644 index 0000000..e9ac53d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-1/pom.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>mng-5895-ci-friendly-usage-with-property</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + + <artifactId>module-1</artifactId> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml new file mode 100644 index 0000000..ac532d3 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>mng-5895-ci-friendly-usage-with-property</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + <artifactId>module-2</artifactId> + + <dependencies> + <dependency> + <groupId>mng-5895-ci-friendly-usage-with-property</groupId> + <artifactId>module-1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/jar-with-prod.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/jar-with-prod.xml b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/jar-with-prod.xml new file mode 100644 index 0000000..65b31bb --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/jar-with-prod.xml @@ -0,0 +1,17 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>prod</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml new file mode 100644 index 0000000..e51f0fb --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>mng-5895-ci-friendly-usage-with-property</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + <artifactId>module-3</artifactId> + + <dependencies> + <dependency> + <groupId>mng-5895-ci-friendly-usage-with-property</groupId> + <artifactId>module-2</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>jar-with-prod.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml new file mode 100644 index 0000000..38a3358 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>mng-5895-ci-friendly-usage-with-property</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + <packaging>pom</packaging> + + <properties> + <revision>1.3.0-SNAPSHOT</revision> + </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <modules> + <module>module-3</module> + <module>module-1</module> + <module>module-2</module> + </modules> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml b/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml new file mode 100644 index 0000000..fe4baff --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-1/pom.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>mng-6057-check-reactor-order</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + + <artifactId>module-1</artifactId> + <packaging>pom</packaging> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml b/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml new file mode 100644 index 0000000..d33c1c9 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6057-check-reactor-order/module-2/pom.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>mng-6057-check-reactor-order</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + <artifactId>module-2</artifactId> + + <dependencies> + <dependency> + <groupId>mng-6057-check-reactor-order</groupId> + <artifactId>module-1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6057-check-reactor-order/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6057-check-reactor-order/pom.xml b/core-it-suite/src/test/resources/mng-6057-check-reactor-order/pom.xml new file mode 100644 index 0000000..dbc9d39 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6057-check-reactor-order/pom.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>mng-6057-check-reactor-order</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + <packaging>pom</packaging> + + <modules> + <module>module-1</module> + <module>module-2</module> + </modules> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml new file mode 100644 index 0000000..b0577aa --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-1/pom.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>mng-6090-ci-friendly</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + + <artifactId>module-1</artifactId> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml new file mode 100644 index 0000000..5b99f84 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>mng-6090-ci-friendly</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + <artifactId>module-2</artifactId> + + <dependencies> + <dependency> + <groupId>mng-6090-ci-friendly</groupId> + <artifactId>module-1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/jar-with-prod.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/jar-with-prod.xml b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/jar-with-prod.xml new file mode 100644 index 0000000..65b31bb --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/jar-with-prod.xml @@ -0,0 +1,17 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>prod</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml new file mode 100644 index 0000000..a3f7236 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-3/pom.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>mng-6090-ci-friendly</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + </parent> + <artifactId>module-3</artifactId> + + <dependencies> + <dependency> + <groupId>mng-6090-ci-friendly</groupId> + <artifactId>module-2</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>jar-with-prod.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dec1deb3/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml new file mode 100644 index 0000000..233c4cd --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>mng-6090-ci-friendly</groupId> + <artifactId>base-project</artifactId> + <version>${revision}</version> + <packaging>pom</packaging> + + <properties> + <revision>1.3.0-SNAPSHOT</revision> + </properties> + <modules> + <module>module-3</module> + <module>module-1</module> + <module>module-2</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.0.0</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <configuration> + <updatePomFile>true</updatePomFile> + </configuration> + <executions> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + </execution> + <execution> + <id>flatten.clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
