[MNG-8293] [MNG-8288] Two new ITs and disable MNG-2196 IT (#382)

* Two new ITs for MNG-8288 and MNG-8293 Both problems happens during reactor load up, so ITs code is simple, just invoke "mvn validate" while the actual trick is in resources (projects). * Fix javadoc * Disable MNG-2196 IT as it can infer the parent --------- Co-authored-by: Tamas Cservenak <[email protected]>
apache · Oct 7, 2024 · 284b30f · 284b30f
1 parent ab36bd3
commit 284b30f
Show file tree

Hide file tree

Showing 12 changed files with 313 additions and 1 deletion.
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
@@ -31,7 +31,7 @@
 public class MavenITmng2196ParentResolutionTest extends AbstractMavenIntegrationTestCase {
 
     public MavenITmng2196ParentResolutionTest() {
-        super(ALL_MAVEN_VERSIONS);
+        super("[2.0,4.0.0-beta-5)");
     }
 
     /**

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8288NoRootPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8288NoRootPomTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+package org.apache.maven.it;
+
+import java.io.File;
+
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
+/**
+ * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-8288">MNG-8288</a>.
+ */
+class MavenITmng8288NoRootPomTest extends AbstractMavenIntegrationTestCase {
+
+    MavenITmng8288NoRootPomTest() {
+        super("[3.6.3,)");
+    }
+
+    /**
+     *  Verify that project without root POM can be loaded up
+     */
+    @Test
+    void testitNoRootPomCanBeLoaded() throws Exception {
+        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8288-no-root-pom");
+
+        Verifier verifier = newVerifier(testDir.getAbsolutePath());
+        verifier.addCliArgument("-f");
+        verifier.addCliArgument("project");
+        verifier.addCliArgument("validate");
+        verifier.execute();
+        verifier.verifyErrorFreeLog();
+    }
+}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8293BomImportFromReactor.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8293BomImportFromReactor.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package org.apache.maven.it;
+
+import java.io.File;
+
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
+/**
+ * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-8293">MNG-8293</a>.
+ */
+class MavenITmng8293BomImportFromReactor extends AbstractMavenIntegrationTestCase {
+
+    MavenITmng8293BomImportFromReactor() {
+        super("[3.6.3,)");
+    }
+
+    /**
+     *  Verify that project doing BOM import of BOM from reactor can be loaded up
+     */
+    @Test
+    void testitNoRootPomCanBeLoaded() throws Exception {
+        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8293-bom-import-from-reactor");
+
+        Verifier verifier = newVerifier(testDir.getAbsolutePath());
+        verifier.addCliArgument("validate");
+        verifier.execute();
+        verifier.verifyErrorFreeLog();
+    }
+}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
@@ -120,6 +120,8 @@ public TestSuiteOrdering() {
          * the tests are to finishing. Newer tests are also more likely to fail, so this is
          * a fail fast technique as well.
          */
+        suite.addTestSuite(MavenITmng8293BomImportFromReactor.class);
+        suite.addTestSuite(MavenITmng8288NoRootPomTest.class);
         suite.addTestSuite(MavenITmng8133RootDirectoryInParentTest.class);
         suite.addTestSuite(MavenITmng8230CIFriendlyTest.class);
         suite.addTestSuite(MavenITmng7255InferredGroupIdTest.class);

diff --git a/core-it-suite/src/test/resources/mng-8288-no-root-pom/.mvn/maven.conf b/core-it-suite/src/test/resources/mng-8288-no-root-pom/.mvn/maven.conf
@@ -0,0 +1 @@
+-e
diff --git a/core-it-suite/src/test/resources/mng-8288-no-root-pom/project/child/pom.xml b/core-it-suite/src/test/resources/mng-8288-no-root-pom/project/child/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>myGroup</groupId>
+    <artifactId>parent</artifactId>
+    <version>1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8288-no-root-pom/project/pom.xml b/core-it-suite/src/test/resources/mng-8288-no-root-pom/project/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>myGroup</groupId>
+  <artifactId>parent</artifactId>
+  <version>1</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <ci-version>1.0-SNAPSHOT</ci-version>
+  </properties>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/.mvn/maven.conf b/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/.mvn/maven.conf
@@ -0,0 +1 @@
+-e
diff --git a/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/bom/pom.xml b/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/bom/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2019 the original author or authors.
+
+    Licensed 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>
+  <parent>
+    <groupId>org.mvndaemon.mvnd.test.new-managed-module</groupId>
+    <artifactId>new-managed-module-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>new-managed-module-bom</artifactId>
+  <packaging>pom</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.mvndaemon.mvnd.test.new-managed-module</groupId>
+        <artifactId>new-managed-module-module</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/module/pom.xml b/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/module/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2019 the original author or authors.
+
+    Licensed 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>
+  <parent>
+    <groupId>org.mvndaemon.mvnd.test.new-managed-module</groupId>
+    <artifactId>new-managed-module-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>new-managed-module-module</artifactId>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.mvndaemon.mvnd.test.new-managed-module</groupId>
+        <artifactId>new-managed-module-bom</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>
diff --git a/...om-reactor/module/src/main/java/org/mvndaemon/mvnd/test/upgrades/bom/module/UseHello.java b/...om-reactor/module/src/main/java/org/mvndaemon/mvnd/test/upgrades/bom/module/UseHello.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+package org.mvndaemon.mvnd.test.upgrades.bom.module;
+
+public class UseHello {
+
+    public void use() {
+        System.out.println("Hello");
+    }
+}
diff --git a/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/pom.xml b/core-it-suite/src/test/resources/mng-8293-bom-import-from-reactor/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2019 the original author or authors.
+
+    Licensed 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.mvndaemon.mvnd.test.new-managed-module</groupId>
+  <artifactId>new-managed-module-parent</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>bom</module>
+    <module>module</module>
+  </modules>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+
+    <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
+    <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+    <maven-install-plugin.version>3.1.0</maven-install-plugin.version>
+    <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
+    <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>${maven-clean-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${maven-compiler-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>${maven-install-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${maven-resources-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${maven-surefire-plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>