Ado pipeline

azure/pom.xml

@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>uk.gov.defra.tracesx</groupId>
-  <artifactId>TracesX-SpringBoot-Common-Azure</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-azure</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <name>azure</name>
 
   <parent>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
   </parent>
 
   <scm>

event/pom.xml

@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common-Event</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common-event</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
     <name>event</name>
 
     <parent>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common</artifactId>
-        <version>4.0.19-SNAPSHOT</version>
+        <artifactId>tracesx-springboot-common</artifactId>
+        <version>4.0.26-SNAPSHOT</version>
     </parent>
 
     <scm>

health-tests/pom.xml

@@ -2,17 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>uk.gov.defra.tracesx</groupId>
-  <artifactId>TracesX-SpringBoot-Common-Health-Tests</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-health-tests</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <name>health-tests</name>
   <description>An integration test library for testing correct deployment of the Shared Spring Boot health
     Configuration
   </description>
 
   <parent>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
   </parent>
 
   <scm>

health/pom.xml

@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>uk.gov.defra.tracesx</groupId>
-  <artifactId>TracesX-SpringBoot-Common-Health</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-health</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <name>health</name>
 
   <parent>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
   </parent>
 
   <scm>

logging/pom.xml

@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>TracesX-SpringBoot-Common-Logging</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-logging</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <name>logging</name>
 
   <parent>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
   </parent>
 
   <scm>

parent/pom.xml

@@ -2,8 +2,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>uk.gov.defra.tracesx</groupId>
-  <artifactId>TracesX-SpringBoot-Common-Parent</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-parent</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>parent</name>
@@ -12,19 +12,15 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.5.5</version>
+    <version>3.5.14</version>
   </parent>
 
+
   <distributionManagement>
-    <snapshotRepository>
-      <id>release</id>
-      <name>Snapshots</name>
-      <url>https://artifactoryv2.azure.defra.cloud/artifactory/maven-snapshots-local</url>
-    </snapshotRepository>
     <repository>
-      <id>release</id>
-      <name>Releases</name>
-      <url>${repo.releases.url}</url>
+      <id>github</id>
+      <name>GitHub Packages</name>
+      <url>https://maven.pkg.github.com/DEFRA/ipaffs-spring-boot-common</url>
     </repository>
   </distributionManagement>
 
@@ -41,7 +37,7 @@
 
     ie it will get bumped/have -SNAPSHOT added/removed when the main build runs on the CI server
     -->
-    <tracesx.springboot.common.version>4.0.19-SNAPSHOT</tracesx.springboot.common.version>
+    <tracesx.springboot.common.version>4.0.26-SNAPSHOT</tracesx.springboot.common.version>
 
     <java.version>21</java.version>
 
@@ -82,42 +78,42 @@
     <dependencies>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Azure</artifactId>
+        <artifactId>tracesx-springboot-common-azure</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Event</artifactId>
+        <artifactId>tracesx-springboot-common-event</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Health</artifactId>
+        <artifactId>tracesx-springboot-common-health</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Health-Tests</artifactId>
+        <artifactId>tracesx-springboot-common-health-tests</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Logging</artifactId>
+        <artifactId>tracesx-springboot-common-logging</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Security</artifactId>
+        <artifactId>tracesx-springboot-common-security</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Security-Tests</artifactId>
+        <artifactId>tracesx-springboot-common-security-tests</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>
         <groupId>uk.gov.defra.tracesx</groupId>
-        <artifactId>TracesX-SpringBoot-Common-Version</artifactId>
+        <artifactId>tracesx-springboot-common-version</artifactId>
         <version>${tracesx.springboot.common.version}</version>
       </dependency>
       <dependency>

pipeline.yaml

@@ -0,0 +1,76 @@
+trigger:
+  branches:
+    include:
+      - '*'
+
+pr:
+  branches:
+    exclude:
+      - '*'
+
+pool:
+  name: 'DEFRA-COMMON-UBUNTU-SSV5'
+
+jobs:
+  - 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
+      MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+    steps:
+      - checkout: self
+        persistCredentials: true
+        fetchDepth: 0
+
+      - script: |
+          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"
+        displayName: "Git author"
+
+
+      - 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: 'Release'
+        condition: and(succeeded(), ne(variables['skipRelease'], 'true'))
+        inputs:
+          mavenPomFile: 'pom.xml'
+          mavenOptions: '-Xmx512m $(MAVEN_OPTS)'
+          javaHomeOption: 'JDKVersion'
+          jdkVersionOption: '1.21'
+          jdkArchitectureOption: 'x64'
+          options: '--s $(mavenSettings.secureFilePath)'
+          goals: '--batch-mode clean test package release:prepare release:perform'
+

pom.xml

@@ -1,16 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>uk.gov.defra.tracesx</groupId>
-  <artifactId>TracesX-SpringBoot-Common</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Shared Spring Boot: Common Libraries Parent and Aggregator Module</description>
   <name>common-parent</name>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-dependencies</artifactId>
-    <version>3.5.5</version>
+    <version>3.5.14</version>
   </parent>
 
   <properties>
@@ -68,7 +68,7 @@
   </modules>
 
   <distributionManagement>
-    <snapshotRepository>
+<!--    <snapshotRepository>
       <id>release</id>
       <name>Snapshots</name>
       <url>https://artifactoryv2.azure.defra.cloud/artifactory/maven-snapshots-local</url>
@@ -77,6 +77,11 @@
       <id>release</id>
       <name>Releases</name>
       <url>${repo.releases.url}</url>
+    </repository>-->
+    <repository>
+      <id>github</id>
+      <name>GitHub Packages</name>
+      <url>https://maven.pkg.github.com/DEFRA/ipaffs-spring-boot-common</url>
     </repository>
   </distributionManagement>
 

security-tests/pom.xml

@@ -2,25 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>uk.gov.defra.tracesx</groupId>
-  <artifactId>TracesX-SpringBoot-Common-Security-Tests</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-security-tests</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <name>security-tests</name>
   <description>An integration test library for testing correct deployment of the Shared Spring Boot Web Security Configuration</description>
 
   <parent>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
   </parent>
 
-  <distributionManagement>
-    <repository>
-      <id>release</id>
-      <name>Releases</name>
-      <url>${repo.releases.url}</url>
-    </repository>
-  </distributionManagement>
-
   <scm>
     <connection>${parent.scm.connection}</connection>
     <tag>HEAD</tag>

security/pom.xml

@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>uk.gov.defra.tracesx</groupId>
-  <artifactId>TracesX-SpringBoot-Common-Security</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-security</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <name>security</name>
   <description>Shared Spring Boot Web Security configuration</description>
 
   <parent>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
   </parent>
 
   <properties>

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")) {

version/pom.xml

@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>TracesX-SpringBoot-Common-Version</artifactId>
-  <version>4.0.19-SNAPSHOT</version>
+  <artifactId>tracesx-springboot-common-version</artifactId>
+  <version>4.0.26-SNAPSHOT</version>
   <name>version</name>
 
   <parent>
     <groupId>uk.gov.defra.tracesx</groupId>
-    <artifactId>TracesX-SpringBoot-Common</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <artifactId>tracesx-springboot-common</artifactId>
+    <version>4.0.26-SNAPSHOT</version>
   </parent>
 
   <scm>