You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/11/11 20:47:41 UTC

[1/2] maven-integration-testing git commit: o [MNG-6082] Introduction of model version 4.1.0.

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master ec5968b3f -> ee10d9991


o [MNG-6082] Introduction of model version 4.1.0.

This reverts commit 6a30b47b7d8b79ae0cfbeb7829b329ba2913a0ca.


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/63d453a4
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/63d453a4
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/63d453a4

Branch: refs/heads/master
Commit: 63d453a48d8115d539ff74bcbd70b1bc88634ca6
Parents: ec5968b
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Nov 11 21:13:17 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Nov 11 21:15:35 2016 +0100

----------------------------------------------------------------------
 .../apache/maven/it/IntegrationTestSuite.java   |  1 -
 ...ncyManagementImportInterpolation410Test.java | 83 --------------------
 .../mng-4463/exclusive-upper-bound/pom.xml      |  2 +-
 .../mng-4463/inclusive-upper-bound/pom.xml      |  2 +-
 .../resources/mng-4463/no-upper-bound/pom.xml   |  2 +-
 .../test/resources/mng-5527/relocations/pom.xml |  2 +-
 .../test/resources/mng-5600/exclusions/pom.xml  |  2 +-
 .../mng-5971/inheritance/1/2/3/pom.xml          |  2 +-
 .../resources/mng-5971/inheritance/1/2/pom.xml  |  2 +-
 .../resources/mng-5971/inheritance/1/pom.xml    |  2 +-
 .../test/resources/mng-5971/inheritance/pom.xml |  2 +-
 .../test/resources/mng-5971/override/pom.xml    |  2 +-
 .../mng-5971/properties/1/2/3/4/pom.xml         |  2 +-
 .../resources/mng-5971/properties/1/2/3/pom.xml |  2 +-
 .../resources/mng-5971/properties/1/2/pom.xml   |  2 +-
 .../resources/mng-5971/properties/1/pom.xml     |  2 +-
 .../test/resources/mng-5971/properties/pom.xml  |  2 +-
 .../resources/mng-6079/parent-pom-4_1_0.xml     | 49 ------------
 .../src/test/resources/mng-6079/pom-4_1_0.xml   | 69 ----------------
 19 files changed, 15 insertions(+), 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/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 1348817..3713aa7 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,7 +106,6 @@ public class IntegrationTestSuite
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
 
         suite.addTestSuite( MavenITmng6079DependencyManagementImportInterpolationTest.class );
