Merge pull request #77 from bosch-io/feature/ci_friendly_build

CI friendly build - revision
eclipse-hawkbit · Nov 17, 2023 · 7b38d75 · 7b38d75
2 parents ac1965f + 52bc5ec
commit 7b38d75
Show file tree

Hide file tree

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

diff --git a/hawkbit-custom-theme-example/pom.xml b/hawkbit-custom-theme-example/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.eclipse.hawkbit</groupId>
       <artifactId>hawkbit-examples-parent</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${revision}</version>
    </parent>
    <artifactId>hawkbit-custom-theme-example</artifactId>
    <name>hawkBit :: Examples :: Custom Theme Example App</name>

diff --git a/hawkbit-device-simulator/pom.xml b/hawkbit-device-simulator/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-examples-parent</artifactId>
    </parent>
 

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

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

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

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

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
    </parent>
 
    <artifactId>hawkbit-examples-parent</artifactId>
-   <version>0.3.0-SNAPSHOT</version>
+   <version>${revision}</version>
    <name>hawkBit :: Examples</name>
    <packaging>pom</packaging>
 
@@ -46,6 +46,7 @@
    </modules>
 
    <properties>
+      <revision>0.4.0-SNAPSHOT</revision>
       <hawkbit.version>0.3.0</hawkbit.version>
 
       <!-- Release - START -->
@@ -117,6 +118,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>
@@ -171,6 +196,16 @@
             </executions>
          </plugin>
       </plugins>
+
+      <pluginManagement>
+         <plugins>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>flatten-maven-plugin</artifactId>
+               <version>1.5.0</version>
+            </plugin>
+         </plugins>
+      </pluginManagement>
    </build>
 
    <dependencyManagement>
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ classpath-data.json @@
     # Maven
     maven.properties
+    .flattened-pom.xml
     # Test Files
     *.tmp
@@ Expand Down @@