From 41c7c4ef6cda9610f4e56d1678a421aba16af8b9 Mon Sep 17 00:00:00 2001
From: Andrus Adamchik <andrus@objectstyle.com>
Date: Fri, 19 Apr 2024 11:55:27 -0400
Subject: [PATCH]  Upgrade to Wiremock 3.5.0 #86

---
 RELEASE-NOTES.md                                              | 4 ++++
 bootique-jersey-jakarta-client-junit5-wiremock/pom.xml        | 4 ++--
 .../client/junit5/wiremock/WireMockRedirectRewriter.java      | 1 +
 pom.xml                                                       | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7c1ae6f..ba60e28 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,7 @@
+## 3.0-M4
+
+* #86 Upgrade to Wiremock 3.5.0
+
 ## 3.0-M3
 
 * #84 (Jakarta migration) Deprecate JAX-RS 2 modules
diff --git a/bootique-jersey-jakarta-client-junit5-wiremock/pom.xml b/bootique-jersey-jakarta-client-junit5-wiremock/pom.xml
index 2369246..ae91c57 100644
--- a/bootique-jersey-jakarta-client-junit5-wiremock/pom.xml
+++ b/bootique-jersey-jakarta-client-junit5-wiremock/pom.xml
@@ -38,7 +38,7 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>com.github.tomakehurst</groupId>
+				<groupId>org.wiremock</groupId>
 				<artifactId>wiremock</artifactId>
 				<version>${wiremock.version}</version>
 				<exclusions>
@@ -115,7 +115,7 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
+			<groupId>org.wiremock</groupId>
 			<artifactId>wiremock</artifactId>
 		</dependency>
 		<dependency>
diff --git a/bootique-jersey-jakarta-client-junit5-wiremock/src/main/java/io/bootique/jersey/client/junit5/wiremock/WireMockRedirectRewriter.java b/bootique-jersey-jakarta-client-junit5-wiremock/src/main/java/io/bootique/jersey/client/junit5/wiremock/WireMockRedirectRewriter.java
index daa1a74..8669d20 100644
--- a/bootique-jersey-jakarta-client-junit5-wiremock/src/main/java/io/bootique/jersey/client/junit5/wiremock/WireMockRedirectRewriter.java
+++ b/bootique-jersey-jakarta-client-junit5-wiremock/src/main/java/io/bootique/jersey/client/junit5/wiremock/WireMockRedirectRewriter.java
@@ -138,6 +138,7 @@ public StubMapping transform(StubMapping stubMapping, FileSource files, Paramete
                         response.getBodyFileName(),
                         newHeaders,
                         response.getAdditionalProxyRequestHeaders(),
+                        response.getRemoveProxyRequestHeaders(),
                         response.getFixedDelayMilliseconds(),
                         response.getDelayDistribution(),
                         response.getChunkedDribbleDelay(),
diff --git a/pom.xml b/pom.xml
index 47c8d16..dbb3c43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <activation2.version>2.0.1</activation2.version>
         <glassfish.jaxb3.version>3.0.1</glassfish.jaxb3.version>
         <jaxb3.version>3.0.1</jaxb3.version>
-        <wiremock.version>3.0.0-beta-5</wiremock.version>
+        <wiremock.version>3.5.3</wiremock.version>
     </properties>
 
     <scm>