CI friendly maven poms - use $revision for version (#1477)

https://maven.apache.org/maven-ci-friendly.html Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
eclipse-hawkbit · Nov 16, 2023 · 0021b03 · 0021b03
1 parent b982039
commit 0021b03
Show file tree

Hide file tree

Showing 34 changed files with 67 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,6 +57,7 @@ classpath-data.json
 
 # Maven
 maven.properties
+.flattened-pom.xml
 
 # Test Files
 *.tmp

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>docs</artifactId>
    <packaging>pom</packaging>

diff --git a/hawkbit-artifact-repository-filesystem/pom.xml b/hawkbit-artifact-repository-filesystem/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-artifact-repository-filesystem</artifactId>
    <name>hawkBit :: Artifact Repository :: Filesystem</name>

diff --git a/hawkbit-autoconfigure/pom.xml b/hawkbit-autoconfigure/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-autoconfigure</artifactId>
    <name>hawkBit :: Spring Boot Autoconfigure</name>

diff --git a/hawkbit-core/pom.xml b/hawkbit-core/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-core</artifactId>
    <name>hawkBit :: Core</name>

diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-dmf-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-dmf-amqp</artifactId>
    <name>hawkBit :: DMF :: AMQP 0.9 Implementation</name>

diff --git a/hawkbit-dmf/hawkbit-dmf-api/pom.xml b/hawkbit-dmf/hawkbit-dmf-api/pom.xml
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-dmf-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-dmf-api</artifactId>
    <name>hawkBit :: DMF :: API</name>

diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.hawkbit</groupId>
 		<artifactId>hawkbit-dmf-parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 	<artifactId>hawkbit-dmf-rabbitmq-test</artifactId>
 	<name>hawkBit :: DMF :: RabbitMq Test module</name>

diff --git a/hawkbit-dmf/pom.xml b/hawkbit-dmf/pom.xml
@@ -14,8 +14,8 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
-      <version>0.3.0-SNAPSHOT</version>
       <artifactId>hawkbit-parent</artifactId>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-dmf-parent</artifactId>
    <name>hawkBit :: DMF</name>

diff --git a/hawkbit-http-security/pom.xml b/hawkbit-http-security/pom.xml
@@ -13,7 +13,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
       <groupId>org.eclipse.hawkbit</groupId>
    </parent>
    <artifactId>hawkbit-http-security</artifactId>

diff --git a/hawkbit-repository/hawkbit-repository-api/pom.xml b/hawkbit-repository/hawkbit-repository-api/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-repository</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-repository-api</artifactId>
    <name>hawkBit :: Repository :: API</name>

diff --git a/hawkbit-repository/hawkbit-repository-core/pom.xml b/hawkbit-repository/hawkbit-repository-core/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-repository</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-repository-core</artifactId>
    <name>hawkBit :: Repository :: Core Implementation Support</name>

diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
@@ -14,7 +14,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
       <artifactId>hawkbit-repository</artifactId>
    </parent>
    <artifactId>hawkbit-repository-jpa</artifactId>

diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-repository</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-repository-test</artifactId>
    <name>hawkBit :: Repository :: Test Utilities</name>

diff --git a/hawkbit-repository/pom.xml b/hawkbit-repository/pom.xml
@@ -14,8 +14,8 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
-      <version>0.3.0-SNAPSHOT</version>
       <artifactId>hawkbit-parent</artifactId>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-repository</artifactId>
    <name>hawkBit :: Repository</name>

diff --git a/hawkbit-rest/hawkbit-ddi-api/pom.xml b/hawkbit-rest/hawkbit-ddi-api/pom.xml
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-rest-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-ddi-api</artifactId>
    <name>hawkBit :: REST :: DDI API</name>

diff --git a/hawkbit-rest/hawkbit-ddi-resource/pom.xml b/hawkbit-rest/hawkbit-ddi-resource/pom.xml
@@ -16,7 +16,7 @@
   <parent>
      <groupId>org.eclipse.hawkbit</groupId>
      <artifactId>hawkbit-rest-parent</artifactId>
-     <version>0.3.0-SNAPSHOT</version>
+     <version>${revision}</version>
   </parent>
   <artifactId>hawkbit-ddi-resource</artifactId>
   <name>hawkBit :: REST :: DDI Resources</name>

diff --git a/hawkbit-rest/hawkbit-mgmt-api/pom.xml b/hawkbit-rest/hawkbit-mgmt-api/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-rest-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-mgmt-api</artifactId>
    <name>hawkBit :: REST :: Management API</name>

diff --git a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-rest-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-mgmt-resource</artifactId>
    <name>hawkBit :: REST :: Management Resources</name>

diff --git a/hawkbit-rest/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-rest-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-rest-core</artifactId>
    <name>hawkBit :: REST :: Core</name>

diff --git a/hawkbit-rest/pom.xml b/hawkbit-rest/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-rest-parent</artifactId>
    <name>hawkBit :: REST</name>

diff --git a/hawkbit-runtime/hawkbit-update-server/pom.xml b/hawkbit-runtime/hawkbit-update-server/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
         <artifactId>hawkbit-runtime-parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>hawkbit-update-server</artifactId>
     <name>hawkBit :: Runtime :: Update Server</name>

diff --git a/hawkbit-runtime/pom.xml b/hawkbit-runtime/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
 
    <artifactId>hawkbit-runtime-parent</artifactId>

diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-security-core</artifactId>
    <name>hawkBit :: Core Security</name>

diff --git a/hawkbit-security-integration/pom.xml b/hawkbit-security-integration/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-security-integration</artifactId>
    <name>hawkBit :: Security Integration</name>

diff --git a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-starters</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-boot-starter-ddi-api</artifactId>
    <name>hawkBit :: Spring Boot Starter DDI API</name>

diff --git a/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.hawkbit</groupId>
     <artifactId>hawkbit-starters</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <artifactId>hawkbit-boot-starter-dmf-api</artifactId>
   <name>hawkBit :: Spring Boot Starter DMF API</name>

diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.hawkbit</groupId>
     <artifactId>hawkbit-starters</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <artifactId>hawkbit-boot-starter-mgmt-api</artifactId>
   <name>hawkBit :: Spring Boot Starter Management API</name>

diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.hawkbit</groupId>
     <artifactId>hawkbit-starters</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <artifactId>hawkbit-boot-starter-mgmt-ui</artifactId>
   <name>hawkBit :: Spring Boot Starter Management UI</name>

diff --git a/hawkbit-starters/hawkbit-boot-starter/pom.xml b/hawkbit-starters/hawkbit-boot-starter/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-starters</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-boot-starter</artifactId>
    <name>hawkBit :: Spring Boot Starter</name>

diff --git a/hawkbit-starters/pom.xml b/hawkbit-starters/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-starters</artifactId>
    <name>hawkBit :: Spring Boot Starters</name>

diff --git a/hawkbit-test-report/pom.xml b/hawkbit-test-report/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-test-report</artifactId>
    <name>hawkBit :: Test Report</name>

diff --git a/hawkbit-ui/pom.xml b/hawkbit-ui/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-ui</artifactId>
    <name>hawkBit :: Mgmt UI</name>

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
    <groupId>org.eclipse.hawkbit</groupId>
    <artifactId>hawkbit-parent</artifactId>
-   <version>0.3.0-SNAPSHOT</version>
+   <version>${revision}</version>
    <packaging>pom</packaging>
    <name>hawkBit :: Parent</name>
 
@@ -109,8 +109,8 @@
       <developer>
          <id>avgustinmm</id>
          <email>Avgustin.Marinov@bosch.com</email>
-         <organization>Bosch</organization>
-         <organizationUrl>https://www.bosch.io</organizationUrl>
+         <organization>Bosch Digital</organization>
+         <organizationUrl>https://www.bosch-digital.com/</organizationUrl>
          <roles>
             <role>Committer</role>
          </roles>
@@ -138,6 +138,8 @@
    </repositories>
 
    <properties>
+      <revision>0.4.0-SNAPSHOT</revision>
+
       <snapshotDependencyAllowed>true</snapshotDependencyAllowed>
 
       <java.version>17</java.version>
@@ -298,6 +300,30 @@
                </execution>
             </executions>
          </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>flatten-maven-plugin</artifactId>
+            <configuration>
+               <flattenMode>ossrh</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.codehaus.mojo</groupId>
             <artifactId>versions-maven-plugin</artifactId>
@@ -352,6 +378,11 @@
 
       <pluginManagement>
          <plugins>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>flatten-maven-plugin</artifactId>
+               <version>1.5.0</version>
+            </plugin>
             <plugin>
                <groupId>io.fabric8</groupId>
                <artifactId>docker-maven-plugin</artifactId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ classpath-data.json @@
     # Maven
     maven.properties
+    .flattened-pom.xml
     # Test Files
     *.tmp
@@ Expand Down @@