From 0021b03c9ac2a3cf73f2ba83e72d524d1917ab23 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Thu, 16 Nov 2023 17:23:01 +0200 Subject: [PATCH] CI friendly maven poms - use $revision for version (#1477) https://maven.apache.org/maven-ci-friendly.html Signed-off-by: Marinov Avgustin --- .gitignore | 1 + docs/pom.xml | 2 +- .../pom.xml | 2 +- hawkbit-autoconfigure/pom.xml | 2 +- hawkbit-core/pom.xml | 2 +- hawkbit-dmf/hawkbit-dmf-amqp/pom.xml | 2 +- hawkbit-dmf/hawkbit-dmf-api/pom.xml | 2 +- hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml | 2 +- hawkbit-dmf/pom.xml | 2 +- hawkbit-http-security/pom.xml | 2 +- .../hawkbit-repository-api/pom.xml | 2 +- .../hawkbit-repository-core/pom.xml | 2 +- .../hawkbit-repository-jpa/pom.xml | 2 +- .../hawkbit-repository-test/pom.xml | 2 +- hawkbit-repository/pom.xml | 2 +- hawkbit-rest/hawkbit-ddi-api/pom.xml | 2 +- hawkbit-rest/hawkbit-ddi-resource/pom.xml | 2 +- hawkbit-rest/hawkbit-mgmt-api/pom.xml | 2 +- hawkbit-rest/hawkbit-mgmt-resource/pom.xml | 2 +- hawkbit-rest/hawkbit-rest-core/pom.xml | 2 +- hawkbit-rest/pom.xml | 2 +- hawkbit-runtime/hawkbit-update-server/pom.xml | 2 +- hawkbit-runtime/pom.xml | 2 +- hawkbit-security-core/pom.xml | 2 +- hawkbit-security-integration/pom.xml | 2 +- .../hawkbit-boot-starter-ddi-api/pom.xml | 2 +- .../hawkbit-boot-starter-dmf-api/pom.xml | 2 +- .../hawkbit-boot-starter-mgmt-api/pom.xml | 2 +- .../hawkbit-boot-starter-mgmt-ui/pom.xml | 2 +- hawkbit-starters/hawkbit-boot-starter/pom.xml | 2 +- hawkbit-starters/pom.xml | 2 +- hawkbit-test-report/pom.xml | 2 +- hawkbit-ui/pom.xml | 2 +- pom.xml | 37 +++++++++++++++++-- 34 files changed, 67 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index c66e897c5..588172178 100644 --- 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 index a4f17816d..94c864be9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} docs pom diff --git a/hawkbit-artifact-repository-filesystem/pom.xml b/hawkbit-artifact-repository-filesystem/pom.xml index 19385b2ab..5106e16bd 100644 --- a/hawkbit-artifact-repository-filesystem/pom.xml +++ b/hawkbit-artifact-repository-filesystem/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-artifact-repository-filesystem hawkBit :: Artifact Repository :: Filesystem diff --git a/hawkbit-autoconfigure/pom.xml b/hawkbit-autoconfigure/pom.xml index 2d82adfe6..5a0b4af6e 100644 --- a/hawkbit-autoconfigure/pom.xml +++ b/hawkbit-autoconfigure/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-autoconfigure hawkBit :: Spring Boot Autoconfigure diff --git a/hawkbit-core/pom.xml b/hawkbit-core/pom.xml index 47aa05e86..5a23e414c 100644 --- a/hawkbit-core/pom.xml +++ b/hawkbit-core/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-core hawkBit :: Core diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml index 2127ed3d8..d520ef4ff 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml @@ -16,7 +16,7 @@ org.eclipse.hawkbit hawkbit-dmf-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-dmf-amqp hawkBit :: DMF :: AMQP 0.9 Implementation diff --git a/hawkbit-dmf/hawkbit-dmf-api/pom.xml b/hawkbit-dmf/hawkbit-dmf-api/pom.xml index b749205e4..5b8266f4b 100644 --- a/hawkbit-dmf/hawkbit-dmf-api/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-api/pom.xml @@ -16,7 +16,7 @@ org.eclipse.hawkbit hawkbit-dmf-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-dmf-api hawkBit :: DMF :: API diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml index 4b13b1879..114f5506d 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.hawkbit hawkbit-dmf-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-dmf-rabbitmq-test hawkBit :: DMF :: RabbitMq Test module diff --git a/hawkbit-dmf/pom.xml b/hawkbit-dmf/pom.xml index 6461c1935..f6a6fa27b 100644 --- a/hawkbit-dmf/pom.xml +++ b/hawkbit-dmf/pom.xml @@ -14,8 +14,8 @@ 4.0.0 org.eclipse.hawkbit - 0.3.0-SNAPSHOT hawkbit-parent + ${revision} hawkbit-dmf-parent hawkBit :: DMF diff --git a/hawkbit-http-security/pom.xml b/hawkbit-http-security/pom.xml index df8f01bb6..a9c0da13b 100644 --- a/hawkbit-http-security/pom.xml +++ b/hawkbit-http-security/pom.xml @@ -13,7 +13,7 @@ 4.0.0 hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} org.eclipse.hawkbit hawkbit-http-security diff --git a/hawkbit-repository/hawkbit-repository-api/pom.xml b/hawkbit-repository/hawkbit-repository-api/pom.xml index 24c27ddce..a2fca5973 100644 --- a/hawkbit-repository/hawkbit-repository-api/pom.xml +++ b/hawkbit-repository/hawkbit-repository-api/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-repository - 0.3.0-SNAPSHOT + ${revision} hawkbit-repository-api hawkBit :: Repository :: API diff --git a/hawkbit-repository/hawkbit-repository-core/pom.xml b/hawkbit-repository/hawkbit-repository-core/pom.xml index 3ef2996ff..8a7eb0ea7 100644 --- a/hawkbit-repository/hawkbit-repository-core/pom.xml +++ b/hawkbit-repository/hawkbit-repository-core/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-repository - 0.3.0-SNAPSHOT + ${revision} hawkbit-repository-core hawkBit :: Repository :: Core Implementation Support diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml index c9f76ce4c..f65eda196 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml +++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.hawkbit - 0.3.0-SNAPSHOT + ${revision} hawkbit-repository hawkbit-repository-jpa diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml index 62b47718b..64989fc87 100644 --- a/hawkbit-repository/hawkbit-repository-test/pom.xml +++ b/hawkbit-repository/hawkbit-repository-test/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-repository - 0.3.0-SNAPSHOT + ${revision} hawkbit-repository-test hawkBit :: Repository :: Test Utilities diff --git a/hawkbit-repository/pom.xml b/hawkbit-repository/pom.xml index ccdd282f6..ade71f6dc 100644 --- a/hawkbit-repository/pom.xml +++ b/hawkbit-repository/pom.xml @@ -14,8 +14,8 @@ 4.0.0 org.eclipse.hawkbit - 0.3.0-SNAPSHOT hawkbit-parent + ${revision} hawkbit-repository hawkBit :: Repository diff --git a/hawkbit-rest/hawkbit-ddi-api/pom.xml b/hawkbit-rest/hawkbit-ddi-api/pom.xml index 06d4c67e4..18aceed5e 100644 --- a/hawkbit-rest/hawkbit-ddi-api/pom.xml +++ b/hawkbit-rest/hawkbit-ddi-api/pom.xml @@ -16,7 +16,7 @@ org.eclipse.hawkbit hawkbit-rest-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-ddi-api hawkBit :: REST :: DDI API diff --git a/hawkbit-rest/hawkbit-ddi-resource/pom.xml b/hawkbit-rest/hawkbit-ddi-resource/pom.xml index 0a5eb4e59..8cea9224f 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/pom.xml +++ b/hawkbit-rest/hawkbit-ddi-resource/pom.xml @@ -16,7 +16,7 @@ org.eclipse.hawkbit hawkbit-rest-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-ddi-resource hawkBit :: REST :: DDI Resources diff --git a/hawkbit-rest/hawkbit-mgmt-api/pom.xml b/hawkbit-rest/hawkbit-mgmt-api/pom.xml index 9b9f74639..daa873984 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/pom.xml +++ b/hawkbit-rest/hawkbit-mgmt-api/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-rest-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-mgmt-api hawkBit :: REST :: Management API diff --git a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml index 841be974a..4d9c6e416 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml +++ b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml @@ -16,7 +16,7 @@ org.eclipse.hawkbit hawkbit-rest-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-mgmt-resource hawkBit :: REST :: Management Resources diff --git a/hawkbit-rest/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml index 55add8216..db5db7bad 100644 --- a/hawkbit-rest/hawkbit-rest-core/pom.xml +++ b/hawkbit-rest/hawkbit-rest-core/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-rest-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-rest-core hawkBit :: REST :: Core diff --git a/hawkbit-rest/pom.xml b/hawkbit-rest/pom.xml index adf143196..fd6e24561 100644 --- a/hawkbit-rest/pom.xml +++ b/hawkbit-rest/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-rest-parent hawkBit :: REST diff --git a/hawkbit-runtime/hawkbit-update-server/pom.xml b/hawkbit-runtime/hawkbit-update-server/pom.xml index d62be5878..f097b7085 100644 --- a/hawkbit-runtime/hawkbit-update-server/pom.xml +++ b/hawkbit-runtime/hawkbit-update-server/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-runtime-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-update-server hawkBit :: Runtime :: Update Server diff --git a/hawkbit-runtime/pom.xml b/hawkbit-runtime/pom.xml index 4a1dbe06f..f5887cb8f 100644 --- a/hawkbit-runtime/pom.xml +++ b/hawkbit-runtime/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-runtime-parent diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml index 6384f77df..0ccade63d 100644 --- a/hawkbit-security-core/pom.xml +++ b/hawkbit-security-core/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-security-core hawkBit :: Core Security diff --git a/hawkbit-security-integration/pom.xml b/hawkbit-security-integration/pom.xml index dee7faf83..00920f8a6 100644 --- a/hawkbit-security-integration/pom.xml +++ b/hawkbit-security-integration/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-security-integration hawkBit :: Security Integration diff --git a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml index 999b1c587..b330ee40b 100644 --- a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-starters - 0.3.0-SNAPSHOT + ${revision} hawkbit-boot-starter-ddi-api hawkBit :: Spring Boot Starter DDI API diff --git a/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml index f0b45b7ae..e2627676f 100644 --- a/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-starters - 0.3.0-SNAPSHOT + ${revision} hawkbit-boot-starter-dmf-api hawkBit :: Spring Boot Starter DMF API diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml index 76d4c2443..65a422443 100644 --- a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-starters - 0.3.0-SNAPSHOT + ${revision} hawkbit-boot-starter-mgmt-api hawkBit :: Spring Boot Starter Management API diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml index 673b65c0b..093162cb3 100644 --- a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-starters - 0.3.0-SNAPSHOT + ${revision} hawkbit-boot-starter-mgmt-ui hawkBit :: Spring Boot Starter Management UI diff --git a/hawkbit-starters/hawkbit-boot-starter/pom.xml b/hawkbit-starters/hawkbit-boot-starter/pom.xml index 5cbbb5740..bf87d8271 100644 --- a/hawkbit-starters/hawkbit-boot-starter/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-starters - 0.3.0-SNAPSHOT + ${revision} hawkbit-boot-starter hawkBit :: Spring Boot Starter diff --git a/hawkbit-starters/pom.xml b/hawkbit-starters/pom.xml index e4deb8735..5d763c14e 100644 --- a/hawkbit-starters/pom.xml +++ b/hawkbit-starters/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-starters hawkBit :: Spring Boot Starters diff --git a/hawkbit-test-report/pom.xml b/hawkbit-test-report/pom.xml index b1f39f71f..d090c95b9 100644 --- a/hawkbit-test-report/pom.xml +++ b/hawkbit-test-report/pom.xml @@ -15,7 +15,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-test-report hawkBit :: Test Report diff --git a/hawkbit-ui/pom.xml b/hawkbit-ui/pom.xml index c0193a70c..041fb3833 100644 --- a/hawkbit-ui/pom.xml +++ b/hawkbit-ui/pom.xml @@ -14,7 +14,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} hawkbit-ui hawkBit :: Mgmt UI diff --git a/pom.xml b/pom.xml index 71b344390..359451b22 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.3.0-SNAPSHOT + ${revision} pom hawkBit :: Parent @@ -109,8 +109,8 @@ avgustinmm Avgustin.Marinov@bosch.com - Bosch - https://www.bosch.io + Bosch Digital + https://www.bosch-digital.com/ Committer @@ -138,6 +138,8 @@ + 0.4.0-SNAPSHOT + true 17 @@ -298,6 +300,30 @@ + + org.codehaus.mojo + flatten-maven-plugin + + ossrh + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + org.codehaus.mojo versions-maven-plugin @@ -352,6 +378,11 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.5.0 + io.fabric8 docker-maven-plugin