Skip to content

Commit

Permalink
Merge pull request #97 from bosch-io/feature/ci_friendly_build
Browse files Browse the repository at this point in the history
CI friendly builds (use ${revision})
  • Loading branch information
avgustinmm authored Nov 17, 2023
2 parents dbd0d99 + a2d0052 commit b3240c5
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff 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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-extended-runtimes</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-update-server-azure</artifactId>
<name>hawkBit :: Extensions :: Azure enabled Update Server</name>
Expand Down
4 changes: 2 additions & 2 deletions hawkbit-extended-runtimes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-extensions-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>

<artifactId>hawkbit-extended-runtimes</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-extension-artifact-repository-gcs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-extensions-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-extension-artifact-repository-gcs</artifactId>
<name>hawkBit :: Extensions :: GCS Repository</name>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-extension-artifact-repository-mongo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
<artifactId>hawkbit-extensions-parent</artifactId>
</parent>
<artifactId>hawkbit-extension-artifact-repository-mongo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-extension-artifact-repository-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-extensions-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-extension-artifact-repository-s3</artifactId>
<name>hawkBit :: Extensions :: S3 Repository</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-extensions-azure</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-extension-artifact-repository-azure</artifactId>
<name>hawkBit :: Extensions :: Azure Block Storage Repository</name>
Expand Down
4 changes: 2 additions & 2 deletions hawkbit-extensions-azure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-extensions-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>hawkbit-extensions-azure</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>

<name>hawkBit :: Extensions :: Azure</name>
Expand Down
37 changes: 36 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</parent>

<artifactId>hawkbit-extensions-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>

<name>hawkBit :: Extensions</name>
Expand All @@ -40,6 +40,7 @@
</distributionManagement>

<properties>
<revision>0.4.0-SNAPSHOT</revision>
<hawkbit.version>0.3.0</hawkbit.version>
<aws.sdk.version>1.12.513</aws.sdk.version>
<gcp.sdk.version>0.200.0</gcp.sdk.version>
Expand Down Expand Up @@ -151,6 +152,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>
Expand Down Expand Up @@ -203,6 +228,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>
Expand Down

0 comments on commit b3240c5

Please sign in to comment.