Repository: maven-integration-testing Updated Branches: refs/heads/master 0fa30cec0 -> 2c44c4db5
[MNG-5971] Imported dependencies should be available to inheritance processing o Updated to add integration tests capturing override and conflict resolution logic. 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/2c44c4db Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/2c44c4db Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/2c44c4db Branch: refs/heads/master Commit: 2c44c4db5b92f78d315bba2efa9c16013b57ce17 Parents: 0fa30ce Author: Christian Schulte <schu...@apache.org> Authored: Tue Feb 23 16:51:45 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Tue Feb 23 20:05:09 2016 +0100 ---------------------------------------------------------------------- ...venITmng5971HierarchicalImportScopeTest.java | 50 +++++++++- .../src/test/resources/mng-5971/1/2/3/pom.xml | 46 --------- .../src/test/resources/mng-5971/1/2/pom.xml | 49 --------- .../src/test/resources/mng-5971/1/pom.xml | 49 --------- .../test/resources/mng-5971/conflict/pom.xml | 100 +++++++++++++++++++ .../mng-5971/inheritance/1/2/3/pom.xml | 46 +++++++++ .../resources/mng-5971/inheritance/1/2/pom.xml | 49 +++++++++ .../resources/mng-5971/inheritance/1/pom.xml | 49 +++++++++ .../test/resources/mng-5971/inheritance/pom.xml | 79 +++++++++++++++ .../test/resources/mng-5971/override/pom.xml | 87 ++++++++++++++++ .../src/test/resources/mng-5971/pom.xml | 79 --------------- .../resources/mng-5971/settings-template.xml | 2 +- 12 files changed, 459 insertions(+), 226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java index eea8ceb..6d4df01 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5971HierarchicalImportScopeTest.java @@ -43,11 +43,11 @@ public class MavenITmng5971HierarchicalImportScopeTest public void testInheritanceProcessing() throws Exception { - final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971" ); + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/inheritance" ); final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); - verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", (Map) verifier.newDefaultFilterProperties() ); verifier.addCliOption( "-s" ); @@ -72,6 +72,52 @@ public class MavenITmng5971HierarchicalImportScopeTest assertTrue( contains( dependencies3, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); } + public void testOverrideProcessing() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/override" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List<String> dependencies = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + } + + public void testConflictResolution() + throws Exception + { + final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5971/conflict" ); + + final Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", + (Map) verifier.newDefaultFilterProperties() ); + + verifier.addCliOption( "-s" ); + verifier.addCliOption( "settings.xml" ); + verifier.executeGoals( Arrays.asList( new String[] + { + "clean", "verify" + } ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + final List<String> dependencies = verifier.loadLines( "target/compile.txt", "UTF-8" ); + assertTrue( contains( dependencies, "org.apache.maven.its.mng5971:dependency:jar:3" ) ); + } + private static boolean contains( final List<String> lines, final String pattern ) { for ( int i = 0, l0 = lines.size(); i < l0; i++ ) http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/resources/mng-5971/1/2/3/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/1/2/3/pom.xml b/core-it-suite/src/test/resources/mng-5971/1/2/3/pom.xml deleted file mode 100644 index 54a3f71..0000000 --- a/core-it-suite/src/test/resources/mng-5971/1/2/3/pom.xml +++ /dev/null @@ -1,46 +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> - - <parent> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>2</artifactId> - <version>20160220</version> - </parent> - - <artifactId>3</artifactId> - <packaging>pom</packaging> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>import</artifactId> - <version>3</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/resources/mng-5971/1/2/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/1/2/pom.xml b/core-it-suite/src/test/resources/mng-5971/1/2/pom.xml deleted file mode 100644 index 76a1fdb..0000000 --- a/core-it-suite/src/test/resources/mng-5971/1/2/pom.xml +++ /dev/null @@ -1,49 +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> - - <parent> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>1</artifactId> - <version>20160220</version> - </parent> - - <artifactId>2</artifactId> - <packaging>pom</packaging> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>import</artifactId> - <version>2</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <modules> - <module>3</module> - </modules> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/resources/mng-5971/1/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/1/pom.xml b/core-it-suite/src/test/resources/mng-5971/1/pom.xml deleted file mode 100644 index 8f4cd52..0000000 --- a/core-it-suite/src/test/resources/mng-5971/1/pom.xml +++ /dev/null @@ -1,49 +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> - - <parent> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>0</artifactId> - <version>20160220</version> - </parent> - - <artifactId>1</artifactId> - <packaging>pom</packaging> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>import</artifactId> - <version>1</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <modules> - <module>2</module> - </modules> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml b/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml new file mode 100644 index 0000000..9df2c7d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/conflict/pom.xml @@ -0,0 +1,100 @@ +<?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.mng5971</groupId> + <artifactId>0</artifactId> + <version>20160220</version> + <packaging>pom</packaging> + + <name>Maven Integration Test :: MNG-5971</name> + + <description> + Tests that imported dependencies will be overridden based on a first declaration wins strategy. + </description> + + <dependencyManagement> + <dependencies> + <!-- + First declaration wins. + --> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>3</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>2</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>1</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>0</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>dependency</artifactId> + </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> + <compileArtifacts>target/compile.txt</compileArtifacts> + </configuration> + <executions> + <execution> + <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/2c44c4db/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml new file mode 100644 index 0000000..54a3f71 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/3/pom.xml @@ -0,0 +1,46 @@ +<?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> + + <parent> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>2</artifactId> + <version>20160220</version> + </parent> + + <artifactId>3</artifactId> + <packaging>pom</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>3</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml new file mode 100644 index 0000000..76a1fdb --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/1/2/pom.xml @@ -0,0 +1,49 @@ +<?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> + + <parent> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>1</artifactId> + <version>20160220</version> + </parent> + + <artifactId>2</artifactId> + <packaging>pom</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>2</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <modules> + <module>3</module> + </modules> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml new file mode 100644 index 0000000..8f4cd52 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/1/pom.xml @@ -0,0 +1,49 @@ +<?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> + + <parent> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>0</artifactId> + <version>20160220</version> + </parent> + + <artifactId>1</artifactId> + <packaging>pom</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>1</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <modules> + <module>2</module> + </modules> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2c44c4db/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml b/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml new file mode 100644 index 0000000..2614416 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml @@ -0,0 +1,79 @@ +<?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.mng5971</groupId> + <artifactId>0</artifactId> + <version>20160220</version> + <packaging>pom</packaging> + + <name>Maven Integration Test :: MNG-5971</name> + + <description> + Multi module project using dependency management import at each child level testing import are performed on each + level and overriden correctly. + </description> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>dependency</artifactId> + <version>0</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>dependency</artifactId> + </dependency> + </dependencies> + + <modules> + <module>1</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-dependency-resolution</artifactId> + <version>2.1-SNAPSHOT</version> + <configuration> + <compileArtifacts>target/compile.txt</compileArtifacts> + </configuration> + <executions> + <execution> + <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/2c44c4db/core-it-suite/src/test/resources/mng-5971/override/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/override/pom.xml b/core-it-suite/src/test/resources/mng-5971/override/pom.xml new file mode 100644 index 0000000..fc5fb4c --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5971/override/pom.xml @@ -0,0 +1,87 @@ +<?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.mng5971</groupId> + <artifactId>0</artifactId> + <version>20160220</version> + <packaging>pom</packaging> + + <name>Maven Integration Test :: MNG-5971</name> + + <description> + Tests that imported dependencies will be overridden based on a first declaration wins strategy. + </description> + + <dependencyManagement> + <dependencies> + <!-- + Imports the same dependency as below with a different version. + --> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>import</artifactId> + <version>0</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <!-- + Direct declaration overrides what gets imported. + --> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>dependency</artifactId> + <version>3</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.apache.maven.its.mng5971</groupId> + <artifactId>dependency</artifactId> + </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> + <compileArtifacts>target/compile.txt</compileArtifacts> + </configuration> + <executions> + <execution> + <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/2c44c4db/core-it-suite/src/test/resources/mng-5971/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/pom.xml b/core-it-suite/src/test/resources/mng-5971/pom.xml deleted file mode 100644 index 2614416..0000000 --- a/core-it-suite/src/test/resources/mng-5971/pom.xml +++ /dev/null @@ -1,79 +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.mng5971</groupId> - <artifactId>0</artifactId> - <version>20160220</version> - <packaging>pom</packaging> - - <name>Maven Integration Test :: MNG-5971</name> - - <description> - Multi module project using dependency management import at each child level testing import are performed on each - level and overriden correctly. - </description> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>dependency</artifactId> - <version>0</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.maven.its.mng5971</groupId> - <artifactId>dependency</artifactId> - </dependency> - </dependencies> - - <modules> - <module>1</module> - </modules> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.its.plugins</groupId> - <artifactId>maven-it-plugin-dependency-resolution</artifactId> - <version>2.1-SNAPSHOT</version> - <configuration> - <compileArtifacts>target/compile.txt</compileArtifacts> - </configuration> - <executions> - <execution> - <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/2c44c4db/core-it-suite/src/test/resources/mng-5971/settings-template.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5971/settings-template.xml b/core-it-suite/src/test/resources/mng-5971/settings-template.xml index c985d1a..f22a7f3 100644 --- a/core-it-suite/src/test/resources/mng-5971/settings-template.xml +++ b/core-it-suite/src/test/resources/mng-5971/settings-template.xml @@ -26,7 +26,7 @@ under the License. <repositories> <repository> <id>maven-core-it</id> - <url>@baseurl@/repo</url> + <url>@baseurl@/../repo</url> <releases> <checksumPolicy>ignore</checksumPolicy> </releases>
