Repository: maven-integration-testing Updated Branches: refs/heads/master 5c9d70e01 -> 06f665dce
[MNG-6079] 3.4 regression: cannot override version of a dependencyManagement in a submodule any more 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/06f665dc Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/06f665dc Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/06f665dc Branch: refs/heads/master Commit: 06f665dce7d663cc562c64ec0e7c88e3fd9bae88 Parents: 5c9d70e Author: Christian Schulte <[email protected]> Authored: Sat Aug 13 03:15:13 2016 +0200 Committer: Christian Schulte <[email protected]> Committed: Sat Aug 13 03:15:13 2016 +0200 ---------------------------------------------------------------------- .../src/test/resources/mng-6079/parent-pom.xml | 49 ++++++++++++++ .../src/test/resources/mng-6079/pom.xml | 69 ++++++++++++++++++++ .../resources/mng-6079/settings-template.xml | 43 ++++++++++++ .../src/test/resources/mng-6097/parent-pom.xml | 49 -------------- .../src/test/resources/mng-6097/pom.xml | 69 -------------------- .../resources/mng-6097/settings-template.xml | 43 ------------ 6 files changed, 161 insertions(+), 161 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/06f665dc/core-it-suite/src/test/resources/mng-6079/parent-pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6079/parent-pom.xml b/core-it-suite/src/test/resources/mng-6079/parent-pom.xml new file mode 100644 index 0000000..86cdcec --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6079/parent-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 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/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.its.mng6079</groupId> + <artifactId>parent</artifactId> + <packaging>pom</packaging> + <version>1.0-SNAPSHOT</version> + + <properties> + <surefire.version>2.10</surefire.version> + </properties> + + <!-- Import dependencies from surefire, especially surefire-api --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire</artifactId> + <version>${surefire.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/06f665dc/core-it-suite/src/test/resources/mng-6079/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6079/pom.xml b/core-it-suite/src/test/resources/mng-6079/pom.xml new file mode 100644 index 0000000..bc2e24d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6079/pom.xml @@ -0,0 +1,69 @@ +<?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/maven-v4_0_0.xsd";> + + <parent> + <groupId>org.apache.maven.its.mng6079</groupId> + <artifactId>parent</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>parent-pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>submodule</artifactId> + + <properties> + <surefire.version>2.12</surefire.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-api</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/06f665dc/core-it-suite/src/test/resources/mng-6079/settings-template.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6079/settings-template.xml b/core-it-suite/src/test/resources/mng-6079/settings-template.xml new file mode 100644 index 0000000..f22a7f3 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6079/settings-template.xml @@ -0,0 +1,43 @@ +<?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> + <enabled>false</enabled> + </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/06f665dc/core-it-suite/src/test/resources/mng-6097/parent-pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6097/parent-pom.xml b/core-it-suite/src/test/resources/mng-6097/parent-pom.xml deleted file mode 100644 index 86cdcec..0000000 --- a/core-it-suite/src/test/resources/mng-6097/parent-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 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/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.maven.its.mng6079</groupId> - <artifactId>parent</artifactId> - <packaging>pom</packaging> - <version>1.0-SNAPSHOT</version> - - <properties> - <surefire.version>2.10</surefire.version> - </properties> - - <!-- Import dependencies from surefire, especially surefire-api --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire</artifactId> - <version>${surefire.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/06f665dc/core-it-suite/src/test/resources/mng-6097/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6097/pom.xml b/core-it-suite/src/test/resources/mng-6097/pom.xml deleted file mode 100644 index bc2e24d..0000000 --- a/core-it-suite/src/test/resources/mng-6097/pom.xml +++ /dev/null @@ -1,69 +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 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/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.maven.its.mng6079</groupId> - <artifactId>parent</artifactId> - <version>1.0-SNAPSHOT</version> - <relativePath>parent-pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>submodule</artifactId> - - <properties> - <surefire.version>2.12</surefire.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-api</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/06f665dc/core-it-suite/src/test/resources/mng-6097/settings-template.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6097/settings-template.xml b/core-it-suite/src/test/resources/mng-6097/settings-template.xml deleted file mode 100644 index f22a7f3..0000000 --- a/core-it-suite/src/test/resources/mng-6097/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> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </profile> - </profiles> - <activeProfiles> - <activeProfile>maven-core-it-repo</activeProfile> - </activeProfiles> -</settings>
