Skip to content

Commit ac7ef1c

Browse files
aksshriv1aksshriv1
authored
Merge pull request #24 from PublicisSapient/sync_qa_master_to_master_processor
Sync qa master to master processor
2 parents 9b70fd0 + 863676f commit ac7ef1c

File tree

18 files changed

+65
-53
lines changed

18 files changed

+65
-53
lines changed

‎.github/workflows/Processors_CI_Workflow.yaml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,33 @@ jobs:
7070
COMMON_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
7171
echo "COMMON_VERSION=$COMMON_VERSION"
7272
echo "COMMON_VERSION=$COMMON_VERSION" >> $GITHUB_ENV
73+
74+
- name: Updating the common version in processor project
75+
run: |
76+
mvn versions:use-dep-version \
77+
-Dincludes=com.publicissapient.kpidashboard:common \
78+
-DdepVersion=$COMMON_VERSION \
79+
-DforceVersion=true
7380
7481
- name: Build & Test Jira Processor
7582
run: |
76-
mvn clean install -Pjira-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION
83+
mvn clean install -Pjira-processor -Ddockerfile.skip=true
7784
7885
- name: Build & Test Azure Board Processor
79-
run: mvn clean install -Pazure-board-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION
86+
run: mvn clean install -Pazure-board-processor -Ddockerfile.skip=true
8087

8188
- name: Build & Test DevOps Processor
82-
run: mvn clean install -Pdevops-processor -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION
89+
run: mvn clean install -Pdevops-processor -Ddockerfile.skip=true
8390

8491
- name: Build & Test Azure Pipeline Repo Processor
85-
run: mvn clean install -Pazure-pipeline-repo -Ddockerfile.skip=true -Dcommon.version=$COMMON_VERSION
92+
run: mvn clean install -Pazure-pipeline-repo -Ddockerfile.skip=true
8693

8794
- name: SonarQube Analysis - Processors
8895
run: |
8996
mvn sonar:sonar -Dsonar.projectKey=ENGINEERING.KPIDASHBOARD.PROCESSORS \
9097
-Dsonar.projectName=ENGINEERING.KPIDASHBOARD.PROCESSORS \
9198
-Dsonar.branch.name=${{ env.GITHUB_HEAD_NAME }} \
9299
-Dsonar.host.url=${{ secrets.SONARQUBE_HOST }} \
93-
-Dcommon.version=$COMMON_VERSION \
94100
-Dsonar.login=${{ secrets.SONARQUBE_TOKEN }} -f pom.xml
95101
96102
- name: Check SonarQube Quality Gate - Processors

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ release.properties
123123
dependency-reduced-pom.xml
124124
buildNumber.properties
125125
.mvn/timing.properties
126-
126+
common_version.txt
127127

128128
### Grails template
129129
# .gitignore for Grails 1.2 and 1.3
@@ -209,4 +209,4 @@ testem.log
209209
Thumbs.db
210210
package-lock.json
211211

212-
.github/CODEOWNERS
212+
.github/CODEOWNERS

‎argocd/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
</parent>
2727
<groupId>com.publicissapient.kpidashboard</groupId>
2828
<artifactId>argocd-processor</artifactId>
29-
<version>13.1.0-SNAPSHOT</version>
29+
<version>13.2.0-SNAPSHOT</version>
3030
<packaging>jar</packaging>
3131
<description>ArgoCD Processor</description>
3232
<scm>
33-
<tag>4.6.1</tag>
33+
<tag>13.1.2</tag>
3434
</scm>
3535
<properties>
3636
<java.version>17</java.version>
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.publicissapient.kpidashboard</groupId>
5757
<artifactId>common</artifactId>
58-
<version>${common.version}</version>
58+
<version>13.2.0-SNAPSHOT</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.projectlombok</groupId>

‎azure-boards/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
</parent>
2727
<groupId>com.publicissapient.kpidashboard</groupId>
2828
<artifactId>azure-processor</artifactId>
29-
<version>13.1.0-SNAPSHOT</version>
29+
<version>13.2.0-SNAPSHOT</version>
3030
<description>Azure processor fetches data from Azure api</description>
3131
<scm>
32-
<tag>4.6.1</tag>
32+
<tag>13.1.2</tag>
3333
</scm>
3434
<properties>
3535
<java.version>17</java.version>
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>com.publicissapient.kpidashboard</groupId>
5959
<artifactId>common</artifactId>
60-
<version>${common.version}</version>
60+
<version>13.2.0-SNAPSHOT</version>
6161
<scope>compile</scope>
6262
<exclusions>
6363
<exclusion>

