From 8aab4a9396e80c8974a9246542482387fa10c0ce Mon Sep 17 00:00:00 2001 From: rapkalya Date: Fri, 16 May 2025 19:21:11 +0530 Subject: [PATCH 1/5] updated pom --- argocd/pom.xml | 2 +- azure-boards/pom.xml | 2 +- azure-pipeline/pom.xml | 2 +- azure-repo/pom.xml | 2 +- bamboo/pom.xml | 2 +- bitbucket/pom.xml | 2 +- github-action/pom.xml | 2 +- github/pom.xml | 2 +- gitlab/pom.xml | 2 +- jenkins/pom.xml | 2 +- jira-xray-zephyr-squad/pom.xml | 2 +- jira-zephyr-scale/pom.xml | 2 +- jira/pom.xml | 2 +- pom.xml | 73 +++++++++++++++++++++++----------- sonar/pom.xml | 2 +- teamcity/pom.xml | 2 +- 16 files changed, 64 insertions(+), 39 deletions(-) diff --git a/argocd/pom.xml b/argocd/pom.xml index daa67407b..93e2cce95 100644 --- a/argocd/pom.xml +++ b/argocd/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT org.projectlombok diff --git a/azure-boards/pom.xml b/azure-boards/pom.xml index a4d305f17..1eeb94da4 100644 --- a/azure-boards/pom.xml +++ b/azure-boards/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT compile diff --git a/azure-pipeline/pom.xml b/azure-pipeline/pom.xml index e6ef8f522..8ce5607d8 100644 --- a/azure-pipeline/pom.xml +++ b/azure-pipeline/pom.xml @@ -59,7 +59,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/azure-repo/pom.xml b/azure-repo/pom.xml index 026e74718..10ee1b9a3 100644 --- a/azure-repo/pom.xml +++ b/azure-repo/pom.xml @@ -50,7 +50,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/bamboo/pom.xml b/bamboo/pom.xml index 3e544bc3a..f954d85ae 100644 --- a/bamboo/pom.xml +++ b/bamboo/pom.xml @@ -61,7 +61,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/bitbucket/pom.xml b/bitbucket/pom.xml index 59ef7c1c8..188052a3b 100644 --- a/bitbucket/pom.xml +++ b/bitbucket/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/github-action/pom.xml b/github-action/pom.xml index 48d9416cd..493660d43 100644 --- a/github-action/pom.xml +++ b/github-action/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/github/pom.xml b/github/pom.xml index cf2e8a69b..d704110cf 100644 --- a/github/pom.xml +++ b/github/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/gitlab/pom.xml b/gitlab/pom.xml index 3182c40b3..4eddf393b 100644 --- a/gitlab/pom.xml +++ b/gitlab/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/jenkins/pom.xml b/jenkins/pom.xml index 1093b991f..b88201616 100644 --- a/jenkins/pom.xml +++ b/jenkins/pom.xml @@ -51,7 +51,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/jira-xray-zephyr-squad/pom.xml b/jira-xray-zephyr-squad/pom.xml index ccf34faac..2da9c908f 100644 --- a/jira-xray-zephyr-squad/pom.xml +++ b/jira-xray-zephyr-squad/pom.xml @@ -63,7 +63,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT compile diff --git a/jira-zephyr-scale/pom.xml b/jira-zephyr-scale/pom.xml index 5e6482791..3b2a970b0 100644 --- a/jira-zephyr-scale/pom.xml +++ b/jira-zephyr-scale/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/jira/pom.xml b/jira/pom.xml index 6f4bea883..2fb9cef7c 100644 --- a/jira/pom.xml +++ b/jira/pom.xml @@ -93,7 +93,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT compile diff --git a/pom.xml b/pom.xml index 183fd850c..a9d740503 100644 --- a/pom.xml +++ b/pom.xml @@ -41,30 +41,7 @@ **/src/test/java/** **/src/test/java/** - - - processors - - true - - - jira - jira-xray-zephyr-squad - jira-zephyr-scale - bitbucket - gitlab - github - github-action - sonar - jenkins - bamboo - teamcity - azure-pipeline - azure-repo - azure-boards - argocd - - + src/test/resources @@ -103,6 +80,54 @@ + + + devops-processor + + true + + + jira-xray-zephyr-squad + jira-zephyr-scale + bitbucket + gitlab + github + github-action + sonar + jenkins + bamboo + teamcity + argocd + + + + + jira-processor + + true + + + jira + + + + azure-board-processor + + true + + + azure-boards + + + + azure-pipeline-repo + + true + + + azure-pipeline + azure-repo + diff --git a/sonar/pom.xml b/sonar/pom.xml index 4b10064d4..ebded01d3 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/teamcity/pom.xml b/teamcity/pom.xml index ddbad1766..f744e2d13 100644 --- a/teamcity/pom.xml +++ b/teamcity/pom.xml @@ -72,7 +72,7 @@ com.publicissapient.kpidashboard common - ${common.version} + 13.1.1-SNAPSHOT ch.qos.logback From 6f6110346f4fbbf42772c2ed9e572ce0b8dd1544 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Mon, 19 May 2025 11:17:43 +0530 Subject: [PATCH 2/5] reverted the pom --- pom.xml | 75 +++++++++++++++++++-------------------------------------- 1 file changed, 25 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index a9d740503..37ce30cdf 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,30 @@ **/src/test/java/** **/src/test/java/** - + + + processors + + true + + + jira + jira-xray-zephyr-squad + jira-zephyr-scale + bitbucket + gitlab + github + github-action + sonar + jenkins + bamboo + teamcity + azure-pipeline + azure-repo + azure-boards + argocd + + src/test/resources @@ -80,54 +103,6 @@ - - - devops-processor - - true - - - jira-xray-zephyr-squad - jira-zephyr-scale - bitbucket - gitlab - github - github-action - sonar - jenkins - bamboo - teamcity - argocd - - - - - jira-processor - - true - - - jira - - - - azure-board-processor - - true - - - azure-boards - - - - azure-pipeline-repo - - true - - - azure-pipeline - azure-repo - - + \ No newline at end of file From dec18d5bd29a310f2be9beebebfe790dc3be8768 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Mon, 19 May 2025 12:27:29 +0530 Subject: [PATCH 3/5] testing by updating the version --- argocd/pom.xml | 2 +- azure-boards/pom.xml | 2 +- azure-pipeline/pom.xml | 2 +- azure-repo/pom.xml | 2 +- bamboo/pom.xml | 2 +- bitbucket/pom.xml | 2 +- github-action/pom.xml | 2 +- github/pom.xml | 2 +- gitlab/pom.xml | 2 +- jenkins/pom.xml | 2 +- jira-xray-zephyr-squad/pom.xml | 2 +- jira-zephyr-scale/pom.xml | 2 +- jira/pom.xml | 2 +- sonar/pom.xml | 2 +- teamcity/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/argocd/pom.xml b/argocd/pom.xml index 93e2cce95..efdec2af6 100644 --- a/argocd/pom.xml +++ b/argocd/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT org.projectlombok diff --git a/azure-boards/pom.xml b/azure-boards/pom.xml index 1eeb94da4..b97755a3a 100644 --- a/azure-boards/pom.xml +++ b/azure-boards/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT compile diff --git a/azure-pipeline/pom.xml b/azure-pipeline/pom.xml index 8ce5607d8..d300ec7e0 100644 --- a/azure-pipeline/pom.xml +++ b/azure-pipeline/pom.xml @@ -59,7 +59,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/azure-repo/pom.xml b/azure-repo/pom.xml index 10ee1b9a3..0cdcfe961 100644 --- a/azure-repo/pom.xml +++ b/azure-repo/pom.xml @@ -50,7 +50,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/bamboo/pom.xml b/bamboo/pom.xml index f954d85ae..c29c20cae 100644 --- a/bamboo/pom.xml +++ b/bamboo/pom.xml @@ -61,7 +61,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/bitbucket/pom.xml b/bitbucket/pom.xml index 188052a3b..cfc2ec025 100644 --- a/bitbucket/pom.xml +++ b/bitbucket/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/github-action/pom.xml b/github-action/pom.xml index 493660d43..e54bf9471 100644 --- a/github-action/pom.xml +++ b/github-action/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/github/pom.xml b/github/pom.xml index d704110cf..4a2aa21f5 100644 --- a/github/pom.xml +++ b/github/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/gitlab/pom.xml b/gitlab/pom.xml index 4eddf393b..eb5344933 100644 --- a/gitlab/pom.xml +++ b/gitlab/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/jenkins/pom.xml b/jenkins/pom.xml index b88201616..82797760e 100644 --- a/jenkins/pom.xml +++ b/jenkins/pom.xml @@ -51,7 +51,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/jira-xray-zephyr-squad/pom.xml b/jira-xray-zephyr-squad/pom.xml index 2da9c908f..c4cbb7620 100644 --- a/jira-xray-zephyr-squad/pom.xml +++ b/jira-xray-zephyr-squad/pom.xml @@ -63,7 +63,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT compile diff --git a/jira-zephyr-scale/pom.xml b/jira-zephyr-scale/pom.xml index 3b2a970b0..43dd1467d 100644 --- a/jira-zephyr-scale/pom.xml +++ b/jira-zephyr-scale/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/jira/pom.xml b/jira/pom.xml index 2fb9cef7c..cdd30d4f1 100644 --- a/jira/pom.xml +++ b/jira/pom.xml @@ -93,7 +93,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT compile diff --git a/sonar/pom.xml b/sonar/pom.xml index ebded01d3..b2c7d4319 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback diff --git a/teamcity/pom.xml b/teamcity/pom.xml index f744e2d13..f410b498e 100644 --- a/teamcity/pom.xml +++ b/teamcity/pom.xml @@ -72,7 +72,7 @@ com.publicissapient.kpidashboard common - 13.1.1-SNAPSHOT + 13.1.2-SNAPSHOT ch.qos.logback From 863da0d35aaf8ef4042dfe0f5ceb398fc950bfe3 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Mon, 19 May 2025 12:49:45 +0530 Subject: [PATCH 4/5] updated the version --- argocd/pom.xml | 2 +- azure-boards/pom.xml | 2 +- azure-pipeline/pom.xml | 2 +- azure-repo/pom.xml | 2 +- bamboo/pom.xml | 2 +- bitbucket/pom.xml | 2 +- github-action/pom.xml | 2 +- github/pom.xml | 2 +- gitlab/pom.xml | 2 +- jenkins/pom.xml | 2 +- jira-xray-zephyr-squad/pom.xml | 2 +- jira-zephyr-scale/pom.xml | 2 +- jira/pom.xml | 2 +- sonar/pom.xml | 2 +- teamcity/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/argocd/pom.xml b/argocd/pom.xml index efdec2af6..93e2cce95 100644 --- a/argocd/pom.xml +++ b/argocd/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT org.projectlombok diff --git a/azure-boards/pom.xml b/azure-boards/pom.xml index b97755a3a..1eeb94da4 100644 --- a/azure-boards/pom.xml +++ b/azure-boards/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT compile diff --git a/azure-pipeline/pom.xml b/azure-pipeline/pom.xml index d300ec7e0..8ce5607d8 100644 --- a/azure-pipeline/pom.xml +++ b/azure-pipeline/pom.xml @@ -59,7 +59,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/azure-repo/pom.xml b/azure-repo/pom.xml index 0cdcfe961..10ee1b9a3 100644 --- a/azure-repo/pom.xml +++ b/azure-repo/pom.xml @@ -50,7 +50,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/bamboo/pom.xml b/bamboo/pom.xml index c29c20cae..f954d85ae 100644 --- a/bamboo/pom.xml +++ b/bamboo/pom.xml @@ -61,7 +61,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/bitbucket/pom.xml b/bitbucket/pom.xml index cfc2ec025..188052a3b 100644 --- a/bitbucket/pom.xml +++ b/bitbucket/pom.xml @@ -57,7 +57,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/github-action/pom.xml b/github-action/pom.xml index e54bf9471..493660d43 100644 --- a/github-action/pom.xml +++ b/github-action/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/github/pom.xml b/github/pom.xml index 4a2aa21f5..d704110cf 100644 --- a/github/pom.xml +++ b/github/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/gitlab/pom.xml b/gitlab/pom.xml index eb5344933..4eddf393b 100644 --- a/gitlab/pom.xml +++ b/gitlab/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/jenkins/pom.xml b/jenkins/pom.xml index 82797760e..b88201616 100644 --- a/jenkins/pom.xml +++ b/jenkins/pom.xml @@ -51,7 +51,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/jira-xray-zephyr-squad/pom.xml b/jira-xray-zephyr-squad/pom.xml index c4cbb7620..2da9c908f 100644 --- a/jira-xray-zephyr-squad/pom.xml +++ b/jira-xray-zephyr-squad/pom.xml @@ -63,7 +63,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT compile diff --git a/jira-zephyr-scale/pom.xml b/jira-zephyr-scale/pom.xml index 43dd1467d..3b2a970b0 100644 --- a/jira-zephyr-scale/pom.xml +++ b/jira-zephyr-scale/pom.xml @@ -56,7 +56,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/jira/pom.xml b/jira/pom.xml index cdd30d4f1..2fb9cef7c 100644 --- a/jira/pom.xml +++ b/jira/pom.xml @@ -93,7 +93,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT compile diff --git a/sonar/pom.xml b/sonar/pom.xml index b2c7d4319..ebded01d3 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -55,7 +55,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback diff --git a/teamcity/pom.xml b/teamcity/pom.xml index f410b498e..f744e2d13 100644 --- a/teamcity/pom.xml +++ b/teamcity/pom.xml @@ -72,7 +72,7 @@ com.publicissapient.kpidashboard common - 13.1.2-SNAPSHOT + 13.1.1-SNAPSHOT ch.qos.logback From 2adf27c13fd213579581dbe46a257a5ed23c5913 Mon Sep 17 00:00:00 2001 From: rapkalya Date: Mon, 19 May 2025 13:01:54 +0530 Subject: [PATCH 5/5] updated the github work flow --- .github/workflows/Processors_CI_Workflow.yaml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Processors_CI_Workflow.yaml b/.github/workflows/Processors_CI_Workflow.yaml index ece26985e..63b610fb9 100644 --- a/.github/workflows/Processors_CI_Workflow.yaml +++ b/.github/workflows/Processors_CI_Workflow.yaml @@ -70,19 +70,26 @@ jobs: COMMON_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo "COMMON_VERSION=$COMMON_VERSION" echo "COMMON_VERSION=$COMMON_VERSION" >> $GITHUB_ENV + + - name: Updating the common version in processor project + run: | + mvn versions:use-dep-version \ + -Dincludes=com.publicissapient.kpidashboard:common \ + -DdepVersion=$COMMON_VERSION \ + -DforceVersion=true - name: Build & Test Jira Processor run: | - mvn clean install -Pjira-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION + mvn clean install -Pjira-processor -Ddockerfile.skip=true - name: Build & Test Azure Board Processor - run: mvn clean install -Pazure-board-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION + run: mvn clean install -Pazure-board-processor -Ddockerfile.skip=true - name: Build & Test DevOps Processor - run: mvn clean install -Pdevops-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION + run: mvn clean install -Pdevops-processor -Ddockerfile.skip=true - name: Build & Test Azure Pipeline Repo Processor - run: mvn clean install -Pazure-pipeline-repo -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION + run: mvn clean install -Pazure-pipeline-repo -Ddockerfile.skip=true - name: SonarQube Analysis - Processors run: | @@ -90,7 +97,6 @@ jobs: -Dsonar.projectName=ENGINEERING.KPIDASHBOARD.PROCESSORS \ -Dsonar.branch.name=${{ env.GITHUB_HEAD_NAME }} \ -Dsonar.host.url=${{ secrets.SONARQUBE_HOST }} \ - -Dcommon.version=$COMMON_VERSION \ -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }} -f pom.xml - name: Check SonarQube Quality Gate - Processors