-        suite.addTestSuite( MavenITmng6079DependencyManagementImportInterpolation410Test.class );
         suite.addTestSuite( MavenITmng6049VersionRangeResultFilterExtensionTest.class );
         suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class );
         suite.addTestSuite( MavenITmng5600DependencyManagementImportExclusionsTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolation410Test.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolation410Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolation410Test.java
deleted file mode 100644
index 1262c9b..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6079DependencyManagementImportInterpolation410Test.java
+++ /dev/null
@@ -1,83 +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 java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import static junit.framework.Assert.assertTrue;
-
-/**
- * [MNG-6079] 3.4 regression: cannot override version of a dependencyManagement in a submodule any more
- *
- * @author Christian Schulte
- */
-public class MavenITmng6079DependencyManagementImportInterpolation410Test
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng6079DependencyManagementImportInterpolation410Test()
-    {
-        super( "[3.4,)" );
-    }
-
-    public void testInheritanceProcessing()
-        throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6079" );
-
-        final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
-        verifier.setAutoclean( false );
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
-                             (Map) verifier.newDefaultFilterProperties() );
-
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.addCliOption( "-f" );
-        verifier.addCliOption( "pom-4_1_0.xml" );
-        verifier.executeGoals( Arrays.asList( new String[]
-        {
-            "clean", "verify"
-        } ) );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        final List<String> dependencies0 = verifier.loadLines( "target/compile.txt", "UTF-8" );
-        assertTrue( contains( dependencies0, "org.apache.maven.surefire:surefire-api:jar:2.12" ) );
-    }
-
-    private static boolean contains( final List<String> lines, final String pattern )
-    {
-        for ( int i = 0, l0 = lines.size(); i < l0; i++ )
-        {
-            if ( lines.get( i ).contains( pattern ) )
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml
index cdb96d7..54404ac 100644
--- a/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng4463</groupId>
   <artifactId>test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml
index 3f36c6a..0e91b01 100644
--- a/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng4463</groupId>
   <artifactId>test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml
index 6b4f217..53ec4e3 100644
--- a/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng4463</groupId>
   <artifactId>test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml b/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml
index f626481..822f1cf 100644
--- a/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5527/relocations/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng5527</groupId>
   <artifactId>0</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml b/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml
index 412ebcd..dc06836 100644
--- a/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5600/exclusions/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng5600</groupId>
   <artifactId>0</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/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
index dafcf7a..54a3f71 100644
--- 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
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.its.mng5971</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/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
index a820253..76a1fdb 100644
--- 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
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.its.mng5971</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/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
index 73c5532..8f4cd52 100644
--- 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
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.its.mng5971</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/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
index 567f5f9..2614416 100644
--- a/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5971/inheritance/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng5971</groupId>
   <artifactId>0</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/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
index 024d22a..fc5fb4c 100644
--- a/core-it-suite/src/test/resources/mng-5971/override/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5971/override/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng5971</groupId>
   <artifactId>0</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml
index a5eced1..c60f6d0 100644
--- a/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/4/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.its.mng5971</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml
index 0651192..501f191 100644
--- a/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5971/properties/1/2/3/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.its.mng5971</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml
index f538db3..5e0b727 100644
--- a/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5971/properties/1/2/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.its.mng5971</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml
index 7c1f8c6..e374e88 100644
--- a/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5971/properties/1/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.its.mng5971</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-5971/properties/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5971/properties/pom.xml b/core-it-suite/src/test/resources/mng-5971/properties/pom.xml
index a6f7388..02f870e 100644
--- a/core-it-suite/src/test/resources/mng-5971/properties/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5971/properties/pom.xml
@@ -20,7 +20,7 @@ under the License.
 -->
 
 <project>
-  <modelVersion>4.1.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.mng5971</groupId>
   <artifactId>0</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/63d453a4/core-it-suite/src/test/resources/mng-6079/parent-pom-4_1_0.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6079/parent-pom-4_1_0.xml b/core-it-suite/src/test/resources/mng-6079/parent-pom-4_1_0.xml
deleted file mode 100644
index 46b8337..0000000
--- a/core-it-suite/src/test/resources/mng-6079/parent-pom-4_1_0.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.1.0</modelVersion>
-  <groupId>org.apache.maven.its.mng6079</groupId>
-  <artifactId>parent-4_1_0</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/63d453a4/core-it-suite/src/test/resources/mng-6079/pom-4_1_0.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6079/pom-4_1_0.xml b/core-it-suite/src/test/resources/mng-6079/pom-4_1_0.xml
deleted file mode 100644
index 794f059..0000000
--- a/core-it-suite/src/test/resources/mng-6079/pom-4_1_0.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-4_1_0</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <relativePath>parent-pom-4_1_0.xml</relativePath>
-  </parent>
-
-  <modelVersion>4.1.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>


[2/2] maven-integration-testing git commit: [MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed.

Posted by sc...@apache.org.
[MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed.

This reverts commit 81b1de88da12d98e90258bd21dd87c54dd6d6df5.


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/ee10d999
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ee10d999
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ee10d999

Branch: refs/heads/master
Commit: ee10d9991f27a012259de61280254ea45da758d6
Parents: 63d453a
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Nov 11 21:28:13 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Nov 11 21:28:13 2016 +0100

----------------------------------------------------------------------
 ...ITmng4963ParentResolutionFromMirrorTest.java |  6 +---
 .../resources/mng-4991/settings-template.xml    | 35 --------------------
 2 files changed, 1 insertion(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ee10d999/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
index 3eaa8d7..1aadfdd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
@@ -35,11 +35,7 @@ public class MavenITmng4963ParentResolutionFromMirrorTest
 
     public MavenITmng4963ParentResolutionFromMirrorTest()
     {
-        // This test got disabled for Maven >= 3.4 because the test is testing built-in repository behaviour. As of
-        // Maven 3.4 built-in repositories have been moved to the default settings and thus this test is obsolete as of
-        // Maven 3.4 because there is no way to test built-in repositories without declaring them in the settings or the
-        // pom.
-        super( "[2.0.5,3.0-alpha-1),[3.0.3,3.4)" );
+        super( "[2.0.5,3.0-alpha-1),[3.0.3,)" );
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ee10d999/core-it-suite/src/test/resources/mng-4991/settings-template.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-4991/settings-template.xml b/core-it-suite/src/test/resources/mng-4991/settings-template.xml
index 5d99005..75dd1ab 100644
--- a/core-it-suite/src/test/resources/mng-4991/settings-template.xml
+++ b/core-it-suite/src/test/resources/mng-4991/settings-template.xml
@@ -41,41 +41,6 @@ under the License.
     <profile>
       <id>it-defaults</id>
       <!-- disable central override and use built-in values -->
-
-      <!--
-      As of Maven 3.4, there are no built-in values other than what is declared in the default settings. In order to
-      use the built-in values, those values need to be provided here. It is essential the repositories below match
-      the built-in values prior to Maven 3.4.
-      -->
-      <repositories>
-        <repository>
-          <id>central</id>
-          <name>Central Repository</name>
-          <url>https://repo.maven.apache.org/maven2</url>
-          <layout>default</layout>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <releases>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-        </repository>
-      </repositories>
-
-      <pluginRepositories>
-        <pluginRepository>
-          <id>central</id>
-          <name>Central Repository</name>
-          <url>https://repo.maven.apache.org/maven2</url>
-          <layout>default</layout>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <releases>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-        </pluginRepository>
-      </pluginRepositories>
     </profile>
   </profiles>
   <activeProfiles>