[JAVA-38358] (#17257)

panos-kakos · web-flow · commit 6e9af6e4cc6c · 2024-08-18T03:21:46.000+04:00
* [JAVA-38358] Upgraded wiremock version to 3.9.1

* [JAVA-38358] Upgraded rest-assured version to 5.5.0

* [JAVA-38358]

* [JAVA-38358] Reverted changes on parent modules

* [JAVA-38358]
diff --git a/apache-httpclient/pom.xml b/apache-httpclient/pom.xml
@@ -72,7 +72,7 @@
 
     <properties>
         <mockserver.version>5.6.1</mockserver.version>
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
         <!-- http client & core 5 -->
         <httpcore5.version>5.2.2</httpcore5.version>
         <httpclient5.version>5.2.2</httpclient5.version>
diff --git a/apache-httpclient4/pom.xml b/apache-httpclient4/pom.xml
@@ -232,7 +232,7 @@
         <commons-codec.version>1.16.0</commons-codec.version>
         <httpasyncclient.version>4.1.5</httpasyncclient.version>
         <!-- testing -->
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
         <httpcore.version>4.4.16</httpcore.version>
         <httpclient.version>4.5.14</httpclient.version>
         <mockserver.version>5.11.2</mockserver.version>
diff --git a/core-java-modules/core-java-httpclient/pom.xml b/core-java-modules/core-java-httpclient/pom.xml
@@ -50,7 +50,7 @@
 
     <properties>
         <mockserver.version>5.11.2</mockserver.version>
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-io-2/pom.xml b/core-java-modules/core-java-io-2/pom.xml
@@ -51,7 +51,7 @@
 
     <properties>
         <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
     </properties>
 
 </project>
diff --git a/httpclient-simple/pom.xml b/httpclient-simple/pom.xml
@@ -202,7 +202,7 @@
         <!-- util -->
         <commons-codec.version>1.16.0</commons-codec.version>
         <!-- testing -->
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
         <!-- http client & core 5 -->
         <httpcore5.version>5.2</httpcore5.version>
         <httpclient5.version>5.2</httpclient5.version>
diff --git a/patterns-modules/design-patterns-architectural/pom.xml b/patterns-modules/design-patterns-architectural/pom.xml
@@ -67,7 +67,7 @@
         <hibernate-core.version>6.5.2.Final</hibernate-core.version>
         <mysql-connector.version>8.2.0</mysql-connector.version>
         <spring-boot.version>3.1.5</spring-boot.version>
-        <rest-assured.version>5.3.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <spring-boot-starter-integration.version>2.7.5</spring-boot-starter-integration.version>
         <spring-integration-test.version>5.5.14</spring-integration-test.version>
         <camel-core.version>3.20.4</camel-core.version>
diff --git a/persistence-modules/spring-data-rest/pom.xml b/persistence-modules/spring-data-rest/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>3.3.0</version>
+            <version>${rest-assured.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -86,6 +86,7 @@
         <start-class>com.baeldung.books.SpringDataRestApplication</start-class>
         <maven.version>1.0</maven.version>
         <hibernate-community-dialects.version>6.1.7.Final</hibernate-community-dialects.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
     </properties>
 
 </project>
diff --git a/spring-boot-modules/spring-boot-3-testcontainers/pom.xml b/spring-boot-modules/spring-boot-3-testcontainers/pom.xml
@@ -111,7 +111,7 @@
     <properties>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <testcontainers.version>1.19.8</testcontainers.version>
-        <rest-assured.version>5.3.1</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <java.version>17</java.version>
         <postgresql.version>42.7.3</postgresql.version>
     </properties>
diff --git a/spring-boot-modules/spring-boot-mvc-2/pom.xml b/spring-boot-modules/spring-boot-mvc-2/pom.xml
@@ -52,8 +52,8 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
+            <version>${rest-assured.version}</version>
             <scope>test</scope>
-            <version>${rest-assured-version}</version>
         </dependency>
     </dependencies>
 
@@ -83,7 +83,7 @@
         <start-class>com.baeldung.springbootmvc.SpringBootMvcFnApplication</start-class>
         <maven.compiler.release>17</maven.compiler.release>
         <xstream.version>1.4.11.1</xstream.version>
-        <rest-assured-version>5.4.0</rest-assured-version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <spring-boot.version>3.2.2</spring-boot.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-swagger-springfox/pom.xml b/spring-boot-modules/spring-boot-swagger-springfox/pom.xml
@@ -40,7 +40,7 @@
 
     <properties>
         <springfox.version>3.0.0</springfox.version>
-        <rest-assured.version>5.4.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <start-class>com.baeldung.apiswagger.Application</start-class>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-testing-2/pom.xml b/spring-boot-modules/spring-boot-testing-2/pom.xml
@@ -118,7 +118,7 @@
         <testcontainers.version>1.19.7</testcontainers.version>
         <testcontainers-keycloak.version>3.3.0</testcontainers-keycloak.version>
         <testcontainers-redis-junit-jupiter.version>1.4.6</testcontainers-redis-junit-jupiter.version>
-        <rest-assured.version>5.4.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> <!-- Latest version not compatible -->
     </properties>
 
diff --git a/spring-boot-rest/pom.xml b/spring-boot-rest/pom.xml
@@ -164,7 +164,7 @@
         <start-class>com.baeldung.SpringBootRestApplication</start-class>
         <xstream.version>1.4.11.1</xstream.version>
         <modelmapper.version>3.2.0</modelmapper.version>
-        <rest-assured.version>3.3.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <jaxb-runtime.version>4.0.1</jaxb-runtime.version>
         <spring-oxm.version>6.1.4</spring-oxm.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml
@@ -127,7 +127,7 @@
 
     <properties>
         <spring-cloud-dependencies.version>2023.0.1</spring-cloud-dependencies.version>
-        <rest-assured.version>5.4.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <spring-boot.version>3.2.2</spring-boot.version>
         <spring-session-data-redis.version>3.2.2</spring-session-data-redis.version>
         <jakarta.servlet-api.version>6.1.0-M2</jakarta.servlet-api.version>
diff --git a/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml
@@ -44,7 +44,7 @@
         <spring-cloud-dataflow-dependencies.version>1.3.1.RELEASE</spring-cloud-dataflow-dependencies.version>
         <spring-cloud-dependencies.version>Edgware.SR6</spring-cloud-dependencies.version>
         <hibernate.compatible.version>5.2.12.Final</hibernate.compatible.version>
-        <rest-assured.version>3.1.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
     </properties>
 
 </project>
diff --git a/spring-jersey/pom.xml b/spring-jersey/pom.xml
@@ -220,7 +220,7 @@
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <httpcore.version>4.4.9</httpcore.version>
         <httpclient.version>4.5.5</httpclient.version>
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
         <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
     </properties>
 
diff --git a/spring-reactive-modules/spring-reactive-2/pom.xml b/spring-reactive-modules/spring-reactive-2/pom.xml
@@ -124,7 +124,7 @@
 
     <properties>
         <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
     </properties>
 
 </project>
diff --git a/spring-security-modules/spring-security-web-rest/pom.xml b/spring-security-modules/spring-security-web-rest/pom.xml
@@ -133,10 +133,9 @@
             <version>${jakarta.annotation-api.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <version>${rest-assured.version}</version>
-            <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
@@ -253,7 +252,7 @@
         <!-- various -->
         <javax.validation.version>1.1.0.Final</javax.validation.version>
         <!-- testing -->
-        <rest-assured.version>2.9.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <spring.version>6.0.13</spring.version>
diff --git a/spring-security-modules/spring-security-web-rest/src/test/java/com/baeldung/errorhandling/FooLiveTest.java b/spring-security-modules/spring-security-web-rest/src/test/java/com/baeldung/errorhandling/FooLiveTest.java
@@ -11,9 +11,10 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class)
diff --git a/spring-web-modules/spring-mvc-basics-5/pom.xml b/spring-web-modules/spring-mvc-basics-5/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${io.rest-assured.version}</version>
+            <version>${rest-assured.version}</version>
         </dependency>
     </dependencies>
 
@@ -83,7 +83,7 @@
         <json-path.version>2.9.0</json-path.version>
         <jaxb-runtime.version>2.3.5</jaxb-runtime.version>
         <jakarta.servlet.jsp.jstl>2.0.0</jakarta.servlet.jsp.jstl>
-        <io.rest-assured.version>3.0.0</io.rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
     </properties>
 
 </project>
diff --git a/spring-web-modules/spring-mvc-basics/pom.xml b/spring-web-modules/spring-mvc-basics/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${rest-assured-version}</version>
+            <version>${rest-assured.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -75,7 +75,7 @@
 
     <properties>
         <jaxb-runtime.version>4.0.1</jaxb-runtime.version>
-        <rest-assured-version>5.4.0</rest-assured-version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <jstl-version>1.2</jstl-version>
         <jakarta.servlet.jsp.jstl.version>2.0.0</jakarta.servlet.jsp.jstl.version>
     </properties>
diff --git a/spring-web-modules/spring-mvc-java/pom.xml b/spring-web-modules/spring-mvc-java/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${rest.assured.version}</version>
+            <version>${rest-assured.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Validation -->
@@ -210,7 +210,7 @@
         <json-path.version>2.9.0</json-path.version>
         <start-class>com.baeldung.SpringMVCApplication</start-class>
         <jakarta-servlet-jstl-version>3.0.0</jakarta-servlet-jstl-version>
-        <rest.assured.version>5.4.0</rest.assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
     </properties>
 
 </project>
diff --git a/spring-web-modules/spring-rest-query-language/pom.xml b/spring-web-modules/spring-rest-query-language/pom.xml
@@ -311,7 +311,7 @@
         <commons-lang3.version>3.14.0</commons-lang3.version>
         <jakarta.servlet-api.version>${querydsl.version}</jakarta.servlet-api.version>
         <jakarta.servlet.jsp.jstl.version>2.0.0</jakarta.servlet.jsp.jstl.version>
-        <rest-assured.version>5.4.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <querydsl.version>5.0.0</querydsl.version>
     </properties>
 
diff --git a/spring-web-modules/spring-rest-simple/pom.xml b/spring-web-modules/spring-rest-simple/pom.xml
@@ -276,7 +276,7 @@
         <!-- okhttp -->
         <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
         <commons-fileupload.version>2.0.0-M1</commons-fileupload.version>
-        <rest-assured.version>5.4.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
         <commons-fileupload2-jakarta-servlet6.version>2.0.0-M2</commons-fileupload2-jakarta-servlet6.version>
         <httpclient5.version>5.3.1</httpclient5.version>
diff --git a/spring-web-modules/spring-resttemplate-2/pom.xml b/spring-web-modules/spring-resttemplate-2/pom.xml
@@ -73,7 +73,7 @@
 
     <properties>
         <start-class>com.baeldung.compress.SpringCompressRequestApplication</start-class>
-        <rest-assured.version>3.3.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
         <jetty.version>11.0.15</jetty.version>
         <spring-boot.version>3.1.5</spring-boot.version>
diff --git a/testing-modules/rest-assured/pom.xml b/testing-modules/rest-assured/pom.xml
@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -29,13 +29,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -66,8 +63,9 @@
             <artifactId>jetty-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+            <version>${httpcore5.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -112,8 +110,9 @@
             <version>${btf.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>${httpclient5.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
@@ -166,19 +165,19 @@
 
     <properties>
         <jackson-coreutils.version>1.8</jackson-coreutils.version>
-        <servlet-api.version>2.5</servlet-api.version>
+        <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
         <javax.mail.version>1.4.7</javax.mail.version>
         <jetty.version>9.4.0.v20161208</jetty.version>
         <commons-collections.version>3.2.2</commons-collections.version>
-        <httpcore.version>4.4.5</httpcore.version>
-        <httpclient.version>4.5.2</httpclient.version>
+        <httpcore5.version>5.2.5</httpcore5.version>
+        <httpclient5.version>5.2.3</httpclient5.version>
         <uri-template.version>0.9</uri-template.version>
         <libphonenumber.version>8.0.0</libphonenumber.version>
         <msg-simple.version>1.1</msg-simple.version>
         <btf.version>1.2</btf.version>
-        <wiremock.version>3.3.1</wiremock.version>
+        <wiremock.version>3.9.1</wiremock.version>
         <scribejava.version>2.5.3</scribejava.version>
-        <rest-assured.version>5.3.0</rest-assured.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
     </properties>
 
 </project>
diff --git a/testing-modules/rest-assured/src/main/java/com/baeldung/restassured/controller/AppController.java b/testing-modules/rest-assured/src/main/java/com/baeldung/restassured/controller/AppController.java
@@ -6,8 +6,8 @@
 import java.util.Set;
 import java.util.UUID;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.InputStreamResource;
diff --git a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/controller/AppControllerIntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/controller/AppControllerIntegrationTest.java
@@ -15,14 +15,14 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/testing-modules/rest-testing/pom.xml b/testing-modules/rest-testing/pom.xml
diff --git a/video-tutorials/jackson-annotations/pom.xml b/video-tutorials/jackson-annotations/pom.xml
diff --git a/web-modules/jooby/pom.xml b/web-modules/jooby/pom.xml
