From d80c96d801afafd20e21e2ab68718672b2d49a8d Mon Sep 17 00:00:00 2001 From: Benoit TELLIER Date: Mon, 26 Feb 2024 08:40:55 +0100 Subject: [PATCH] [BUILD] Use git-commit-id-maven-plugin in server/apps only --- pom.xml | 66 +++++++++++------------- server/apps/cassandra-app/pom.xml | 4 ++ server/apps/cli/pom.xml | 4 ++ server/apps/distributed-app/pom.xml | 4 ++ server/apps/distributed-pop3-app/pom.xml | 4 ++ server/apps/jpa-app/pom.xml | 4 ++ server/apps/jpa-smtp-app/pom.xml | 4 ++ server/apps/memory-app/pom.xml | 4 ++ server/apps/scaling-pulsar-smtp/pom.xml | 4 ++ server/apps/spring-app/pom.xml | 4 ++ server/apps/webadmin-cli/pom.xml | 4 ++ 11 files changed, 71 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 0df0fd6e7dc..38fba9a53b0 100644 --- a/pom.xml +++ b/pom.xml @@ -3500,6 +3500,37 @@ io.github.git-commit-id git-commit-id-maven-plugin 7.0.0 + + ${project.basedir}/.git + true + true + ${project.build.outputDirectory}/git.properties + false + json + + false + true + -dirty + + + git.commit.id + git.commit.id.describe + git.commit.message.short + git.dirty + + git + false + true + false + + + + get-the-git-infos + + revision + + + @@ -3635,41 +3666,6 @@ - - io.github.git-commit-id - git-commit-id-maven-plugin - - ${project.basedir}/.git - true - true - ${project.build.outputDirectory}/git.properties - false - json - - false - true - -dirty - - - git.commit.id - git.commit.id.describe - git.commit.message.short - git.dirty - - git - false - true - false - - - - get-the-git-infos - - revision - - - - org.apache.maven.plugins maven-surefire-report-plugin diff --git a/server/apps/cassandra-app/pom.xml b/server/apps/cassandra-app/pom.xml index 90784e8fd33..c2e8b063e11 100644 --- a/server/apps/cassandra-app/pom.xml +++ b/server/apps/cassandra-app/pom.xml @@ -490,6 +490,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/cli/pom.xml b/server/apps/cli/pom.xml index 366900c54b9..c3f601f78e5 100644 --- a/server/apps/cli/pom.xml +++ b/server/apps/cli/pom.xml @@ -142,6 +142,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/distributed-app/pom.xml b/server/apps/distributed-app/pom.xml index fbd7f61e429..95f5a58edd8 100644 --- a/server/apps/distributed-app/pom.xml +++ b/server/apps/distributed-app/pom.xml @@ -579,6 +579,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/distributed-pop3-app/pom.xml b/server/apps/distributed-pop3-app/pom.xml index e0401e4fe4c..9b31b6ca797 100644 --- a/server/apps/distributed-pop3-app/pom.xml +++ b/server/apps/distributed-pop3-app/pom.xml @@ -473,6 +473,10 @@ unstable + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/jpa-app/pom.xml b/server/apps/jpa-app/pom.xml index 5d8e063e747..6cd96740120 100644 --- a/server/apps/jpa-app/pom.xml +++ b/server/apps/jpa-app/pom.xml @@ -437,6 +437,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/jpa-smtp-app/pom.xml b/server/apps/jpa-smtp-app/pom.xml index df665c36d22..465d1452aea 100644 --- a/server/apps/jpa-smtp-app/pom.xml +++ b/server/apps/jpa-smtp-app/pom.xml @@ -407,6 +407,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/memory-app/pom.xml b/server/apps/memory-app/pom.xml index 3096f52cff5..e7472e9de74 100644 --- a/server/apps/memory-app/pom.xml +++ b/server/apps/memory-app/pom.xml @@ -431,6 +431,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/scaling-pulsar-smtp/pom.xml b/server/apps/scaling-pulsar-smtp/pom.xml index 7246697515f..adb4b96f2ca 100644 --- a/server/apps/scaling-pulsar-smtp/pom.xml +++ b/server/apps/scaling-pulsar-smtp/pom.xml @@ -370,6 +370,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/spring-app/pom.xml b/server/apps/spring-app/pom.xml index cf6987755d3..b1b94391364 100644 --- a/server/apps/spring-app/pom.xml +++ b/server/apps/spring-app/pom.xml @@ -873,6 +873,10 @@ false + + io.github.git-commit-id + git-commit-id-maven-plugin + diff --git a/server/apps/webadmin-cli/pom.xml b/server/apps/webadmin-cli/pom.xml index 14ef613d610..2349a603614 100644 --- a/server/apps/webadmin-cli/pom.xml +++ b/server/apps/webadmin-cli/pom.xml @@ -115,6 +115,10 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin +