From 92678025d62c9b99f6c3611c39f433f4bf92e92c Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 25 Jun 2026 16:39:43 +0100 Subject: [PATCH 01/46] Add ADO pipeline configuration for build, test, and code coverage --- pipeline.yaml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pipeline.yaml diff --git a/pipeline.yaml b/pipeline.yaml new file mode 100644 index 0000000..1f2ad8f --- /dev/null +++ b/pipeline.yaml @@ -0,0 +1,48 @@ +trigger: + branches: + include: + - '*' + +pr: + branches: + exclude: + - '*' + +pool: + name: 'DEFRA-COMMON-UBUNTU-SSV5' + +jobs: + - job: Build + displayName: Build + condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/main')) + variables: + MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository + MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' + steps: + - task: Cache@2 + inputs: + key: 'maven | "$(Agent.OS)" | **/pom.xml' + restoreKeys: | + maven | "$(Agent.OS)" + maven + path: $(MAVEN_CACHE_FOLDER) + displayName: Cache Maven local repo + + - task: Maven@4 + displayName: 'Build and Test' + inputs: + mavenPomFile: 'pom.xml' + mavenOptions: '-Xmx512m $(MAVEN_OPTS)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.21' + jdkArchitectureOption: 'x64' + publishJUnitResults: true + testResultsFiles: '**/surefire-reports/TEST-*.xml' + options: '--s settings.xml' + goals: 'clean test jacoco:report' + + - task: PublishCodeCoverageResults@2 + displayName: 'Publish code coverage' + inputs: + summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml + pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ From 16de1aa1dc783b1f16836c2009d99f2584625853 Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 25 Jun 2026 16:56:04 +0100 Subject: [PATCH 02/46] Remove unnecessary Maven settings file option in ADO pipeline configuration --- pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index 1f2ad8f..1d9ed8d 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -38,7 +38,7 @@ jobs: jdkArchitectureOption: 'x64' publishJUnitResults: true testResultsFiles: '**/surefire-reports/TEST-*.xml' - options: '--s settings.xml' + options: '' goals: 'clean test jacoco:report' - task: PublishCodeCoverageResults@2 From 1994b24ecd1a3b4099cdf95213c6bd2563160094 Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 25 Jun 2026 17:09:48 +0100 Subject: [PATCH 03/46] Add Maven settings file download to ADO pipeline configuration --- pipeline.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index 1d9ed8d..f37a0a5 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -19,6 +19,12 @@ jobs: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' steps: + - task: DownloadSecureFile@1 + name: mavenSettings + displayName: 'Download Maven Settings' + inputs: + secureFile: 'maven-settings.xml' + - task: Cache@2 inputs: key: 'maven | "$(Agent.OS)" | **/pom.xml' @@ -38,7 +44,7 @@ jobs: jdkArchitectureOption: 'x64' publishJUnitResults: true testResultsFiles: '**/surefire-reports/TEST-*.xml' - options: '' + options: '--s $(mavenSettings.secureFilePath)' goals: 'clean test jacoco:report' - task: PublishCodeCoverageResults@2 From b3ab01b06e31edcf22d4e87611f4223a6cfd1474 Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 25 Jun 2026 17:18:10 +0100 Subject: [PATCH 04/46] Update test results file pattern in ADO pipeline configuration --- pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index f37a0a5..c5df7cb 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -43,7 +43,7 @@ jobs: jdkVersionOption: '1.21' jdkArchitectureOption: 'x64' publishJUnitResults: true - testResultsFiles: '**/surefire-reports/TEST-*.xml' + testResultsFiles: '**/surefire-reports/*.xml' options: '--s $(mavenSettings.secureFilePath)' goals: 'clean test jacoco:report' From 647b58454807df98a09a9fc1145c31ca933e21bc Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 16 Jul 2026 14:20:45 +0100 Subject: [PATCH 05/46] Update ADO pipeline deploy step --- parent/pom.xml | 2 +- pipeline.yaml | 2 +- pom.xml | 9 +++++++-- .../tracesx/common/security/jwt/JwtTokenValidator.java | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7792af8..27051dd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 3.5.14 diff --git a/pipeline.yaml b/pipeline.yaml index c5df7cb..61e20c1 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -45,7 +45,7 @@ jobs: publishJUnitResults: true testResultsFiles: '**/surefire-reports/*.xml' options: '--s $(mavenSettings.secureFilePath)' - goals: 'clean test jacoco:report' + goals: 'clean test jacoco:report deploy --batch-mode' - task: PublishCodeCoverageResults@2 displayName: 'Publish code coverage' diff --git a/pom.xml b/pom.xml index 4fc7786..eeae4c9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-dependencies - 3.5.5 + 3.5.14 @@ -68,7 +68,7 @@ - + + + github + GitHub Packages + https://maven.pkg.github.com/DEFRA/ipaffs-spring-boot-common diff --git a/security/src/main/java/uk/gov/defra/tracesx/common/security/jwt/JwtTokenValidator.java b/security/src/main/java/uk/gov/defra/tracesx/common/security/jwt/JwtTokenValidator.java index e3786e3..d60df87 100644 --- a/security/src/main/java/uk/gov/defra/tracesx/common/security/jwt/JwtTokenValidator.java +++ b/security/src/main/java/uk/gov/defra/tracesx/common/security/jwt/JwtTokenValidator.java @@ -102,7 +102,6 @@ private VerificationResult verifyClaims(JWTClaimsSet claims, KeyAndClaims keyAnd Set.of("exp")) .verify(claims, null); - LOGGER.info("JWT claims verified successfully."); return VerificationResult.SUCCESS; } catch (BadJWTException exception) { if (exception.getMessage().contains("issuer")) { From caec0d9e3a85299548f45a3b15b3787d5250bcfa Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 16 Jul 2026 14:34:49 +0100 Subject: [PATCH 06/46] Normalize artifact IDs across all POM files to use consistent lowercase naming convention --- azure/pom.xml | 4 ++-- event/pom.xml | 4 ++-- health-tests/pom.xml | 4 ++-- health/pom.xml | 4 ++-- logging/pom.xml | 4 ++-- parent/pom.xml | 31 +++++++++---------------------- pom.xml | 2 +- security-tests/pom.xml | 12 ++---------- security/pom.xml | 4 ++-- version/pom.xml | 4 ++-- 10 files changed, 26 insertions(+), 47 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index d548fb9..6277464 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -2,13 +2,13 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Azure + tracesx-springboot-common-azure 4.0.19-SNAPSHOT azure uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT diff --git a/event/pom.xml b/event/pom.xml index 2680e19..3bd55bb 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -2,13 +2,13 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Event + tracesx-springboot-common-event 4.0.19-SNAPSHOT event uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 38577c7..461180c 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Health-Tests + tracesx-springboot-common-health-tests 4.0.19-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health @@ -11,7 +11,7 @@ uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT diff --git a/health/pom.xml b/health/pom.xml index adcfcc2..2049b40 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -2,13 +2,13 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Health + tracesx-springboot-common-health 4.0.19-SNAPSHOT health uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT diff --git a/logging/pom.xml b/logging/pom.xml index a5d36b2..8f68371 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -2,13 +2,13 @@ 4.0.0 - TracesX-SpringBoot-Common-Logging + tracesx-springboot-common-logging 4.0.19-SNAPSHOT logging uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml index 27051dd..98d8fb8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Parent + tracesx-springboot-common-parent 4.0.19-SNAPSHOT pom @@ -15,19 +15,6 @@ 3.5.14 - - - release - Snapshots - https://artifactoryv2.azure.defra.cloud/artifactory/maven-snapshots-local - - - release - Releases - ${repo.releases.url} - - - scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git HEAD @@ -82,42 +69,42 @@ uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Azure + tracesx-springboot-common-azure ${tracesx.springboot.common.version} uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Event + tracesx-springboot-common-event ${tracesx.springboot.common.version} uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Health + tracesx-springboot-common-health ${tracesx.springboot.common.version} uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Health-Tests + tracesx-springboot-common-health-tests ${tracesx.springboot.common.version} uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Logging + tracesx-springboot-common-logging ${tracesx.springboot.common.version} uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Security + tracesx-springboot-common-security ${tracesx.springboot.common.version} uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Security-Tests + tracesx-springboot-common-security-tests ${tracesx.springboot.common.version} uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Version + tracesx-springboot-common-version ${tracesx.springboot.common.version} diff --git a/pom.xml b/pom.xml index eeae4c9..5a69d0c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 9a2eeae..90a8fd9 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -2,25 +2,17 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Security-Tests + tracesx-springboot-common-security-tests 4.0.19-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT - - - release - Releases - ${repo.releases.url} - - - ${parent.scm.connection} HEAD diff --git a/security/pom.xml b/security/pom.xml index b3e9b26..5128288 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -2,14 +2,14 @@ 4.0.0 uk.gov.defra.tracesx - TracesX-SpringBoot-Common-Security + tracesx-springboot-common-security 4.0.19-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT diff --git a/version/pom.xml b/version/pom.xml index 6a74abc..9beed26 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -2,13 +2,13 @@ 4.0.0 - TracesX-SpringBoot-Common-Version + tracesx-springboot-common-version 4.0.19-SNAPSHOT version uk.gov.defra.tracesx - TracesX-SpringBoot-Common + tracesx-springboot-common 4.0.19-SNAPSHOT From 023dca202793e70e1b2cea9765ebbaa7b0f25630 Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 16 Jul 2026 14:40:52 +0100 Subject: [PATCH 07/46] Add GitHub Packages repository to distribution management in POM --- parent/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index 98d8fb8..940ce64 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -15,6 +15,15 @@ 3.5.14 + + + + github + GitHub Packages + https://maven.pkg.github.com/DEFRA/ipaffs-spring-boot-common + + + scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git HEAD From faef6ab3490d0da910958b1eca047b9efdefddc0 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 09:58:17 +0100 Subject: [PATCH 08/46] add release stage --- pipeline.yaml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index 61e20c1..081650b 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -52,3 +52,40 @@ jobs: inputs: summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ + + - job: Release + displayName: Release + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + variables: + MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository + MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' + steps: + - task: DownloadSecureFile@1 + name: mavenSettings + displayName: 'Download Maven Settings' + inputs: + secureFile: 'maven-settings.xml' + + - task: Cache@2 + inputs: + key: 'maven | "$(Agent.OS)" | **/pom.xml' + restoreKeys: | + maven | "$(Agent.OS)" + maven + path: $(MAVEN_CACHE_FOLDER) + displayName: Cache Maven local repo + + - task: Maven@4 + displayName: 'Prepare and Perform Release' + inputs: + mavenPomFile: 'pom.xml' + mavenOptions: '-Xmx512m $(MAVEN_OPTS)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.21' + jdkArchitectureOption: 'x64' + options: '--settings $(mavenSettings.secureFilePath)' + goals: > + release:prepare + release:perform + --batch-mode + -DskipTests=true From b6463b4e610e2cc50c61b26e8236bdc726e71448 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 10:25:10 +0100 Subject: [PATCH 09/46] add release stage --- pipeline.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index 081650b..e1e9dce 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -14,7 +14,7 @@ pool: jobs: - job: Build displayName: Build - condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(not(failed()), not(canceled())) variables: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' @@ -55,7 +55,8 @@ jobs: - job: Release displayName: Release - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + dependsOn: Build + condition: succeeded() variables: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' From 065bf4142d58e863833d2b65e320c0bb7d101ea6 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 10:34:44 +0100 Subject: [PATCH 10/46] add release stage --- pipeline.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index e1e9dce..c66a46a 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -61,6 +61,9 @@ jobs: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' steps: + - checkout: self + persistCredentials: true + - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' From e79ee7bd2df884a04f5f7b58f2154d1af07fd4c9 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 11:00:56 +0100 Subject: [PATCH 11/46] add release stage --- pipeline.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index c66a46a..bc9ec48 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -63,7 +63,15 @@ jobs: steps: - checkout: self persistCredentials: true - + + - script: | + git config user.email "imports-jenkins@defra.onmicrosoft.com" + git config user.name "imports-jenkins" + + git config --global push.default simple + + git config --list + - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' From 9060fa1a6eae2846cb001a67b65de01ed4ef79c3 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 11:15:54 +0100 Subject: [PATCH 12/46] add release stage --- pipeline.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index bc9ec48..1cee577 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -63,15 +63,32 @@ jobs: steps: - checkout: self persistCredentials: true + fetchDepth: 0 - script: | + echo "Source branch: $(Build.SourceBranch)" + echo "Branch name: $(Build.SourceBranchName)" + + git fetch --tags origin + + git checkout $(Build.SourceBranchName) + + git pull origin $(Build.SourceBranchName) + + git status + git branch + displayName: "Checkout release branch" + + - script: | + git config user.name "imports-jenkins@defra.onmicrosoft.com" git config user.email "imports-jenkins@defra.onmicrosoft.com" - git config user.name "imports-jenkins" git config --global push.default simple git config --list + displayName: "Configure Git" + - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' From 3349593f2599e1017c365f5f5103cb5a5becdf16 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 11:27:08 +0100 Subject: [PATCH 13/46] add release stage --- pipeline.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index 1cee577..1bef5e9 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -65,6 +65,15 @@ jobs: persistCredentials: true fetchDepth: 0 + - script: | + git remote -v + git status + git branch + + echo "Testing push permissions..." + git push --dry-run origin HEAD:$(Build.SourceBranchName) + displayName: "Test Git push" + - script: | echo "Source branch: $(Build.SourceBranch)" echo "Branch name: $(Build.SourceBranchName)" From 2b88c7acf415b5e0a2e926e222d99bd89523dd15 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 11:36:43 +0100 Subject: [PATCH 14/46] add release stage --- pipeline.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index 1bef5e9..de41bc1 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -65,15 +65,6 @@ jobs: persistCredentials: true fetchDepth: 0 - - script: | - git remote -v - git status - git branch - - echo "Testing push permissions..." - git push --dry-run origin HEAD:$(Build.SourceBranchName) - displayName: "Test Git push" - - script: | echo "Source branch: $(Build.SourceBranch)" echo "Branch name: $(Build.SourceBranchName)" @@ -95,9 +86,18 @@ jobs: git config --global push.default simple git config --list - displayName: "Configure Git" + - script: | + git remote -v + git status + git branch + + echo "Testing push permissions..." + git push --dry-run origin HEAD:$(Build.SourceBranchName) + displayName: "Test Git push" + + - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' From c5e86341965112bd5a7415e2a0507248ceaece91 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 11:48:24 +0100 Subject: [PATCH 15/46] add release stage --- pipeline.yaml | 131 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 52 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index de41bc1..ca2e528 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -53,66 +53,15 @@ jobs: summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ - - job: Release - displayName: Release - dependsOn: Build - condition: succeeded() - variables: - MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository - MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' - steps: - - checkout: self - persistCredentials: true - fetchDepth: 0 - - - script: | - echo "Source branch: $(Build.SourceBranch)" - echo "Branch name: $(Build.SourceBranchName)" - - git fetch --tags origin - - git checkout $(Build.SourceBranchName) - - git pull origin $(Build.SourceBranchName) - - git status - git branch - displayName: "Checkout release branch" - - script: | git config user.name "imports-jenkins@defra.onmicrosoft.com" git config user.email "imports-jenkins@defra.onmicrosoft.com" git config --global push.default simple - git config --list + git config --list displayName: "Configure Git" - - script: | - git remote -v - git status - git branch - - echo "Testing push permissions..." - git push --dry-run origin HEAD:$(Build.SourceBranchName) - displayName: "Test Git push" - - - - task: DownloadSecureFile@1 - name: mavenSettings - displayName: 'Download Maven Settings' - inputs: - secureFile: 'maven-settings.xml' - - - task: Cache@2 - inputs: - key: 'maven | "$(Agent.OS)" | **/pom.xml' - restoreKeys: | - maven | "$(Agent.OS)" - maven - path: $(MAVEN_CACHE_FOLDER) - displayName: Cache Maven local repo - - task: Maven@4 displayName: 'Prepare and Perform Release' inputs: @@ -127,3 +76,81 @@ jobs: release:perform --batch-mode -DskipTests=true + + + + +# - job: Release +# displayName: Release +# dependsOn: Build +# condition: succeeded() +# variables: +# MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository +# MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' +# steps: +# - checkout: self +# persistCredentials: true +# fetchDepth: 0 + +# - script: | +# echo "Source branch: $(Build.SourceBranch)" +# echo "Branch name: $(Build.SourceBranchName)" +# +# git fetch --tags origin + +# git checkout $(Build.SourceBranchName) + +# git pull origin $(Build.SourceBranchName) + +# git status +# git branch +# displayName: "Checkout release branch" + +# - script: | +# git config user.name "imports-jenkins@defra.onmicrosoft.com" +# git config user.email "imports-jenkins@defra.onmicrosoft.com" + +# git config --global push.default simple + +# git config --list +# displayName: "Configure Git" + +# - script: | +# git remote -v +# git status +# git branch + +# echo "Testing push permissions..." +# git push --dry-run origin HEAD:$(Build.SourceBranchName) +# displayName: "Test Git push" + + +# - task: DownloadSecureFile@1 +# name: mavenSettings +# displayName: 'Download Maven Settings' +# inputs: +# secureFile: 'maven-settings.xml' + +# - task: Cache@2 +# inputs: +# key: 'maven | "$(Agent.OS)" | **/pom.xml' +# restoreKeys: | +# maven | "$(Agent.OS)" +# maven +# path: $(MAVEN_CACHE_FOLDER) +# displayName: Cache Maven local repo + +# - task: Maven@4 +# displayName: 'Prepare and Perform Release' +# inputs: +# mavenPomFile: 'pom.xml' +# mavenOptions: '-Xmx512m $(MAVEN_OPTS)' +# javaHomeOption: 'JDKVersion' +# jdkVersionOption: '1.21' +# jdkArchitectureOption: 'x64' +# options: '--settings $(mavenSettings.secureFilePath)' +# goals: > +# release:prepare +# release:perform +# --batch-mode +# -DskipTests=true From 10c1be852e8cfc33a8ca24a26b298c808584b717 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 13:11:51 +0100 Subject: [PATCH 16/46] add release stage --- pipeline.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index ca2e528..1c30966 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -54,7 +54,7 @@ jobs: pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ - script: | - git config user.name "imports-jenkins@defra.onmicrosoft.com" + git config user.name "imports-jenkins" git config user.email "imports-jenkins@defra.onmicrosoft.com" git config --global push.default simple @@ -107,7 +107,7 @@ jobs: # displayName: "Checkout release branch" # - script: | -# git config user.name "imports-jenkins@defra.onmicrosoft.com" +# git config user.name "imports-jenkins" # git config user.email "imports-jenkins@defra.onmicrosoft.com" # git config --global push.default simple From f8007d92ed34799c507cf8ffa2a09be29d2c0f86 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 13:25:25 +0100 Subject: [PATCH 17/46] add release stage --- pipeline.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index 1c30966..318a5ed 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -19,6 +19,16 @@ jobs: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' steps: + - checkout: self + fetchDepth: 0 + persistCredentials: true + + - script: | + git checkout $(Build.SourceBranchName) + git status + git branch + displayName: Prepare Git + - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' From 2618354c67a586eaa954420384602995a12c8069 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 14:14:22 +0100 Subject: [PATCH 18/46] add release stage --- pipeline.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index 318a5ed..2c35870 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -33,7 +33,7 @@ jobs: name: mavenSettings displayName: 'Download Maven Settings' inputs: - secureFile: 'maven-settings.xml' + secureFile: 'maven.xml' - task: Cache@2 inputs: @@ -139,7 +139,7 @@ jobs: # name: mavenSettings # displayName: 'Download Maven Settings' # inputs: -# secureFile: 'maven-settings.xml' +# secureFile: 'maven.xml' # - task: Cache@2 # inputs: From b4b309f0f2c90f49dd0180ad2dc2e468b7a8dbc3 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 14:57:03 +0100 Subject: [PATCH 19/46] add release stage --- pipeline.yaml | 114 +------------------------------------------------- 1 file changed, 1 insertion(+), 113 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index 2c35870..d380dbc 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -14,21 +14,11 @@ pool: jobs: - job: Build displayName: Build - condition: and(not(failed()), not(canceled())) + condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/main')) variables: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' steps: - - checkout: self - fetchDepth: 0 - persistCredentials: true - - - script: | - git checkout $(Build.SourceBranchName) - git status - git branch - displayName: Prepare Git - - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' @@ -62,105 +52,3 @@ jobs: inputs: summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ - - - script: | - git config user.name "imports-jenkins" - git config user.email "imports-jenkins@defra.onmicrosoft.com" - - git config --global push.default simple - - git config --list - displayName: "Configure Git" - - - task: Maven@4 - displayName: 'Prepare and Perform Release' - inputs: - mavenPomFile: 'pom.xml' - mavenOptions: '-Xmx512m $(MAVEN_OPTS)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.21' - jdkArchitectureOption: 'x64' - options: '--settings $(mavenSettings.secureFilePath)' - goals: > - release:prepare - release:perform - --batch-mode - -DskipTests=true - - - - -# - job: Release -# displayName: Release -# dependsOn: Build -# condition: succeeded() -# variables: -# MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository -# MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' -# steps: -# - checkout: self -# persistCredentials: true -# fetchDepth: 0 - -# - script: | -# echo "Source branch: $(Build.SourceBranch)" -# echo "Branch name: $(Build.SourceBranchName)" -# -# git fetch --tags origin - -# git checkout $(Build.SourceBranchName) - -# git pull origin $(Build.SourceBranchName) - -# git status -# git branch -# displayName: "Checkout release branch" - -# - script: | -# git config user.name "imports-jenkins" -# git config user.email "imports-jenkins@defra.onmicrosoft.com" - -# git config --global push.default simple - -# git config --list -# displayName: "Configure Git" - -# - script: | -# git remote -v -# git status -# git branch - -# echo "Testing push permissions..." -# git push --dry-run origin HEAD:$(Build.SourceBranchName) -# displayName: "Test Git push" - - -# - task: DownloadSecureFile@1 -# name: mavenSettings -# displayName: 'Download Maven Settings' -# inputs: -# secureFile: 'maven.xml' - -# - task: Cache@2 -# inputs: -# key: 'maven | "$(Agent.OS)" | **/pom.xml' -# restoreKeys: | -# maven | "$(Agent.OS)" -# maven -# path: $(MAVEN_CACHE_FOLDER) -# displayName: Cache Maven local repo - -# - task: Maven@4 -# displayName: 'Prepare and Perform Release' -# inputs: -# mavenPomFile: 'pom.xml' -# mavenOptions: '-Xmx512m $(MAVEN_OPTS)' -# javaHomeOption: 'JDKVersion' -# jdkVersionOption: '1.21' -# jdkArchitectureOption: 'x64' -# options: '--settings $(mavenSettings.secureFilePath)' -# goals: > -# release:prepare -# release:perform -# --batch-mode -# -DskipTests=true From ecb6319d49649d3c800a147c8933169612096b3f Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 15:29:23 +0100 Subject: [PATCH 20/46] [maven-release-plugin] prepare release 4.0.19-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 6277464..6c754fb 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.19-SNAPSHOT + 4.0.19 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index 3bd55bb..2ee1bcc 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.19-SNAPSHOT + 4.0.19 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 461180c..2224a13 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.19-SNAPSHOT + 4.0.19 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index 2049b40..e102c28 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.19-SNAPSHOT + 4.0.19 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index 8f68371..2fd3620 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.19-SNAPSHOT + 4.0.19 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index 940ce64..0449257 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.19-SNAPSHOT + 4.0.19 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.19-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.19-SNAPSHOT + 4.0.19 21 diff --git a/pom.xml b/pom.xml index 5a69d0c..7133cf0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 90a8fd9..9918375 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.19-SNAPSHOT + 4.0.19 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index 5128288..03d3ee9 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.19-SNAPSHOT + 4.0.19 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index 9beed26..0f7dd98 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.19-SNAPSHOT + 4.0.19 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19-SNAPSHOT + 4.0.19 ${parent.scm.connection} - HEAD + 4.0.19-${env.BUILD_NUMBER} From 22ff7aced5d014aaa6c33cce38c56ebb11d9194f Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 15:29:34 +0100 Subject: [PATCH 21/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 6c754fb..4a5f2e7 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.19 + 4.0.20-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index 2ee1bcc..39bbae0 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.19 + 4.0.20-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 2224a13..f72fd96 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.19 + 4.0.20-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index e102c28..2d550bc 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.19 + 4.0.20-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 2fd3620..47a7e18 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.19 + 4.0.20-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index 0449257..507e240 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.19 + 4.0.20-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.19-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.19 + 4.0.20-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index 7133cf0..84906ef 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 9918375..2784c5b 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.19 + 4.0.20-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index 03d3ee9..73acb87 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.19 + 4.0.20-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index 0f7dd98..2cfab6b 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.19 + 4.0.20-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.19 + 4.0.20-SNAPSHOT ${parent.scm.connection} - 4.0.19-${env.BUILD_NUMBER} + HEAD From 2c7bdaf1f76b8b9b16b42cc3b1250274f5b7a7bf Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 15:38:14 +0100 Subject: [PATCH 22/46] add release stage --- pipeline.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index d380dbc..c0f5e20 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -52,3 +52,15 @@ jobs: inputs: summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ + + - task: Maven@4 + displayName: 'Release' + inputs: + mavenPomFile: 'pom.xml' + mavenOptions: '-Xmx512m $(MAVEN_OPTS)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.21' + jdkArchitectureOption: 'x64' + options: '--s $(mavenSettings.secureFilePath)' + goals: '--batch-mode release:prepare release:perform -DskipTests=true' + From 62e3e2416b4a770f9871877d613c235ac9bf597e Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 15:49:47 +0100 Subject: [PATCH 23/46] add release stage --- pipeline.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index c0f5e20..e4f244c 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -53,6 +53,11 @@ jobs: summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ + - script: | + git config user.email "imports-jenkins@defra.onmicrosoft.com" + git config user.name "imports-jenkins" + displayName: "Git author" + - task: Maven@4 displayName: 'Release' inputs: From 5c7cb77abdc955247bfe8869a933d39e8c3116b4 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 16:11:07 +0100 Subject: [PATCH 24/46] add release stage --- pipeline.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index e4f244c..dfa4fd2 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -58,6 +58,14 @@ jobs: git config user.name "imports-jenkins" displayName: "Git author" + - checkout: self + persistCredentials: true + fetchDepth: 0 + + - script: | + git checkout $(Build.SourceBranchName) + displayName: Checkout branch + - task: Maven@4 displayName: 'Release' inputs: From aa0e643a0a8268c43d8fa6ed7a0926be75d1d93d Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 16:27:32 +0100 Subject: [PATCH 25/46] add release stage --- pipeline.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index dfa4fd2..03b6b9f 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -19,6 +19,19 @@ jobs: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' steps: + - script: | + git config user.email "imports-jenkins@defra.onmicrosoft.com" + git config user.name "imports-jenkins" + displayName: "Git author" + + - checkout: self + persistCredentials: true + fetchDepth: 0 + + - script: | + git checkout $(Build.SourceBranchName) + displayName: Checkout branch + - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' @@ -53,19 +66,6 @@ jobs: summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ - - script: | - git config user.email "imports-jenkins@defra.onmicrosoft.com" - git config user.name "imports-jenkins" - displayName: "Git author" - - - checkout: self - persistCredentials: true - fetchDepth: 0 - - - script: | - git checkout $(Build.SourceBranchName) - displayName: Checkout branch - - task: Maven@4 displayName: 'Release' inputs: From f9b36c723c0355444bf7bbda77dd3bf7586944b4 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 16:31:33 +0100 Subject: [PATCH 26/46] add release stage --- pipeline.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index 03b6b9f..8c8107f 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -19,11 +19,6 @@ jobs: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' steps: - - script: | - git config user.email "imports-jenkins@defra.onmicrosoft.com" - git config user.name "imports-jenkins" - displayName: "Git author" - - checkout: self persistCredentials: true fetchDepth: 0 @@ -32,6 +27,12 @@ jobs: git checkout $(Build.SourceBranchName) displayName: Checkout branch + - script: | + git config user.email "imports-jenkins@defra.onmicrosoft.com" + git config user.name "imports-jenkins" + displayName: "Git author" + + - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' From bdec6ce05526b53a543e8b0cc2d3bc9b117079a3 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 15:36:27 +0000 Subject: [PATCH 27/46] [maven-release-plugin] prepare release 4.0.20-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 4a5f2e7..296e56e 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.20-SNAPSHOT + 4.0.20 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index 39bbae0..1fea975 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.20-SNAPSHOT + 4.0.20 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index f72fd96..05927bd 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.20-SNAPSHOT + 4.0.20 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index 2d550bc..4642cc9 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.20-SNAPSHOT + 4.0.20 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index 47a7e18..59f24d6 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.20-SNAPSHOT + 4.0.20 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index 507e240..0d3656c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.20-SNAPSHOT + 4.0.20 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.20-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.20-SNAPSHOT + 4.0.20 21 diff --git a/pom.xml b/pom.xml index 84906ef..4824e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 2784c5b..a3e3892 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.20-SNAPSHOT + 4.0.20 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index 73acb87..5506407 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.20-SNAPSHOT + 4.0.20 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index 2cfab6b..89ebe6c 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.20-SNAPSHOT + 4.0.20 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20-SNAPSHOT + 4.0.20 ${parent.scm.connection} - HEAD + 4.0.20-${env.BUILD_NUMBER} From eb3945307b5ebe476d5c792b1b0e1e5c72986036 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 15:36:31 +0000 Subject: [PATCH 28/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 296e56e..ed8dc65 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.20 + 4.0.21-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index 1fea975..a272ec5 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.20 + 4.0.21-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 05927bd..7a4fcb2 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.20 + 4.0.21-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index 4642cc9..01427b8 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.20 + 4.0.21-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 59f24d6..4a7ecc4 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.20 + 4.0.21-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index 0d3656c..34e49e7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.20 + 4.0.21-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.20-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.20 + 4.0.21-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index 4824e3a..ef06759 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index a3e3892..bf4da73 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.20 + 4.0.21-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index 5506407..4a639dd 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.20 + 4.0.21-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index 89ebe6c..b85d614 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.20 + 4.0.21-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.20 + 4.0.21-SNAPSHOT ${parent.scm.connection} - 4.0.20-${env.BUILD_NUMBER} + HEAD From a15071bf03d67fa17941dfc8cd2ecd5bab83d380 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 15:41:02 +0000 Subject: [PATCH 29/46] [maven-release-plugin] prepare release 4.0.21-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index ed8dc65..5fcc14f 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.21-SNAPSHOT + 4.0.21 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index a272ec5..4ed40d8 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.21-SNAPSHOT + 4.0.21 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 7a4fcb2..c121653 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.21-SNAPSHOT + 4.0.21 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index 01427b8..0b3481d 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.21-SNAPSHOT + 4.0.21 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index 4a7ecc4..79690b5 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.21-SNAPSHOT + 4.0.21 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index 34e49e7..7a46037 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.21-SNAPSHOT + 4.0.21 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.21-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.21-SNAPSHOT + 4.0.21 21 diff --git a/pom.xml b/pom.xml index ef06759..3c5793b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index bf4da73..108fcd0 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.21-SNAPSHOT + 4.0.21 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index 4a639dd..d3ceb24 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.21-SNAPSHOT + 4.0.21 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index b85d614..d0a4b17 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.21-SNAPSHOT + 4.0.21 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21-SNAPSHOT + 4.0.21 ${parent.scm.connection} - HEAD + 4.0.21-${env.BUILD_NUMBER} From e75f7c080b29a548cdeda0ac3239905aa2e05157 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 15:41:07 +0000 Subject: [PATCH 30/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 5fcc14f..a841445 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.21 + 4.0.22-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index 4ed40d8..75b50d0 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.21 + 4.0.22-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index c121653..8c79f53 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.21 + 4.0.22-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index 0b3481d..926f9b2 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.21 + 4.0.22-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 79690b5..cf4d581 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.21 + 4.0.22-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index 7a46037..182c56d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.21 + 4.0.22-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.21-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.21 + 4.0.22-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index 3c5793b..c81f762 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 108fcd0..b802a0f 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.21 + 4.0.22-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index d3ceb24..18e8c75 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.21 + 4.0.22-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index d0a4b17..411b9f0 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.21 + 4.0.22-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.21 + 4.0.22-SNAPSHOT ${parent.scm.connection} - 4.0.21-${env.BUILD_NUMBER} + HEAD From c59947ee33a5b03d468fb9796fa95f40cfaf44cb Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 16:54:36 +0100 Subject: [PATCH 31/46] add release stage --- pipeline.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index 8c8107f..688fe9c 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -27,6 +27,20 @@ jobs: git checkout $(Build.SourceBranchName) displayName: Checkout branch + - script: | + LAST_COMMIT_MESSAGE="$(git log -1 --pretty=%B)" + echo "Last commit message: $LAST_COMMIT_MESSAGE" + + if [[ "$LAST_COMMIT_MESSAGE" == *"maven-release-plugin"* ]] || \ + [[ "$LAST_COMMIT_MESSAGE" == *"bump-new-npm-version"* ]]; then + echo "Previous commit was a release commit. Skipping Maven release." + echo "##vso[task.setvariable variable=skipRelease]true" + else + echo "##vso[task.setvariable variable=skipRelease]false" + fi + displayName: Check last commit message + + - script: | git config user.email "imports-jenkins@defra.onmicrosoft.com" git config user.name "imports-jenkins" @@ -69,6 +83,7 @@ jobs: - task: Maven@4 displayName: 'Release' + condition: and(succeeded(), ne(variables['skipRelease'], 'true')) inputs: mavenPomFile: 'pom.xml' mavenOptions: '-Xmx512m $(MAVEN_OPTS)' From b09b7d5dbe3e23dddb592e8c1f0193c10a9539cd Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 15:59:26 +0000 Subject: [PATCH 32/46] [maven-release-plugin] prepare release 4.0.22-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index a841445..d1feb5f 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.22-SNAPSHOT + 4.0.22 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index 75b50d0..729ce68 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.22-SNAPSHOT + 4.0.22 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 8c79f53..3defea3 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.22-SNAPSHOT + 4.0.22 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index 926f9b2..6208e03 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.22-SNAPSHOT + 4.0.22 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index cf4d581..198163f 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.22-SNAPSHOT + 4.0.22 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index 182c56d..4685c5d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.22-SNAPSHOT + 4.0.22 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.22-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.22-SNAPSHOT + 4.0.22 21 diff --git a/pom.xml b/pom.xml index c81f762..1258fdb 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index b802a0f..f614b7d 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.22-SNAPSHOT + 4.0.22 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index 18e8c75..3b0317b 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.22-SNAPSHOT + 4.0.22 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index 411b9f0..cdda4d0 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.22-SNAPSHOT + 4.0.22 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22-SNAPSHOT + 4.0.22 ${parent.scm.connection} - HEAD + 4.0.22-${env.BUILD_NUMBER} From 877d83000cc1dfc78e378cace5124b1919842df4 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 15:59:29 +0000 Subject: [PATCH 33/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index d1feb5f..c235691 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.22 + 4.0.23-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index 729ce68..d499260 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.22 + 4.0.23-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 3defea3..fb18452 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.22 + 4.0.23-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index 6208e03..c277757 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.22 + 4.0.23-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 198163f..b043b01 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.22 + 4.0.23-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index 4685c5d..18dc35e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.22 + 4.0.23-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.22-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.22 + 4.0.23-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index 1258fdb..4e1fdca 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index f614b7d..9890642 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.22 + 4.0.23-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index 3b0317b..d13953c 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.22 + 4.0.23-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index cdda4d0..ca5b95b 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.22 + 4.0.23-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.22 + 4.0.23-SNAPSHOT ${parent.scm.connection} - 4.0.22-${env.BUILD_NUMBER} + HEAD From 843b3fc8c132e703be507cfc4c53f172d0c92a00 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 17:03:49 +0100 Subject: [PATCH 34/46] add release stage --- pipeline.yaml | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index 688fe9c..737788c 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -12,8 +12,8 @@ pool: name: 'DEFRA-COMMON-UBUNTU-SSV5' jobs: - - job: Build - displayName: Build + - job: Release + displayName: Release condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/main')) variables: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository @@ -62,25 +62,6 @@ jobs: path: $(MAVEN_CACHE_FOLDER) displayName: Cache Maven local repo - - task: Maven@4 - displayName: 'Build and Test' - inputs: - mavenPomFile: 'pom.xml' - mavenOptions: '-Xmx512m $(MAVEN_OPTS)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.21' - jdkArchitectureOption: 'x64' - publishJUnitResults: true - testResultsFiles: '**/surefire-reports/*.xml' - options: '--s $(mavenSettings.secureFilePath)' - goals: 'clean test jacoco:report deploy --batch-mode' - - - task: PublishCodeCoverageResults@2 - displayName: 'Publish code coverage' - inputs: - summaryFileLocation: $(System.DefaultWorkingDirectory)/service/target/site/jacoco/jacoco.xml - pathToSources: $(System.DefaultWorkingDirectory)/service/src/main/java/ - - task: Maven@4 displayName: 'Release' condition: and(succeeded(), ne(variables['skipRelease'], 'true')) @@ -91,5 +72,5 @@ jobs: jdkVersionOption: '1.21' jdkArchitectureOption: 'x64' options: '--s $(mavenSettings.secureFilePath)' - goals: '--batch-mode release:prepare release:perform -DskipTests=true' + goals: '--batch-mode clean test package release:prepare release:perform' From a54fcdcf05e984e07f03e6db7cf084fcdb5442f5 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 16:08:45 +0000 Subject: [PATCH 35/46] [maven-release-plugin] prepare release 4.0.23-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index c235691..4850bcb 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.23-SNAPSHOT + 4.0.23 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index d499260..a441d5d 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.23-SNAPSHOT + 4.0.23 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index fb18452..34de164 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.23-SNAPSHOT + 4.0.23 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index c277757..a4210fa 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.23-SNAPSHOT + 4.0.23 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index b043b01..096286f 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.23-SNAPSHOT + 4.0.23 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index 18dc35e..e1c4422 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.23-SNAPSHOT + 4.0.23 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.23-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.23-SNAPSHOT + 4.0.23 21 diff --git a/pom.xml b/pom.xml index 4e1fdca..76560c7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 9890642..bf0ba57 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.23-SNAPSHOT + 4.0.23 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index d13953c..aa5ae4b 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.23-SNAPSHOT + 4.0.23 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index ca5b95b..d605ecb 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.23-SNAPSHOT + 4.0.23 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23-SNAPSHOT + 4.0.23 ${parent.scm.connection} - HEAD + 4.0.23-${env.BUILD_NUMBER} From 5868f5f4b0a94a0bb66dff75003bc84d90c05ac7 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 16:08:49 +0000 Subject: [PATCH 36/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 4850bcb..ae574fb 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.23 + 4.0.24-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index a441d5d..63e90d9 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.23 + 4.0.24-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 34de164..364cb3c 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.23 + 4.0.24-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index a4210fa..a0559e8 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.23 + 4.0.24-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 096286f..d325803 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.23 + 4.0.24-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index e1c4422..cc3b725 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.23 + 4.0.24-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.23-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.23 + 4.0.24-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index 76560c7..12995b4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index bf0ba57..731132e 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.23 + 4.0.24-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index aa5ae4b..53c6290 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.23 + 4.0.24-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index d605ecb..e94bc66 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.23 + 4.0.24-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.23 + 4.0.24-SNAPSHOT ${parent.scm.connection} - 4.0.23-${env.BUILD_NUMBER} + HEAD From 1fb530555739acbf78e12eef0d78c779dda9df72 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 17:15:27 +0100 Subject: [PATCH 37/46] add release stage --- pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index 737788c..df1f0ca 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -14,7 +14,7 @@ pool: jobs: - job: Release displayName: Release - condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(not(failed()), not(canceled()), ne(variables['skipRelease'], 'true'), ne(variables['Build.SourceBranch'], 'refs/heads/main')) variables: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' From 0ee2e12755a77f91e15e56c53d81f8da8bceb9b2 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 16:18:48 +0000 Subject: [PATCH 38/46] [maven-release-plugin] prepare release 4.0.24-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index ae574fb..3d6a295 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.24-SNAPSHOT + 4.0.24 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index 63e90d9..d9f9d95 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.24-SNAPSHOT + 4.0.24 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 364cb3c..09caa53 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.24-SNAPSHOT + 4.0.24 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index a0559e8..5e96b01 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.24-SNAPSHOT + 4.0.24 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index d325803..7d9c3f9 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.24-SNAPSHOT + 4.0.24 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index cc3b725..dbef34a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.24-SNAPSHOT + 4.0.24 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.24-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.24-SNAPSHOT + 4.0.24 21 diff --git a/pom.xml b/pom.xml index 12995b4..d5427fd 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 731132e..4138796 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.24-SNAPSHOT + 4.0.24 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index 53c6290..a9bb965 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.24-SNAPSHOT + 4.0.24 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index e94bc66..71afcee 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.24-SNAPSHOT + 4.0.24 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24-SNAPSHOT + 4.0.24 ${parent.scm.connection} - HEAD + 4.0.24-${env.BUILD_NUMBER} From d3f74bdf2bfddf58fca975c1fe6e0bfe24e04bfd Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 16:18:52 +0000 Subject: [PATCH 39/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 3d6a295..d47981f 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.24 + 4.0.25-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index d9f9d95..629f717 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.24 + 4.0.25-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 09caa53..e7dc958 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.24 + 4.0.25-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index 5e96b01..64d2458 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.24 + 4.0.25-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 7d9c3f9..ea46e36 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.24 + 4.0.25-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index dbef34a..5611a96 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.24 + 4.0.25-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.24-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.24 + 4.0.25-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index d5427fd..44c2382 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 4138796..51dda87 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.24 + 4.0.25-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index a9bb965..ccd7b56 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.24 + 4.0.25-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index 71afcee..244dddf 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.24 + 4.0.25-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.24 + 4.0.25-SNAPSHOT ${parent.scm.connection} - 4.0.24-${env.BUILD_NUMBER} + HEAD From 4571ee8d8bd10117f4d10cdac66df304a9d27b4a Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Fri, 31 Jul 2026 17:23:41 +0100 Subject: [PATCH 40/46] add release stage --- pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index df1f0ca..737788c 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -14,7 +14,7 @@ pool: jobs: - job: Release displayName: Release - condition: and(not(failed()), not(canceled()), ne(variables['skipRelease'], 'true'), ne(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/main')) variables: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' From 1d78486b9e7a5f5fb710e09d0b4d253da280f326 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 16:26:28 +0000 Subject: [PATCH 41/46] [maven-release-plugin] prepare release 4.0.25-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index d47981f..243015a 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.25-SNAPSHOT + 4.0.25 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index 629f717..e5a36b0 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.25-SNAPSHOT + 4.0.25 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index e7dc958..361b034 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.25-SNAPSHOT + 4.0.25 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index 64d2458..69894d2 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.25-SNAPSHOT + 4.0.25 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index ea46e36..763493d 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.25-SNAPSHOT + 4.0.25 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index 5611a96..b79dcb7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.25-SNAPSHOT + 4.0.25 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.25-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.25-SNAPSHOT + 4.0.25 21 diff --git a/pom.xml b/pom.xml index 44c2382..9fdf443 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 51dda87..3bc9deb 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.25-SNAPSHOT + 4.0.25 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index ccd7b56..aa418b9 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.25-SNAPSHOT + 4.0.25 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index 244dddf..e19f6ce 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.25-SNAPSHOT + 4.0.25 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25-SNAPSHOT + 4.0.25 ${parent.scm.connection} - HEAD + 4.0.25-${env.BUILD_NUMBER} From a0a201417466e6e349a8159cf55fc0b96f35429e Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Fri, 31 Jul 2026 16:26:32 +0000 Subject: [PATCH 42/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 243015a..648cdc6 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.25 + 4.0.26-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index e5a36b0..5166264 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.25 + 4.0.26-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index 361b034..be015c6 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.25 + 4.0.26-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index 69894d2..698e062 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.25 + 4.0.26-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 763493d..bd468b1 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.25 + 4.0.26-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index b79dcb7..6052ab3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.25 + 4.0.26-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.25-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.25 + 4.0.26-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index 9fdf443..36c5a22 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 3bc9deb..4ac6ccc 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.25 + 4.0.26-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index aa418b9..f3648a5 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.25 + 4.0.26-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index e19f6ce..41f3720 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.25 + 4.0.26-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.25 + 4.0.26-SNAPSHOT ${parent.scm.connection} - 4.0.25-${env.BUILD_NUMBER} + HEAD From 724e90e525740ce466aa0cfc8feeaa0a1998b5b1 Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Mon, 3 Aug 2026 11:37:07 +0100 Subject: [PATCH 43/46] add release stage --- pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline.yaml b/pipeline.yaml index 737788c..6b25fe4 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -14,7 +14,7 @@ pool: jobs: - job: Release displayName: Release - condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(not(failed()), not(canceled()), ne(variables['Build.SourceBranch'], 'refs/heads/master')) variables: MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' From 6d6d33f3c88d513b54cdbfe38f407a105d980225 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Mon, 3 Aug 2026 10:50:11 +0000 Subject: [PATCH 44/46] [maven-release-plugin] prepare release 4.0.26-${env.BUILD_NUMBER} --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 648cdc6..6ab2e6e 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.26-SNAPSHOT + 4.0.26 azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/event/pom.xml b/event/pom.xml index 5166264..56f6e19 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.26-SNAPSHOT + 4.0.26 event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/health-tests/pom.xml b/health-tests/pom.xml index be015c6..a4bc7ce 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.26-SNAPSHOT + 4.0.26 health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/health/pom.xml b/health/pom.xml index 698e062..ed1f11a 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.26-SNAPSHOT + 4.0.26 health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/logging/pom.xml b/logging/pom.xml index bd468b1..4b35754 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.26-SNAPSHOT + 4.0.26 logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/parent/pom.xml b/parent/pom.xml index 6052ab3..299250f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.26-SNAPSHOT + 4.0.26 pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.26-${env.BUILD_NUMBER} @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.26-SNAPSHOT + 4.0.26 21 diff --git a/pom.xml b/pom.xml index 36c5a22..c6852b4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/security-tests/pom.xml b/security-tests/pom.xml index 4ac6ccc..a8ef405 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.26-SNAPSHOT + 4.0.26 security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/security/pom.xml b/security/pom.xml index f3648a5..0aa1b89 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.26-SNAPSHOT + 4.0.26 security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 @@ -19,7 +19,7 @@ ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} diff --git a/version/pom.xml b/version/pom.xml index 41f3720..f428e70 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.26-SNAPSHOT + 4.0.26 version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26-SNAPSHOT + 4.0.26 ${parent.scm.connection} - HEAD + 4.0.26-${env.BUILD_NUMBER} From 20ef8436145abc99e01937bd37c77b3d16442cf6 Mon Sep 17 00:00:00 2001 From: imports-jenkins Date: Mon, 3 Aug 2026 10:50:14 +0000 Subject: [PATCH 45/46] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 6 +++--- event/pom.xml | 6 +++--- health-tests/pom.xml | 6 +++--- health/pom.xml | 6 +++--- logging/pom.xml | 6 +++--- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- security-tests/pom.xml | 6 +++--- security/pom.xml | 6 +++--- version/pom.xml | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 6ab2e6e..2e4ce04 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-azure - 4.0.26 + 4.0.27-SNAPSHOT azure uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/event/pom.xml b/event/pom.xml index 56f6e19..e0769c9 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-event - 4.0.26 + 4.0.27-SNAPSHOT event uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/health-tests/pom.xml b/health-tests/pom.xml index a4bc7ce..042d21a 100644 --- a/health-tests/pom.xml +++ b/health-tests/pom.xml @@ -3,7 +3,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health-tests - 4.0.26 + 4.0.27-SNAPSHOT health-tests An integration test library for testing correct deployment of the Shared Spring Boot health Configuration @@ -12,12 +12,12 @@ uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/health/pom.xml b/health/pom.xml index ed1f11a..bac5aff 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -3,18 +3,18 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-health - 4.0.26 + 4.0.27-SNAPSHOT health uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/logging/pom.xml b/logging/pom.xml index 4b35754..70ef681 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-logging - 4.0.26 + 4.0.27-SNAPSHOT logging uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/parent/pom.xml b/parent/pom.xml index 299250f..8e744a0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ uk.gov.defra.tracesx tracesx-springboot-common-parent - 4.0.26 + 4.0.27-SNAPSHOT pom parent @@ -26,7 +26,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.26-${env.BUILD_NUMBER} + HEAD @@ -37,7 +37,7 @@ ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server --> - 4.0.26 + 4.0.27-SNAPSHOT 21 diff --git a/pom.xml b/pom.xml index c6852b4..71516d7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT pom Shared Spring Boot: Common Libraries Parent and Aggregator Module common-parent @@ -52,7 +52,7 @@ scm:git:https://github.com/DEFRA/ipaffs-spring-boot-common.git - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/security-tests/pom.xml b/security-tests/pom.xml index a8ef405..6dd5b8f 100644 --- a/security-tests/pom.xml +++ b/security-tests/pom.xml @@ -3,19 +3,19 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security-tests - 4.0.26 + 4.0.27-SNAPSHOT security-tests An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/security/pom.xml b/security/pom.xml index 0aa1b89..b8af8f0 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -3,14 +3,14 @@ 4.0.0 uk.gov.defra.tracesx tracesx-springboot-common-security - 4.0.26 + 4.0.27-SNAPSHOT security Shared Spring Boot Web Security configuration uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT @@ -19,7 +19,7 @@ ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD diff --git a/version/pom.xml b/version/pom.xml index f428e70..c17643b 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -3,18 +3,18 @@ 4.0.0 tracesx-springboot-common-version - 4.0.26 + 4.0.27-SNAPSHOT version uk.gov.defra.tracesx tracesx-springboot-common - 4.0.26 + 4.0.27-SNAPSHOT ${parent.scm.connection} - 4.0.26-${env.BUILD_NUMBER} + HEAD From 1b1b9878518d3acad7373bef1ec017facb0fbb8f Mon Sep 17 00:00:00 2001 From: "andrew.hardy" <13727398+andywhardy@users.noreply.github.com> Date: Mon, 3 Aug 2026 14:13:35 +0100 Subject: [PATCH 46/46] add release stage --- pipeline.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pipeline.yaml b/pipeline.yaml index 6b25fe4..b3d09f6 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -46,12 +46,11 @@ jobs: git config user.name "imports-jenkins" displayName: "Git author" - - task: DownloadSecureFile@1 name: mavenSettings displayName: 'Download Maven Settings' inputs: - secureFile: 'maven.xml' + secureFile: 'maven-settings.xml' - task: Cache@2 inputs: @@ -72,5 +71,5 @@ jobs: jdkVersionOption: '1.21' jdkArchitectureOption: 'x64' options: '--s $(mavenSettings.secureFilePath)' - goals: '--batch-mode clean test package release:prepare release:perform' + goals: '--batch-mode release:prepare release:perform'