From 1eb1b94d8bd4f69dd697b39de86f8c96566085ba Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Tue, 24 Oct 2023 21:30:27 +0200
Subject: [PATCH] Build improvements - one profile for ITs

We can move configurations of ITs from project profile
to invoker.properties per tested project
---
 pom.xml                                       | 69 +------------------
 src/it/ISSUE-145/submodule1/pom.xml           |  2 +-
 src/it/MLICENSE-4/invoker.properties          |  4 +-
 .../invoker.properties                        |  3 +
 .../invoker.properties                        |  1 +
 5 files changed, 10 insertions(+), 69 deletions(-)

diff --git a/pom.xml b/pom.xml
index fedbf8178..c4994f6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,11 +321,6 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.4.0</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -502,7 +497,8 @@
                 <id>all-integration-test</id>
                 <goals>
                   <goal>install</goal>
-                  <goal>run</goal>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
                 </goals>
                 <configuration>
                   <skipInvocation />
@@ -510,73 +506,12 @@
                     <extraArtifact>${project.groupId}:${project.artifactId}:${project.version}:license.properties:test-third-party</extraArtifact>
                   </extraArtifacts>
                   <pomExcludes>
-                    <pomExclude>MLICENSE-4/pom.xml</pomExclude>
-                    <pomExclude>download-licenses-proxy/pom.xml</pomExclude>
                     <!-- failed test on GH use remote resources -->
                     <pomExclude>download-licenses-basic/pom.xml</pomExclude>
                     <pomExclude>download-licenses-force/pom.xml</pomExclude>
                   </pomExcludes>
                 </configuration>
               </execution>
-              <!-- as this it is run in offline, then execute it after the previous its... -->
-              <execution>
-                <id>integration-test-offline</id>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <pomIncludes>
-                    <pomInclude>MLICENSE-4/pom.xml</pomInclude>
-                  </pomIncludes>
-                  <cloneProjectsTo>${project.build.directory}/it-offline</cloneProjectsTo>
-                </configuration>
-              </execution>
-              <execution>
-                <id>integration-test-proxy</id>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <settingsFile>src/it/settings-proxy.xml</settingsFile>
-                  <pomIncludes>
-                    <pomInclude>download-licenses-proxy/pom.xml</pomInclude>
-                  </pomIncludes>
-                  <cloneProjectsTo>${project.build.directory}/it-proxy</cloneProjectsTo>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>run-one-it</id>
-      <build>
-        <defaultGoal>verify</defaultGoal>
-        <plugins>
-          <plugin>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-            </configuration>
-            <dependencies />
-            <executions>
-              <execution>
-                <id>one-integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <streamLogs>true</streamLogs>
-                  <pomIncludes>
-                    <pomInclude>${itName}/pom.xml</pomInclude>
-                  </pomIncludes>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
         </plugins>
diff --git a/src/it/ISSUE-145/submodule1/pom.xml b/src/it/ISSUE-145/submodule1/pom.xml
index 08fd971ca..fe9ec7c64 100644
--- a/src/it/ISSUE-145/submodule1/pom.xml
+++ b/src/it/ISSUE-145/submodule1/pom.xml
@@ -26,7 +26,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.5.1</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/src/it/MLICENSE-4/invoker.properties b/src/it/MLICENSE-4/invoker.properties
index 7c78e6286..a88668316 100644
--- a/src/it/MLICENSE-4/invoker.properties
+++ b/src/it/MLICENSE-4/invoker.properties
@@ -1 +1,3 @@
-invoker.goals=clean license:download-licenses -o
\ No newline at end of file
+invoker.goals=clean license:download-licenses -o
+# execute as the last one
+invoker.ordinal = -100
diff --git a/src/it/add-third-party-no-encoding/invoker.properties b/src/it/add-third-party-no-encoding/invoker.properties
index a017991af..921ee0baa 100644
--- a/src/it/add-third-party-no-encoding/invoker.properties
+++ b/src/it/add-third-party-no-encoding/invoker.properties
@@ -21,3 +21,6 @@
 ###
 invoker.goals=clean ${project.groupId}:${project.artifactId}:${project.version}:add-third-party
 invoker.failureBehavior=fail-fast
+
+# Maven 4 add default encoding
+invoker.maven.version = !4.0.0+
diff --git a/src/it/download-licenses-proxy/invoker.properties b/src/it/download-licenses-proxy/invoker.properties
index 457dd91ad..aa24f7a7a 100644
--- a/src/it/download-licenses-proxy/invoker.properties
+++ b/src/it/download-licenses-proxy/invoker.properties
@@ -1 +1,2 @@
 invoker.goals = license:download-licenses
+invoker.settingsFile = src/it/settings-proxy.xml