From d3042faa09c1b577e21a8db02cf4d3b673c8ec5a Mon Sep 17 00:00:00 2001
From: Peder Korsveien <peder.korsveien@bekk.no>
Date: Fri, 8 Aug 2025 11:10:42 +0200
Subject: [PATCH 1/4] Replace maven publish step with updated credentials

- Replace publish step in order to use new signing key
- Bump dependency on super-pom to release using new signing key
---
 .github/workflows/build.yml | 61 ++++++++++++++++++++-----------------
 pom.xml                     |  2 +-
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c6f2df..e2767d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,36 +22,41 @@ jobs:
       - name: Build with Maven
         run: mvn verify
 
-
-  publishing_parameters:
-    name: Publishing parameters
+  publish:
+    needs: build
+    name: Publish ${GITHUB_REF_NAME}
     runs-on: ubuntu-latest
-    outputs:
-      is_release: ${{ steps.version.outputs.is_release }}
-      version: ${{ steps.version.outputs.version }}
     steps:
-      - name: Determine version
-        id: version
+      - uses: actions/checkout@v4.2.2
+      - name: Set up Java
+        uses: actions/setup-java@v4.7.1
+        with:
+          distribution: temurin
+          java-version: '21'
+          cache: "maven"
+          gpg-private-key: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PRIVATE }}
+          server-id: central
+          server-username: MAVEN_CENTRAL_TOKEN_USERNAME
+          server-password: MAVEN_CENTRAL_TOKEN_PASSWORD
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+      - name: Activate Artifact Signing and Version Suffix
         run: |
-          if [[ $GITHUB_REF == *"tags"* ]]; then
-            is_release=true
-            version=${GITHUB_REF#refs/tags/}
+          profiles="build-sources-and-javadoc,deploy-to-maven-central"
+          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
+            profiles="$profiles,sign-artifacts"
+            version_suffix=""
           else
-            is_release=false
-            version=${GITHUB_REF#refs/heads/}-SNAPSHOT
+            version_suffix="-SNAPSHOT"
           fi
-          echo "is_release=${is_release//\//-}" >> $GITHUB_OUTPUT
-          echo "version=${version//\//-}" >> $GITHUB_OUTPUT
-
-
-  publish:
-    needs: [build, publishing_parameters]
-    name: Publish ${{ needs.publishing_parameters.outputs.version }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: digipost/action-maven-publish@v1
-        with:
-          sonatype_secrets: ${{ secrets.sonatype_secrets }}
-          release_version: ${{ needs.publishing_parameters.outputs.version }}
-          perform_release: ${{ needs.publishing_parameters.outputs.is_release }}
+          echo "MAVEN_PROFILES=$profiles" >> $GITHUB_ENV
+          version="${GITHUB_REF_NAME}${version_suffix}"
+          echo "VERSION=$version" >> $GITHUB_ENV
+      - name: Set Maven version
+        run: mvn --batch-mode --no-transfer-progress versions:set -DnewVersion=${VERSION}
+      - name: Build and deploy to Maven Central
+        run: |
+          mvn --batch-mode --no-transfer-progress --activate-profiles ${MAVEN_PROFILES} deploy
+        env:
+          MAVEN_CENTRAL_TOKEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_TOKEN_USERNAME }}
+          MAVEN_CENTRAL_TOKEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PASSPHRASE }}
diff --git a/pom.xml b/pom.xml
index 66a877b..10b8554 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>no.digipost</groupId>
         <artifactId>digipost-open-super-pom</artifactId>
-        <version>13</version>
+        <version>14</version>
     </parent>
 
     <artifactId>http-client-builder5</artifactId>

From b03c8061d48f8511b0c2a2a24683901891063107 Mon Sep 17 00:00:00 2001
From: Peder Korsveien <peder.korsveien@bekk.no>
Date: Fri, 8 Aug 2025 11:29:29 +0200
Subject: [PATCH 2/4] Set version to 1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 10b8554..06ded08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>http-client-builder5</artifactId>
     <name>Digipost HTTP Client Builder</name>
     <description>Apache HTTP Client configured with sensible defaults.</description>
-    <version>LOCAL-SNAPSHOT</version>
+    <version>1</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

From e209a74354f3e062b5322228a8f56a22f03054c3 Mon Sep 17 00:00:00 2001
From: Peder Korsveien <peder.korsveien@bekk.no>
Date: Fri, 8 Aug 2025 11:44:26 +0200
Subject: [PATCH 3/4] Fix reference to env in name field

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2767d7..4816e41 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
 
   publish:
     needs: build
-    name: Publish ${GITHUB_REF_NAME}
+    name: Publish ${{ github.ref_name }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.2.2

From e08ed7de911feea9b1a367750c555d0454a672dc Mon Sep 17 00:00:00 2001
From: Peder Korsveien <peder.korsveien@bekk.no>
Date: Fri, 8 Aug 2025 11:45:59 +0200
Subject: [PATCH 4/4] Revert version-tag in POM

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 06ded08..10b8554 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>http-client-builder5</artifactId>
     <name>Digipost HTTP Client Builder</name>
     <description>Apache HTTP Client configured with sensible defaults.</description>
-    <version>1</version>
+    <version>LOCAL-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>