You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/12/28 14:27:49 UTC
maven-integration-testing git commit: [MNG-6330] Parents relativePath
not verified anymore IT based on maven-release-manager unittest
Repository: maven-integration-testing
Updated Branches:
refs/heads/MNG-6330_RelativePath 15e305e05 -> cfd0cc629
[MNG-6330] Parents relativePath not verified anymore
IT based on maven-release-manager unittest
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/cfd0cc62
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/cfd0cc62
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/cfd0cc62
Branch: refs/heads/MNG-6330_RelativePath
Commit: cfd0cc629c2dd496554c59c1680fb1d90b1311b3
Parents: 15e305e
Author: rfscholte <rf...@apache.org>
Authored: Thu Dec 28 15:27:26 2017 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Thu Dec 28 15:27:26 2017 +0100
----------------------------------------------------------------------
.../maven/it/MavenITmng6330RelativePath.java | 7 ++---
.../mng-6330-relative-path/module-a/pom.xml | 29 ------------------
.../parent-project/pom.xml | 30 -------------------
.../resources/mng-6330-relative-path/pom.xml | 31 ++++++++++++++++++++
.../sub/subproject2/pom.xml | 28 ++++++++++++++++++
.../mng-6330-relative-path/subproject1/pom.xml | 30 +++++++++++++++++++
6 files changed, 92 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfd0cc62/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
index 4f8d9d6..7adf2cd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.containsString;
import java.io.File;
-import java.util.Arrays;
import org.apache.maven.it.util.ResourceExtractor;
@@ -40,16 +39,16 @@ public class MavenITmng6330RelativePath
super( "(,3.5.0),(3.5.2,)" );
}
- public void testProjectArtifactsCacheReactor() throws Exception
+ public void testRelativePath() throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6330-relative-path" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.setAutoclean( true );
+ verifier.setForkJvm( true );
try
{
- verifier.executeGoals( Arrays.asList( "-f", "parent-project/pom.xml", "package") );
+ verifier.executeGoal( "validate");
fail( "Should fail due to non-resolvable parent" );
}
catch ( VerificationException e )
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfd0cc62/core-it-suite/src/test/resources/mng-6330-relative-path/module-a/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6330-relative-path/module-a/pom.xml b/core-it-suite/src/test/resources/mng-6330-relative-path/module-a/pom.xml
deleted file mode 100644
index 9081b37..0000000
--- a/core-it-suite/src/test/resources/mng-6330-relative-path/module-a/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ 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>
- <artifactId>parent-project</artifactId>
- <groupId>org.apache.maven.its.mng6300</groupId>
- <version>1.0-SNAPSHOT</version>
- <!-- default relativePth is incorrect -->
- </parent>
- <artifactId>module-a</artifactId>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfd0cc62/core-it-suite/src/test/resources/mng-6330-relative-path/parent-project/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6330-relative-path/parent-project/pom.xml b/core-it-suite/src/test/resources/mng-6330-relative-path/parent-project/pom.xml
deleted file mode 100644
index aaca315..0000000
--- a/core-it-suite/src/test/resources/mng-6330-relative-path/parent-project/pom.xml
+++ /dev/null
@@ -1,30 +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.mng6330</groupId>
- <artifactId>parent-project</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <modules>
- <module>../module-a</module>
- </modules>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfd0cc62/core-it-suite/src/test/resources/mng-6330-relative-path/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6330-relative-path/pom.xml b/core-it-suite/src/test/resources/mng-6330-relative-path/pom.xml
new file mode 100644
index 0000000..d4552d9
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6330-relative-path/pom.xml
@@ -0,0 +1,31 @@
+<!--
+ ~ 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.mng6330</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>subproject1</module> <!-- caches parent -->
+ <module>sub/subproject2</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfd0cc62/core-it-suite/src/test/resources/mng-6330-relative-path/sub/subproject2/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6330-relative-path/sub/subproject2/pom.xml b/core-it-suite/src/test/resources/mng-6330-relative-path/sub/subproject2/pom.xml
new file mode 100644
index 0000000..038cb79
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6330-relative-path/sub/subproject2/pom.xml
@@ -0,0 +1,28 @@
+<!--
+ ~ 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.mng6330</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>subproject2</artifactId>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfd0cc62/core-it-suite/src/test/resources/mng-6330-relative-path/subproject1/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-6330-relative-path/subproject1/pom.xml b/core-it-suite/src/test/resources/mng-6330-relative-path/subproject1/pom.xml
new file mode 100644
index 0000000..25a98d8
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-6330-relative-path/subproject1/pom.xml
@@ -0,0 +1,30 @@
+<!--
+ ~ 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.mng6330</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <version>2.0-SNAPSHOT</version>
+</project>