‎azure-pipeline/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
</parent>
2727
<groupId>com.publicissapient.kpidashboard</groupId>
2828
<artifactId>azurepipeline-processor</artifactId>
29-
<version>13.1.0-SNAPSHOT</version>
29+
<version>13.2.0-SNAPSHOT</version>
3030
<packaging>jar</packaging>
3131
<description>Azure Pipeline Build Processor Microservice</description>
3232
<scm>
33-
<tag>4.6.1</tag>
33+
<tag>13.1.2</tag>
3434
</scm>
3535
<properties>
3636
<java.version>17</java.version>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>com.publicissapient.kpidashboard</groupId>
6161
<artifactId>common</artifactId>
62-
<version>${common.version}</version>
62+
<version>13.2.0-SNAPSHOT</version>
6363
<exclusions>
6464
<exclusion>
6565
<groupId>ch.qos.logback</groupId>

‎azure-repo/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
</parent>
2020
<groupId>com.publicissapient.kpidashboard</groupId>
2121
<artifactId>azurerepo-processor</artifactId>
22-
<version>13.1.0-SNAPSHOT</version>
22+
<version>13.2.0-SNAPSHOT</version>
2323
<packaging>jar</packaging>
2424
<description>Azure Repo processor service</description>
2525
<scm>
26-
<tag>4.6.1</tag>
26+
<tag>13.1.2</tag>
2727
</scm>
2828
<properties>
2929
<sonar.skip>true</sonar.skip>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>com.publicissapient.kpidashboard</groupId>
5252
<artifactId>common</artifactId>
53-
<version>${common.version}</version>
53+
<version>13.2.0-SNAPSHOT</version>
5454
<exclusions>
5555
<exclusion>
5656
<groupId>ch.qos.logback</groupId>

‎bamboo/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
</parent>
2727
<groupId>com.publicissapient.kpidashboard</groupId>
2828
<artifactId>bamboo-processor</artifactId>
29-
<version>13.1.0-SNAPSHOT</version>
29+
<version>13.2.0-SNAPSHOT</version>
3030
<packaging>jar</packaging>
3131
<description>bamboo processor</description>
3232
<scm>
33-
<tag>4.6.1</tag>
33+
<tag>13.1.2</tag>
3434
</scm>
3535
<properties>
3636
<java.version>17</java.version>
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>com.publicissapient.kpidashboard</groupId>
6363
<artifactId>common</artifactId>
64-
<version>${common.version}</version>
64+
<version>13.2.0-SNAPSHOT</version>
6565
<exclusions>
6666
<exclusion>
6767
<groupId>ch.qos.logback</groupId>

‎bitbucket/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
</parent>
2727
<groupId>com.publicissapient.kpidashboard</groupId>
2828
<artifactId>bitbucket-processor</artifactId>
29-
<version>13.1.0-SNAPSHOT</version>
29+
<version>13.2.0-SNAPSHOT</version>
3030
<packaging>jar</packaging>
3131
<description>Bitbucket processor service</description>
3232
<scm>
33-
<tag>4.6.1</tag>
33+
<tag>13.1.2</tag>
3434
</scm>
3535
<properties>
3636
<sonar.skip>true</sonar.skip>
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>com.publicissapient.kpidashboard</groupId>
5959
<artifactId>common</artifactId>
60-
<version>${common.version}</version>
60+
<version>13.2.0-SNAPSHOT</version>
6161
<exclusions>
6262
<exclusion>
6363
<groupId>ch.qos.logback</groupId>

‎github-action/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
</parent>
2727
<groupId>com.publicissapient.kpidashboard</groupId>
2828
<artifactId>githubaction-processor</artifactId>
29-
<version>13.1.0-SNAPSHOT</version>
29+
<version>13.2.0-SNAPSHOT</version>
3030
<packaging>jar</packaging>
3131
<description>Github Actions processor service</description>
3232
<scm>
33-
<tag>4.6.1</tag>
33+
<tag>13.1.2</tag>
3434
</scm>
3535
<properties>
3636
<java.version>17</java.version>
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.publicissapient.kpidashboard</groupId>
5757
<artifactId>common</artifactId>
58-
<version>${common.version}</version>
58+
<version>13.2.0-SNAPSHOT</version>
5959
<exclusions>
6060
<exclusion>
6161
<groupId>ch.qos.logback</groupId>

‎github/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
</parent>
2727
<groupId>com.publicissapient.kpidashboard</groupId>
2828
<artifactId>github-processor</artifactId>
29-
<version>13.1.0-SNAPSHOT</version>
29+
<version>13.2.0-SNAPSHOT</version>
3030
<packaging>jar</packaging>
3131
<description>Github processor service</description>
3232
<scm>
33-
<tag>4.6.1</tag>
33+
<tag>13.1.2</tag>
3434
</scm>
3535
<properties>
3636
<java.version>17</java.version>
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.publicissapient.kpidashboard</groupId>
5757
<artifactId>common</artifactId>
58-
<version>${common.version}</version>
58+
<version>13.2.0-SNAPSHOT</version>
5959
<exclusions>
6060
<exclusion>
6161
<groupId>ch.qos.logback</groupId>

0 commit comments

Comments
 (0)