From 1638c75cecd3cf7952abc3966a674e80ba3cb3c0 Mon Sep 17 00:00:00 2001
From: Tommy Schmidt <tommy.schmidt@idealo.de>
Date: Tue, 5 Sep 2023 12:28:46 +0200
Subject: [PATCH] fix: update wiremock to version 3, release to maven central

---
 .github/workflows/build.yml                 | 39 +++++++++++++++++----
 .github/workflows/publish-maven-central.yml | 34 ------------------
 feign-aws-sigv4-sdkv1/pom.xml               |  4 +--
 feign-aws-sigv4-sdkv2/pom.xml               |  4 +--
 pom.xml                                     |  7 ++--
 5 files changed, 39 insertions(+), 49 deletions(-)
 delete mode 100644 .github/workflows/publish-maven-central.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dafc7ab..b8758c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,18 +14,20 @@ concurrency:
   group: ci-main
 
 permissions:
-  # used by cycjimmy/semantic-release-action
-  contents: write
-  issues: write
-  pull-requests: write
-  packages: write
-  # used by aws-actions/configure-aws-credentials
-  id-token: write
+  contents: read
 
 jobs:
   build:
     name: Build & Release
     runs-on: ubuntu-latest
+    permissions:
+      # used by cycjimmy/semantic-release-action
+      contents: write
+      issues: write
+      pull-requests: write
+      packages: write
+      # used by aws-actions/configure-aws-credentials
+      id-token: write
     steps:
       - uses: actions/checkout@v3
         with:
@@ -105,3 +107,26 @@ jobs:
             @semantic-release/exec
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-maven-central:
+    name: Publish to Maven Central
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'maven'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+
+      - name: Publish package
+        run: mvn -B -ntp -Ppublish-ossrh clean deploy -DskipTests
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
diff --git a/.github/workflows/publish-maven-central.yml b/.github/workflows/publish-maven-central.yml
deleted file mode 100644
index 668698f..0000000
--- a/.github/workflows/publish-maven-central.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Publish to Maven Central
-on:
-  release:
-    types:
-      - created
-
-concurrency:
-  group: publish-maven-central
-
-permissions:
-  contents: read
-
-jobs:
-  publish:
-    name: Publish to Maven Central
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'maven'
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-
-      - name: Publish package
-        run: mvn -B -ntp -Ppublish-ossrh clean deploy -DskipTests
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
diff --git a/feign-aws-sigv4-sdkv1/pom.xml b/feign-aws-sigv4-sdkv1/pom.xml
index 034208c..d582d8d 100644
--- a/feign-aws-sigv4-sdkv1/pom.xml
+++ b/feign-aws-sigv4-sdkv1/pom.xml
@@ -51,8 +51,8 @@
 
         <!-- Wiremock -->
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/feign-aws-sigv4-sdkv2/pom.xml b/feign-aws-sigv4-sdkv2/pom.xml
index a7929bd..281c015 100644
--- a/feign-aws-sigv4-sdkv2/pom.xml
+++ b/feign-aws-sigv4-sdkv2/pom.xml
@@ -51,8 +51,8 @@
 
         <!-- Wiremock -->
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 99caae9..4653a61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <awssdk-v2.version>2.20.140</awssdk-v2.version>
         <feign.version>12.5</feign.version>
         <assertj.version>3.24.2</assertj.version>
-        <wiremock.version>2.35.0</wiremock.version>
+        <wiremock.version>3.0.1</wiremock.version>
 
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
@@ -128,10 +128,9 @@
 
             <!-- Wiremock -->
             <dependency>
-                <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock-jre8</artifactId>
+                <groupId>org.wiremock</groupId>
+                <artifactId>wiremock</artifactId>
                 <version>${wiremock.version}</version>
-                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>