From 0d4667279c1a5a38597c8d3d808f45623678b616 Mon Sep 17 00:00:00 2001 From: Rees Pozzi Date: Tue, 21 Nov 2023 13:30:40 +0000 Subject: [PATCH 1/6] Update jenkinsfile to run pact verification on PR as well --- Jenkinsfile_CNP | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 8ad3204c..84170e22 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -41,9 +41,13 @@ withPipeline(type, product, component) { disableLegacyDeployment() syncBranchesWithMaster(branchesToSync) expires(expiresAfter) + + onPR() { + enablePactAs([AppPipelineDsl.PactRoles.PROVIDER]) + } onMaster() { - env.PACT_BRANCH_NAME = "master" - enablePactAs([AppPipelineDsl.PactRoles.PROVIDER]) + env.PACT_BRANCH_NAME = "master" + enablePactAs([AppPipelineDsl.PactRoles.PROVIDER]) } } From b8071589bf86043e7d3dae0cb00ecf234b04d94c Mon Sep 17 00:00:00 2001 From: Rees Pozzi Date: Tue, 21 Nov 2023 13:48:41 +0000 Subject: [PATCH 2/6] Update to latest versions --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 62bda77c..998774d9 100644 --- a/build.gradle +++ b/build.gradle @@ -185,7 +185,7 @@ dependencies { contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter contractTestRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: versions.junit_jupiter contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter - contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.0' + contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.1' testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springBoot) { exclude(module: 'commons-logging') From 7d6417504cf4e80543ad545b908b709b00286d9f Mon Sep 17 00:00:00 2001 From: Rees Pozzi Date: Tue, 21 Nov 2023 14:19:10 +0000 Subject: [PATCH 3/6] Condense to use single --- build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 998774d9..2e819662 100644 --- a/build.gradle +++ b/build.gradle @@ -182,10 +182,8 @@ dependencies { contractTestImplementation group: 'au.com.dius.pact.provider', name: 'junit5spring', version: versions.pact_version contractTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' contractTestImplementation group: 'com.warrenstrange', name: 'googleauth', version: '1.5.0' - contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter - contractTestRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: versions.junit_jupiter - contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter - contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.1' + contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: versions.junit_jupiter + contractTestRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter', version: versions.junit_jupiter testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springBoot) { exclude(module: 'commons-logging') From 15cf447a2ff67f6996ba1563151b7a07fb4880e8 Mon Sep 17 00:00:00 2001 From: Rees Pozzi Date: Tue, 21 Nov 2023 14:30:18 +0000 Subject: [PATCH 4/6] update other junit dependency --- build.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2e819662..e169704c 100644 --- a/build.gradle +++ b/build.gradle @@ -168,22 +168,24 @@ dependencies { compileOnly group: 'net.sourceforge.findbugs', name: 'annotations', version: '1.3.2' - testImplementation group: 'junit', name: 'junit', version: '4.13.2' + testImplementation group: 'junit', name: 'junit', version: versions.junit_jupiter testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2' functionalTestImplementation sourceSets.main.runtimeClasspath functionalTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springBoot functionalTestImplementation group: 'com.typesafe', name: 'config', version: '1.4.3' functionalTestImplementation group: 'io.rest-assured', name: 'rest-assured' - functionalTestImplementation group: 'junit', name: 'junit', version: '4.13.2' + functionalTestImplementation group: 'junit', name: 'junit', version: versions.junit_jupiter contractTestImplementation group: 'au.com.dius.pact.provider', name: 'junit5', version: versions.pact_version contractTestImplementation group: 'au.com.dius.pact.provider', name: 'spring', version: versions.pact_version contractTestImplementation group: 'au.com.dius.pact.provider', name: 'junit5spring', version: versions.pact_version contractTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' contractTestImplementation group: 'com.warrenstrange', name: 'googleauth', version: '1.5.0' - contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: versions.junit_jupiter - contractTestRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter', version: versions.junit_jupiter + contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter + contractTestRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: versions.junit_jupiter + contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter + contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.1' testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springBoot) { exclude(module: 'commons-logging') From c038399ca4f2c30b735a5df9d014a4b71a0a6178 Mon Sep 17 00:00:00 2001 From: Rees Pozzi Date: Tue, 21 Nov 2023 14:34:34 +0000 Subject: [PATCH 5/6] revert changes --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e169704c..998774d9 100644 --- a/build.gradle +++ b/build.gradle @@ -168,14 +168,14 @@ dependencies { compileOnly group: 'net.sourceforge.findbugs', name: 'annotations', version: '1.3.2' - testImplementation group: 'junit', name: 'junit', version: versions.junit_jupiter + testImplementation group: 'junit', name: 'junit', version: '4.13.2' testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2' functionalTestImplementation sourceSets.main.runtimeClasspath functionalTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springBoot functionalTestImplementation group: 'com.typesafe', name: 'config', version: '1.4.3' functionalTestImplementation group: 'io.rest-assured', name: 'rest-assured' - functionalTestImplementation group: 'junit', name: 'junit', version: versions.junit_jupiter + functionalTestImplementation group: 'junit', name: 'junit', version: '4.13.2' contractTestImplementation group: 'au.com.dius.pact.provider', name: 'junit5', version: versions.pact_version contractTestImplementation group: 'au.com.dius.pact.provider', name: 'spring', version: versions.pact_version From ad4803bebfc0fab70bc8781535ad2cc32658b97c Mon Sep 17 00:00:00 2001 From: Rees Pozzi Date: Tue, 21 Nov 2023 14:36:23 +0000 Subject: [PATCH 6/6] Revert to old version to test pact tests --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 998774d9..607758ca 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,7 @@ sonarqube { def versions = [ springBoot: plugins.getPlugin('org.springframework.boot').class.package.implementationVersion, pact_version: '4.6.3', - junit_jupiter: '5.10.1' + junit_jupiter: '5.9.3' ] ext["rest-assured.version"] = '4.5.1' @@ -185,7 +185,7 @@ dependencies { contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter contractTestRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: versions.junit_jupiter contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter - contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.1' + contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.0' testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springBoot) { exclude(module: 'commons-logging')