From eaf7777c2f5550d6161f7f02341eb8a0a64ed0a7 Mon Sep 17 00:00:00 2001 From: Nico Koprowski Date: Thu, 20 Jun 2024 12:03:52 +0800 Subject: [PATCH] build: make pom more CI friendly by using Maven revision property - include revision property in parent pom - child modules now refer to parent pom version by revision property - also clean pom dependencies for more info visit https://maven.apache.org/maven-ci-friendly.html --- .gitignore | 1 + DEPENDENCIES | 9 +- bpdm-cleaning-service-dummy/pom.xml | 8 +- bpdm-common-test/pom.xml | 8 +- bpdm-common/pom.xml | 2 +- bpdm-gate-api/pom.xml | 2 +- bpdm-gate/pom.xml | 6 +- bpdm-orchestrator-api/pom.xml | 2 +- bpdm-orchestrator/pom.xml | 2 +- bpdm-pool-api/pom.xml | 7 +- bpdm-pool/pom.xml | 7 +- pom.xml | 147 ++++++++++++---------------- 12 files changed, 77 insertions(+), 124 deletions(-) diff --git a/.gitignore b/.gitignore index 94d360ef8..9e1c0f688 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ application-developer.properties application-developer.yml *.drawio.svg.bkp /docker/compose/**/.env +.flattened-pom.xml diff --git a/DEPENDENCIES b/DEPENDENCIES index 5b35bcf25..9c5525587 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -29,20 +29,16 @@ maven/mavencentral/com.jayway.jsonpath/json-path/2.9.0, Apache-2.0, approved, cl maven/mavencentral/com.neovisionaries/nv-i18n/1.29, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.2, Apache-2.0, approved, #11701 +maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.24.4, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.43.3, Apache-2.0, approved, clearlydefined maven/mavencentral/com.ninja-squad/springmockk/4.0.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.opencsv/opencsv/5.9, Apache-2.0, approved, clearlydefined maven/mavencentral/com.sun.istack/istack-commons-runtime/4.1.2, BSD-3-Clause, approved, #15290 maven/mavencentral/com.sun.istack/istack-commons-tools/4.1.2, BSD-3-Clause, approved, #2580 maven/mavencentral/com.sun.xml.bind.external/relaxng-datatype/4.0.2, BSD-3-Clause, approved, ee4j.jaxb-impl maven/mavencentral/com.sun.xml.bind.external/rngom/4.0.2, BSD-3-Clause, approved, ee4j.jaxb-impl maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310 maven/mavencentral/com.zaxxer/HikariCP/5.0.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654 maven/mavencentral/commons-codec/commons-codec/1.16.1, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #9157 -maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, #15185 -maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745 maven/mavencentral/commons-io/commons-io/2.16.1, Apache-2.0, approved, #14190 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162 maven/mavencentral/io.github.microutils/kotlin-logging-jvm/3.0.5, Apache-2.0, approved, clearlydefined @@ -85,7 +81,6 @@ maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR G maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, ee4j.cdi maven/mavencentral/jakarta.mail/jakarta.mail-api/2.1.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.mail maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.1.0, EPL-2.0 OR BSD-3-Clause, approved, ee4j.jpa -maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.2.0, EPL-2.0 OR BSD-3-Clause, approved, ee4j.jpa maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jta maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest @@ -97,11 +92,9 @@ maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later maven/mavencentral/net.minidev/accessors-smart/2.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.antlr/antlr4-runtime/4.13.0, BSD-3-Clause, approved, #10767 -maven/mavencentral/org.apache.commons/commons-collections4/4.4, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.commons/commons-compress/1.24.0, Apache-2.0 AND BSD-3-Clause AND bzip2-1.0.6 AND LicenseRef-Public-Domain, approved, #10368 maven/mavencentral/org.apache.commons/commons-csv/1.11.0, Apache-2.0, approved, #14690 maven/mavencentral/org.apache.commons/commons-lang3/3.13.0, Apache-2.0, approved, #9820 -maven/mavencentral/org.apache.commons/commons-text/1.11.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.14, Apache-2.0, approved, #15248 maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.16, Apache-2.0, approved, CQ23528 maven/mavencentral/org.apache.james/apache-mime4j-core/0.8.9, Apache-2.0, approved, clearlydefined diff --git a/bpdm-cleaning-service-dummy/pom.xml b/bpdm-cleaning-service-dummy/pom.xml index 3e6750c5c..0fe819d9b 100644 --- a/bpdm-cleaning-service-dummy/pom.xml +++ b/bpdm-cleaning-service-dummy/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} @@ -143,12 +143,6 @@ assertj-core test - - - org.assertj - assertj-core - test - diff --git a/bpdm-common-test/pom.xml b/bpdm-common-test/pom.xml index 115b3ef4e..924879008 100644 --- a/bpdm-common-test/pom.xml +++ b/bpdm-common-test/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} @@ -61,11 +61,6 @@ junit-jupiter compile - - org.testcontainers - junit-jupiter - compile - org.testcontainers postgresql @@ -79,7 +74,6 @@ jakarta.persistence jakarta.persistence-api - 3.2.0 org.jetbrains.kotlin diff --git a/bpdm-common/pom.xml b/bpdm-common/pom.xml index 33f057b90..b61440165 100644 --- a/bpdm-common/pom.xml +++ b/bpdm-common/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} diff --git a/bpdm-gate-api/pom.xml b/bpdm-gate-api/pom.xml index 479b9fbb8..891215b26 100644 --- a/bpdm-gate-api/pom.xml +++ b/bpdm-gate-api/pom.xml @@ -31,7 +31,7 @@ bpdm-parent org.eclipse.tractusx - 6.1.0-SNAPSHOT + ${revision} diff --git a/bpdm-gate/pom.xml b/bpdm-gate/pom.xml index bf03c4bf8..d8e3cdd46 100644 --- a/bpdm-gate/pom.xml +++ b/bpdm-gate/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} @@ -161,10 +161,6 @@ org.eclipse.tractusx bpdm-orchestrator-api - - com.opencsv - opencsv - diff --git a/bpdm-orchestrator-api/pom.xml b/bpdm-orchestrator-api/pom.xml index 8c0c4ea4b..577458b3c 100644 --- a/bpdm-orchestrator-api/pom.xml +++ b/bpdm-orchestrator-api/pom.xml @@ -30,7 +30,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} diff --git a/bpdm-orchestrator/pom.xml b/bpdm-orchestrator/pom.xml index 96e3a0918..f928fe47b 100644 --- a/bpdm-orchestrator/pom.xml +++ b/bpdm-orchestrator/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} diff --git a/bpdm-pool-api/pom.xml b/bpdm-pool-api/pom.xml index cb9706826..b4f545336 100644 --- a/bpdm-pool-api/pom.xml +++ b/bpdm-pool-api/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} @@ -51,7 +51,10 @@ com.fasterxml.jackson.module jackson-module-kotlin - + + org.apache.commons + commons-csv + diff --git a/bpdm-pool/pom.xml b/bpdm-pool/pom.xml index a6141e4c6..be93528ca 100644 --- a/bpdm-pool/pom.xml +++ b/bpdm-pool/pom.xml @@ -31,7 +31,7 @@ org.eclipse.tractusx bpdm-parent - 6.1.0-SNAPSHOT + ${revision} @@ -152,11 +152,6 @@ postgresql test - - org.apache.commons - commons-csv - 1.11.0 - diff --git a/pom.xml b/pom.xml index 910c344f3..0232f323d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ bpdm-parent Business Partner Data Management Parent Parent pom of Business Partner Data Management - 6.1.0-SNAPSHOT + ${revision} pom @@ -49,25 +49,12 @@ + 6.1.0-SNAPSHOT 21 21 + 3.2.5 1.9.24 2.5.0 - 1.29 - 3.0.5 - 2.35.2 - 4.0.2 - 3.24.2 - 3.0.4 - catenax-ng - https://sonarcloud.io - product-bpdm - ${project.groupId}:${project.artifactId} - 3.11.0.3922 - 0.8.12 - 1.19.8 - 1.1.20 - 5.9 @@ -132,7 +119,7 @@ com.neovisionaries nv-i18n - ${neo.version} + 1.29 @@ -145,56 +132,49 @@ springdoc-openapi-starter-common ${springdoc.version} - - - org.yaml - snakeyaml - 2.2 - - - - com.nimbusds - nimbus-jose-jwt - 9.37.2 - - io.github.microutils kotlin-logging-jvm - ${kotlinlogging.version} + 3.0.5 + + + + org.apache.commons + commons-csv + 1.11.0 com.github.tomakehurst wiremock-jre8-standalone - ${wiremock.version} + 2.35.2 test com.ninja-squad springmockk - ${springmockk.version} + 4.0.2 test org.assertj assertj-core - ${assertj.version} + 3.24.2 test org.testcontainers testcontainers-bom - ${testcontainers.version} + 1.19.8 pom import io.projectreactor.netty reactor-netty-http - ${io.projectreactor.netty} + 1.1.20 com.github.dasniko @@ -207,7 +187,7 @@ com.opencsv opencsv - ${opencsv.version} + 5.9 @@ -293,55 +273,52 @@ - - org.eclipse.dash - license-tool-plugin - 1.1.0 - - - license-check - - license-check - - - - - automotive.tractusx - DEPENDENCIES - test - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${sonar.version} - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - prepare-agent - - prepare-agent - - - - report - - report - - - - XML - - - - - + + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + org.eclipse.dash + license-tool-plugin + 1.1.0 + + + license-check + + license-check + + + + + automotive.tractusx + DEPENDENCIES + test + + + \ No newline at end of file