Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI friendly maven poms - use ${revision} for version #1477

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff 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
2 changes: 1 addition & 1 deletion docs/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-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>docs</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-artifact-repository-filesystem/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-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-artifact-repository-filesystem</artifactId>
<name>hawkBit :: Artifact Repository :: Filesystem</name>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-autoconfigure/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-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-autoconfigure</artifactId>
<name>hawkBit :: Spring Boot Autoconfigure</name>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-dmf/hawkbit-dmf-amqp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-dmf/hawkbit-dmf-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-dmf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-http-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-repository/hawkbit-repository-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-repository/hawkbit-repository-core/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-repository</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-repository-core</artifactId>
<name>hawkBit :: Repository :: Core Implementation Support</name>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-repository/hawkbit-repository-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-repository/hawkbit-repository-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-rest/hawkbit-ddi-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-rest/hawkbit-ddi-resource/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-rest/hawkbit-mgmt-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-rest/hawkbit-mgmt-resource/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-rest/hawkbit-rest-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-runtime/hawkbit-update-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-security-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-security-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-starters/hawkbit-boot-starter-dmf-api/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-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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-starters/hawkbit-boot-starter-mgmt-api/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-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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-starters/hawkbit-boot-starter-mgmt-ui/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-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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-starters/hawkbit-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-starters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-test-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hawkbit-ui/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-parent</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<artifactId>hawkbit-ui</artifactId>
<name>hawkBit :: Mgmt UI</name>
Expand Down
37 changes: 34 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -109,8 +109,8 @@
<developer>
<id>avgustinmm</id>
<email>[email protected]</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>
Expand Down Expand Up @@ -138,6 +138,8 @@
</repositories>

<properties>
<revision>0.4.0-SNAPSHOT</revision>

<snapshotDependencyAllowed>true</snapshotDependencyAllowed>

<java.version>17</java.version>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down