From a021de582916a164a7327dd6d4d5355c579d3f2e Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Wed, 17 Jul 2024 14:30:36 +0300
Subject: [PATCH] Improve base pom structure (#1774)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 .../hawkbit-repository-test/pom.xml           |   6 -
 pom.xml                                       | 310 +++++++++---------
 2 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml
index f3d658e62..8d7a391c3 100644
--- a/hawkbit-repository/hawkbit-repository-test/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-test/pom.xml
@@ -61,12 +61,6 @@
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
       </dependency>
-      <!-- Add a JDBC DB2 compatabile driver if you want to run tests against DB2, e.g. -->
-      <!--       <dependency> -->
-      <!--          <groupId>com.ibm.db2.jcc</groupId> -->
-      <!--          <artifactId>db2jcc4</artifactId> -->
-      <!--          <version>11.1.2.2</version> -->
-      <!--       </dependency> -->
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-logging</artifactId>
diff --git a/pom.xml b/pom.xml
index f6b64ea67..d891d8f54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,16 +71,20 @@
       <!-- Misc libraries versions - END -->
 
       <!-- Maven Plugin versions - START -->
+      <maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
+      <flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
       <maven.scm.plugin.version>2.1.0</maven.scm.plugin.version>
       <maven.site.plugin.version>3.12.1</maven.site.plugin.version>
+
+      <license.tool.plugin.version>1.1.0</license.tool.plugin.version>
+      <license.maven.plugin.version>4.5</license.maven.plugin.version>
+
       <maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
       <maven.failsafe.plugin.version>3.2.5</maven.failsafe.plugin.version>
-      <maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
-
       <jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
-      <license.tool.plugin.version>1.1.0</license.tool.plugin.version>
-      <flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
-      <license.maven.plugin.version>4.5</license.maven.plugin.version>
+
+      <nexus.staging.maven.plugin.version>1.6.14</nexus.staging.maven.plugin.version>
+      <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
       <!-- Maven Plugin versions - END -->
 
       <!-- Release - START -->
@@ -235,141 +239,53 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-               <compilerArgument>-Xlint:all</compilerArgument>
-               <showWarnings>true</showWarnings>
-               <showDeprecation>true</showDeprecation>
-            </configuration>
          </plugin>
          <plugin>
-            <groupId>com.mycila</groupId>
-            <artifactId>license-maven-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
          </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
-            <version>${maven.enforcer.plugin.version}</version>
-            <executions>
-               <execution>
-                  <!-- Make sure that only non-snapshot versions are used
-                     for the dependencies. Only active when property 'snapshotDependencyAllowed'
-                     is false. -->
-                  <id>enforce-no-snapshots</id>
-                  <goals>
-                     <goal>enforce</goal>
-                  </goals>
-                  <configuration>
-                     <skip>${snapshotDependencyAllowed}</skip>
-                     <rules>
-                        <requireReleaseDeps>
-                           <message>No Snapshots Allowed!</message>
-                        </requireReleaseDeps>
-                        <requireReleaseVersion>
-                           <message>No Snapshots Allowed!</message>
-                        </requireReleaseVersion>
-                        <requireMavenVersion>
-                           <version>3.5</version>
-                        </requireMavenVersion>
-                     </rules>
-                  </configuration>
-               </execution>
-            </executions>
          </plugin>
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>flatten-maven-plugin</artifactId>
-            <configuration>
-               <flattenMode>resolveCiFriendliesOnly</flattenMode>
-               <updatePomFile>true</updatePomFile>
-            </configuration>
-            <executions>
-               <execution>
-                  <id>flatten</id>
-                  <phase>process-resources</phase>
-                  <goals>
-                     <goal>flatten</goal>
-                  </goals>
-               </execution>
-               <execution>
-                  <id>flatten.clean</id>
-                  <phase>clean</phase>
-                  <goals>
-                     <goal>clean</goal>
-                  </goals>
-               </execution>
-            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-plugin</artifactId>
          </plugin>
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>versions-maven-plugin</artifactId>
          </plugin>
+
          <plugin>
-            <artifactId>maven-scm-plugin</artifactId>
-            <version>${maven.scm.plugin.version}</version>
-            <configuration>
-               <tag>${project.version}</tag>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>${jacoco.maven.plugin.version}</version>
-            <executions>
-               <execution>
-                  <id>prepare-ut-agent</id>
-                  <phase>process-test-classes</phase>
-                  <goals>
-                     <goal>prepare-agent</goal>
-                  </goals>
-                  <configuration>
-                     <propertyName>jacoco.agent.ut.arg</propertyName>
-                  </configuration>
-               </execution>
-               <execution>
-                  <id>prepare-it-agent</id>
-                  <phase>pre-integration-test</phase>
-                  <goals>
-                     <goal>prepare-agent-integration</goal>
-                  </goals>
-                  <configuration>
-                     <propertyName>jacoco.agent.it.arg</propertyName>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>attach-sources</id>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
+            <groupId>com.mycila</groupId>
+            <artifactId>license-maven-plugin</artifactId>
          </plugin>
          <plugin>
             <groupId>org.eclipse.dash</groupId>
             <artifactId>license-tool-plugin</artifactId>
-            <version>${license.tool.plugin.version}</version>
-            <executions>
-               <execution>
-                  <id>license-check</id>
-                  <goals>
-                     <goal>license-check</goal>
-                  </goals>
-               </execution>
-            </executions>
+         </plugin>
+
+         <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
          </plugin>
       </plugins>
 
       <pluginManagement>
          <plugins>
             <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>flatten-maven-plugin</artifactId>
-               <version>${flatten.maven.plugin.version}</version>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-compiler-plugin</artifactId>
+               <configuration>
+                  <compilerArgument>-Xlint:all</compilerArgument>
+                  <showWarnings>true</showWarnings>
+                  <showDeprecation>true</showDeprecation>
+               </configuration>
             </plugin>
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -378,6 +294,91 @@
                   <doclint>syntax</doclint>
                </configuration>
             </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-source-plugin</artifactId>
+               <executions>
+                  <execution>
+                     <id>attach-sources</id>
+                     <goals>
+                        <goal>jar</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
+
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-enforcer-plugin</artifactId>
+               <version>${maven.enforcer.plugin.version}</version>
+               <executions>
+                  <execution>
+                     <!-- Make sure that only non-snapshot versions are used
+                        for the dependencies. Only active when property 'snapshotDependencyAllowed'
+                        is false. -->
+                     <id>enforce-no-snapshots</id>
+                     <goals>
+                        <goal>enforce</goal>
+                     </goals>
+                     <configuration>
+                        <skip>${snapshotDependencyAllowed}</skip>
+                        <rules>
+                           <requireReleaseDeps>
+                              <message>No Snapshots Allowed!</message>
+                           </requireReleaseDeps>
+                           <requireReleaseVersion>
+                              <message>No Snapshots Allowed!</message>
+                           </requireReleaseVersion>
+                           <requireMavenVersion>
+                              <version>3.9</version>
+                           </requireMavenVersion>
+                        </rules>
+                     </configuration>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>flatten-maven-plugin</artifactId>
+               <version>${flatten.maven.plugin.version}</version>
+               <configuration>
+                  <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                  <updatePomFile>true</updatePomFile>
+               </configuration>
+               <executions>
+                  <execution>
+                     <id>flatten</id>
+                     <phase>process-resources</phase>
+                     <goals>
+                        <goal>flatten</goal>
+                     </goals>
+                  </execution>
+                  <execution>
+                     <id>flatten.clean</id>
+                     <phase>clean</phase>
+                     <goals>
+                        <goal>clean</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-scm-plugin</artifactId>
+               <version>${maven.scm.plugin.version}</version>
+               <configuration>
+                  <tag>${project.version}</tag>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-site-plugin</artifactId>
+               <version>${maven.site.plugin.version}</version>
+               <configuration>
+                  <skip>true</skip>
+                  <skipDeploy>true</skipDeploy>
+               </configuration>
+            </plugin>
 
             <plugin>
                <groupId>com.mycila</groupId>
@@ -437,29 +438,19 @@
                </configuration>
             </plugin>
             <plugin>
-               <groupId>org.eclipse.m2e</groupId>
-               <artifactId>lifecycle-mapping</artifactId>
-               <version>1.0.0</version>
-               <configuration>
-                  <lifecycleMappingMetadata>
-                     <pluginExecutions>
-                        <pluginExecution>
-                           <pluginExecutionFilter>
-                              <groupId>org.apache.maven.plugins</groupId>
-                              <artifactId>maven-dependency-plugin</artifactId>
-                              <versionRange>[2.8,)</versionRange>
-                              <goals>
-                                 <goal>copy-dependencies</goal>
-                              </goals>
-                           </pluginExecutionFilter>
-                           <action>
-                              <ignore />
-                           </action>
-                        </pluginExecution>
-                     </pluginExecutions>
-                  </lifecycleMappingMetadata>
-               </configuration>
+               <groupId>org.eclipse.dash</groupId>
+               <artifactId>license-tool-plugin</artifactId>
+               <version>${license.tool.plugin.version}</version>
+               <executions>
+                  <execution>
+                     <id>license-check</id>
+                     <goals>
+                        <goal>license-check</goal>
+                     </goals>
+                  </execution>
+               </executions>
             </plugin>
+
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
@@ -517,25 +508,39 @@
                   </execution>
                </executions>
             </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-site-plugin</artifactId>
-               <version>${maven.site.plugin.version}</version>
-               <configuration>
-                  <skip>true</skip>
-                  <skipDeploy>true</skipDeploy>
-               </configuration>
-            </plugin>
             <plugin>
                <groupId>org.jacoco</groupId>
                <artifactId>jacoco-maven-plugin</artifactId>
                <version>${jacoco.maven.plugin.version}</version>
+               <executions>
+                  <execution>
+                     <id>prepare-ut-agent</id>
+                     <phase>process-test-classes</phase>
+                     <goals>
+                        <goal>prepare-agent</goal>
+                     </goals>
+                     <configuration>
+                        <propertyName>jacoco.agent.ut.arg</propertyName>
+                     </configuration>
+                  </execution>
+                  <execution>
+                     <id>prepare-it-agent</id>
+                     <phase>pre-integration-test</phase>
+                     <goals>
+                        <goal>prepare-agent-integration</goal>
+                     </goals>
+                     <configuration>
+                        <propertyName>jacoco.agent.it.arg</propertyName>
+                     </configuration>
+                  </execution>
+               </executions>
             </plugin>
-            <plugin>
-               <groupId>org.bsc.maven</groupId>
-               <artifactId>maven-processor-plugin</artifactId>
-               <version>${maven.processor.plugin.version}</version>
-            </plugin>
+
+<!--            <plugin>-->
+<!--               <groupId>org.bsc.maven</groupId>-->
+<!--               <artifactId>maven-processor-plugin</artifactId>-->
+<!--               <version>${maven.processor.plugin.version}</version>-->
+<!--            </plugin>-->
             <plugin>
                <groupId>com.ethlo.persistence.tools</groupId>
                <artifactId>eclipselink-maven-plugin</artifactId>
@@ -544,6 +549,7 @@
          </plugins>
       </pluginManagement>
    </build>
+
    <profiles>
       <profile>
          <id>nexus_staging</id>
@@ -566,7 +572,7 @@
                      individually as part of building the module. -->
                   <groupId>org.sonatype.plugins</groupId>
                   <artifactId>nexus-staging-maven-plugin</artifactId>
-                  <version>1.6.13</version>
+                  <version>${nexus.staging.maven.plugin.version}</version>
                   <extensions>true</extensions>
                   <configuration>
                      <serverId>ossrh</serverId>
@@ -591,7 +597,7 @@
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-gpg-plugin</artifactId>
-                  <version>1.6</version>
+                  <version>${maven.gpg.plugin.version}</version>
                   <executions>
                      <execution>
                         <id>sign-artifacts</id>