Cleanups ITs

- use project.version instead of pom.version - remove very old parent from ITs - invoker.buildResult = success is default - execute its only if profile is provided
mojohaus · May 12, 2024 · 50a1ea5 · 50a1ea5
1 parent 8832d0b
commit 50a1ea5
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 71 deletions.
diff --git a/pom.xml b/pom.xml
@@ -134,12 +134,6 @@
   <profiles>
     <profile>
       <id>run-its</id>
-      <activation>
-        <property>
-          <name>skipTests</name>
-          <value>!true</value>
-        </property>
-      </activation>
       <build>
         <plugins>
           <plugin>

diff --git a/src/it/check-fails/pom.xml b/src/it/check-fails/pom.xml
@@ -3,11 +3,6 @@
 
   <artifactId>pom-check-fails</artifactId>
   <groupId>org.codehaus.mojo.tidy.its</groupId>
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
   <version>1.0-SNAPSHOT</version>
 
@@ -18,7 +13,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tidy-maven-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <executions>
           <execution>
             <id>validate</id>

diff --git a/src/it/check-separate-fails/pom.xml b/src/it/check-separate-fails/pom.xml
@@ -2,12 +2,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
-
   <groupId>org.codehaus.mojo.tidy.its</groupId>
   <artifactId>pom-check-separate-fails</artifactId>
   <version>1.0-SNAPSHOT</version>
@@ -19,7 +13,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tidy-maven-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <executions>
           <execution>
             <id>validate</id>

diff --git a/src/it/check-separate-succeeds/invoker.properties b/src/it/check-separate-succeeds/invoker.properties
@@ -1,2 +1 @@
 invoker.goals = verify
-invoker.buildResult = success 
diff --git a/src/it/check-separate-succeeds/pom.xml b/src/it/check-separate-succeeds/pom.xml
@@ -3,11 +3,6 @@
 
   <artifactId>pom-check-fails</artifactId>
   <groupId>org.codehaus.mojo.tidy.its</groupId>
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
   <version>1.0-SNAPSHOT</version>
 
@@ -18,7 +13,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tidy-maven-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <executions>
           <execution>
             <id>validate</id>

diff --git a/src/it/check-separate-succeeds/valid-pom.xml b/src/it/check-separate-succeeds/valid-pom.xml
@@ -2,12 +2,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
-
   <groupId>org.codehaus.mojo.tidy.its</groupId>
   <artifactId>pom-check-succeeds</artifactId>
   <version>1.0-SNAPSHOT</version>

diff --git a/src/it/check-succeeds/invoker.properties b/src/it/check-succeeds/invoker.properties
@@ -1,2 +1 @@
 invoker.goals = verify
-invoker.buildResult = success 
diff --git a/src/it/check-succeeds/pom.xml b/src/it/check-succeeds/pom.xml
@@ -2,12 +2,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
-
   <groupId>org.codehaus.mojo.tidy.its</groupId>
   <artifactId>pom-check-succeeds</artifactId>
   <version>1.0-SNAPSHOT</version>
@@ -19,7 +13,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tidy-maven-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <executions>
           <execution>
             <id>validate</id>

diff --git a/src/it/pom/invoker.properties b/src/it/pom/invoker.properties
@@ -1,2 +1 @@
 invoker.goals = org.codehaus.mojo:tidy-maven-plugin:${project.version}:pom 
-invoker.buildResult = success 
diff --git a/src/it/pom/pom-expected.xml b/src/it/pom/pom-expected.xml
@@ -2,12 +2,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
-
   <groupId>org.codehaus.mojo.tidy.its</groupId>
   <artifactId>pom-space-indent</artifactId>
   <version>1.0-SNAPSHOT</version>

diff --git a/src/it/pom/pom.xml b/src/it/pom/pom.xml
@@ -5,11 +5,6 @@
 
   <artifactId>pom-space-indent</artifactId>
   <groupId>org.codehaus.mojo.tidy.its</groupId>
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
   <version>1.0-SNAPSHOT</version>
   <description>Test of tidy:pom on a pom with all elements.</description>

diff --git a/src/it/separate-pom/invoker.properties b/src/it/separate-pom/invoker.properties
@@ -1,2 +1 @@
 invoker.goals = org.codehaus.mojo:tidy-maven-plugin:${project.version}:pom -Dtidy.pomFile=separate-pom.xml
-invoker.buildResult = success 
diff --git a/src/it/separate-pom/pom.xml b/src/it/separate-pom/pom.xml
@@ -5,11 +5,6 @@
 
   <artifactId>pom-space-indent</artifactId>
   <groupId>org.codehaus.mojo.tidy.its</groupId>
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
   <version>1.0-SNAPSHOT</version>
   <description>Test of tidy:pom on a separate pom with all elements.</description>

diff --git a/src/it/separate-pom/separate-pom-expected.xml b/src/it/separate-pom/separate-pom-expected.xml
@@ -2,12 +2,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
-
   <groupId>org.codehaus.mojo.tidy.its</groupId>
   <artifactId>pom-space-indent</artifactId>
   <version>1.0-SNAPSHOT</version>

diff --git a/src/it/separate-pom/separate-pom.xml b/src/it/separate-pom/separate-pom.xml
@@ -5,11 +5,6 @@
 
   <artifactId>pom-space-indent</artifactId>
   <groupId>org.codehaus.mojo.tidy.its</groupId>
-  <parent>
-    <groupId>org.codehaus</groupId>
-    <artifactId>codehaus-parent</artifactId>
-    <version>4</version>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
   <version>1.0-SNAPSHOT</version>
   <description>Test of tidy:pom on a separate pom with all elements.</description>

diff --git a/src/test/java/org/codehaus/mojo/tidy/task/PomTidyFixesTest.java b/src/test/java/org/codehaus/mojo/tidy/task/PomTidyFixesTest.java
@@ -27,7 +27,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class PomTidyFixesTest {
+class PomTidyFixesTest {
 
     protected static final String PATH = "fixes/order-and-indent-start-element-of-scope/";
 

diff --git a/src/test/java/org/codehaus/mojo/tidy/task/PomTidyTest.java b/src/test/java/org/codehaus/mojo/tidy/task/PomTidyTest.java
@@ -30,7 +30,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class PomTidyTest {
+class PomTidyTest {
 
     @ParameterizedTest(name = "{0}")
     @ValueSource(
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		invoker.goals = verify
		invoker.buildResult = success
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		invoker.goals = org.codehaus.mojo:tidy-maven-plugin:${project.version}:pom
		invoker.buildResult = success