diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache
index 0281b4d80c..15e1beb6f8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache
@@ -5,9 +5,9 @@ package {{package}};
 import {{invokerPackage}}.ApiException;
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * API tests for {{classname}}
  */
-@Ignore
+@Disabled
 public class {{classname}}Test {
 
     private final {{classname}} api = new {{classname}}();
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
index 1b6aa820d2..08da4d4abe 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <systemPropertyVariables>
                         <property>
@@ -91,7 +91,6 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
-                    <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
             <plugin>
@@ -337,8 +336,8 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -366,6 +365,6 @@
         {{#useBeanValidation}}
         <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useBeanValidation}}
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/echo_api/java/apache-httpclient/pom.xml b/samples/client/echo_api/java/apache-httpclient/pom.xml
index 47a3274035..f5c5b09208 100644
--- a/samples/client/echo_api/java/apache-httpclient/pom.xml
+++ b/samples/client/echo_api/java/apache-httpclient/pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <systemPropertyVariables>
                         <property>
@@ -84,7 +84,6 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
-                    <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
             <plugin>
@@ -262,8 +261,8 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -275,6 +274,6 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java
index 7e0076c7e6..405db1ed67 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java
@@ -17,8 +17,8 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.api.BodyApi;
 import org.openapitools.client.api.QueryApi;
 import org.openapitools.client.model.Category;
@@ -52,13 +52,13 @@ public class CustomTest {
             photoUrls( Arrays.asList( new String[] { "http://a.com", "http://b.com" } ) ).category( new Category().id( 987L ).name( "new category" ) );
 
       final Pet p = bodyApi.testEchoBodyPet( queryObject );
-      Assert.assertNotNull( p );
-      Assert.assertEquals( "Hello World", p.getName() );
-      Assert.assertEquals( Long.valueOf( 12345L ), p.getId() );
+      Assertions.assertNotNull( p );
+      Assertions.assertEquals( "Hello World", p.getName() );
+      Assertions.assertEquals( Long.valueOf( 12345L ), p.getId() );
 
       // response is empty body
       final Pet p2 = bodyApi.testEchoBodyPet( null );
-      Assert.assertNull( p2 );
+      Assertions.assertNull( p2 );
    }
 
    /**
@@ -72,7 +72,7 @@ public class CustomTest {
    public void testEchoBodyPetResponseString() throws ApiException {
       // response is empty body
       final String p2 = bodyApi.testEchoBodyPetResponseString( null );
-      Assert.assertNull( p2 );
+      Assertions.assertNull( p2 );
    }
 
    /**
@@ -89,7 +89,7 @@ public class CustomTest {
 
       final String response = api.testQueryStyleFormExplodeTrueObject( queryObject );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals(
+      Assertions.assertEquals(
             "/query/style_form/explode_true/object?id=12345&name=Hello%20World&category=class%20Category%20%7B%0A%20%20%20%20id%3A%20987%0A%20%20%20%20name%3A%20new%20category%0A%7D&photoUrls=http%3A%2F%2Fa.com&photoUrls=http%3A%2F%2Fb.com",
             p.path );
    }
@@ -106,13 +106,13 @@ public class CustomTest {
       final Pet queryObject = new Pet().id( 12345L ).name( "Hello World" ).
             photoUrls( Arrays.asList( new String[] { "http://a.com", "http://b.com" } ) ).category( new Category().id( 987L ).name( "new category" ) );
 
-      Assert.assertEquals(
+      Assertions.assertEquals(
             "query_object[id]=12345&query_object[name]=Hello%20World&query_object[category][id]=987&query_object[category][name]=new%20category&query_object[photoUrls][0]=http%3A%2F%2Fa.com&query_object[photoUrls][1]=http%3A%2F%2Fb.com",
             queryObject.toUrlQueryString( "query_object" ) );
 
       final String response = api.testQueryStyleDeepObjectExplodeTrueObject( queryObject );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals(
+      Assertions.assertEquals(
             "/query/style_deepObject/explode_true/object?query_object[id]=12345&query_object[name]=Hello%20World&query_object[category][id]=987&query_object[category][name]=new%20category&query_object[photoUrls][0]=http%3A%2F%2Fa.com&query_object[photoUrls][1]=http%3A%2F%2Fb.com",
             p.path );
    }
@@ -132,7 +132,7 @@ public class CustomTest {
 
       final String response = api.testQueryStyleFormExplodeTrueObjectAllOf( queryObject );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals( "/query/style_form/explode_true/object/allOf?id=3487&outcomes=SKIPPED&outcomes=FAILURE&text=Hello%20World", p.path );
+      Assertions.assertEquals( "/query/style_form/explode_true/object/allOf?id=3487&outcomes=SKIPPED&outcomes=FAILURE&text=Hello%20World", p.path );
    }
 
    /**
@@ -149,7 +149,7 @@ public class CustomTest {
 
       final String response = api.testQueryStyleFormExplodeTrueArrayString( q );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals( "/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path );
+      Assertions.assertEquals( "/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path );
    }
 
    /**
@@ -163,44 +163,44 @@ public class CustomTest {
    public void testQueryIntegerBooleanString() throws ApiException {
       final String response = api.testQueryIntegerBooleanString( 1, true, "Hello World" );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals( "/query/integer/boolean/string?integer_query=1&boolean_query=true&string_query=Hello%20World", p.path );
+      Assertions.assertEquals( "/query/integer/boolean/string?integer_query=1&boolean_query=true&string_query=Hello%20World", p.path );
    }
 
    @Test
    public void testArrayDefaultValues() {
       // test array default values
       final DefaultValue d = new DefaultValue();
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
-      Assert.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
 
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
 
-      Assert.assertNull( d.getArrayStringNullable() );
-      Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
+      Assertions.assertNull( d.getArrayStringNullable() );
+      Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
 
       // test addItem
       d.addArrayStringEnumDefaultItem( DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 3 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 2 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 3 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 2 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
 
       d.addArrayStringDefaultItem( "new item" );
-      Assert.assertEquals( d.getArrayStringDefault().size(), 3 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 2 ), "new item" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 3 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 2 ), "new item" );
 
       d.addArrayIntegerDefaultItem( 5 );
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 3 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 2 ), Integer.valueOf( 5 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 3 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 2 ), Integer.valueOf( 5 ) );
 
    }
 
@@ -213,26 +213,26 @@ public class CustomTest {
       final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
       } );
 
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
-      Assert.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
 
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
 
-      Assert.assertNull( d.getArrayStringNullable() );
-      Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
+      Assertions.assertNull( d.getArrayStringNullable() );
+      Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
 
-      Assert.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
+      Assertions.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
             "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[]}" );
    }
 
@@ -245,23 +245,23 @@ public class CustomTest {
       final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
       } );
 
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 1 );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.UNCLASSIFIED );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 1 );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.UNCLASSIFIED );
 
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 1 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 1 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
 
-      Assert.assertEquals( d.getArrayStringDefault().size(), 1 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 1 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
 
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
 
-      Assert.assertNull( d.getArrayStringNullable() );
-      Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
+      Assertions.assertNull( d.getArrayStringNullable() );
+      Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
 
-      Assert.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
+      Assertions.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
             "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[]}" );
    }
 
@@ -274,9 +274,9 @@ public class CustomTest {
       try {
          final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
          } );
-         Assert.assertTrue( false ); // the test should not reach this line
+         Assertions.assertTrue( false ); // the test should not reach this line
       } catch ( final com.fasterxml.jackson.databind.exc.ValueInstantiationException e ) {
-         Assert.assertEquals( e.getMessage(),
+         Assertions.assertEquals( e.getMessage(),
                "Cannot construct instance of `org.openapitools.client.model.DefaultValue$ArrayStringEnumDefaultEnum`, problem: Unexpected value 'invalid'\n" +
                      " at [Source: (String)\"{ \"array_string_enum_default\": [\"invalid\"] }\"; line: 1, column: 33] (through reference chain: org.openapitools.client.model.DefaultValue[\"array_string_enum_default\"]->java.util.ArrayList[0])" );
       }
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java
index 7fc2956fce..81b483fa70 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java
@@ -14,9 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -59,10 +59,10 @@ public class AuthApiTest {
         String response;
         api.getApiClient().setBearerToken("fixed token");
         response = api.testAuthHttpBearer();
-        Assert.assertTrue(response.contains("Authorization: Bearer fixed token"));
+        Assertions.assertTrue(response.contains("Authorization: Bearer fixed token"));
 
         api.getApiClient().setBearerToken(() -> "dynamic token");
         response = api.testAuthHttpBearer();
-        Assert.assertTrue(response.contains("Authorization: Bearer dynamic token"));
+        Assertions.assertTrue(response.contains("Authorization: Bearer dynamic token"));
     }
 }
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/BodyApiTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/BodyApiTest.java
index 352e8e2e19..ef13f819e6 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/BodyApiTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/BodyApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  * API tests for BodyApi
  */
-@Ignore
+@Disabled
 public class BodyApiTest {
 
     private final BodyApi api = new BodyApi();
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/FormApiTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/FormApiTest.java
index 1487429390..a308e36d2c 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/FormApiTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/FormApiTest.java
@@ -14,9 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -28,7 +28,7 @@ import java.util.Map;
 /**
  * API tests for FormApi
  */
-@Ignore
+@Disabled
 public class FormApiTest {
 
     private final FormApi api = new FormApi();
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java
index 989c687cb7..3f0ec9214b 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  * API tests for HeaderApi
  */
-@Ignore
+@Disabled
 public class HeaderApiTest {
 
     private final HeaderApi api = new HeaderApi();
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/PathApiTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/PathApiTest.java
index 5968d6614b..3759bdee97 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/PathApiTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/PathApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  * API tests for PathApi
  */
-@Ignore
+@Disabled
 public class PathApiTest {
 
     private final PathApi api = new PathApi();
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/QueryApiTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/QueryApiTest.java
index 69ae8a2216..069bf4bd32 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/QueryApiTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/QueryApiTest.java
@@ -16,9 +16,9 @@ package org.openapitools.client.api;
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Pet;
 import org.openapitools.client.model.TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -30,7 +30,7 @@ import java.util.Map;
 /**
  * API tests for QueryApi
  */
-@Ignore
+@Disabled
 public class QueryApiTest {
 
     private final QueryApi api = new QueryApi();
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdAndCategoryTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdAndCategoryTest.java
index b96bf46b10..05ea72116b 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdAndCategoryTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdAndCategoryTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdTest.java
index ac9a253bb6..31323a96d3 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/BirdTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java
index 51804e0c14..e32182d690 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DataQueryTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DataQueryTest.java
index 9b71c40658..7916c47947 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DataQueryTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DataQueryTest.java
@@ -22,9 +22,9 @@ import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.Query;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DefaultValueTest.java
index 8adf113d6e..4de417ac03 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DefaultValueTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DefaultValueTest.java
@@ -24,9 +24,9 @@ import org.openapitools.jackson.nullable.JsonNullable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
index 2d9c5b371f..ccc2e77abc 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java
index 2002d08bf8..1d5a7048a5 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/QueryTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/QueryTest.java
index 266a3cb673..48e1fbe6af 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/QueryTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/QueryTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/StringEnumRefTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/StringEnumRefTest.java
index 81d7f918ea..767df43f31 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/StringEnumRefTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/StringEnumRefTest.java
@@ -13,9 +13,9 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java
index d1d4b9de0d..5af2a8f54c 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java
index cdb7c02c0f..d5d0fc51cc 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for TestFormObjectMultipartRequestMarker
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java
index 1fa7d643c4..b90b1e4cd2 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java
index 82e7035a25..910af6a663 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/pom.xml b/samples/client/petstore/java/apache-httpclient/pom.xml
index a619f987ac..c522d5af58 100644
--- a/samples/client/petstore/java/apache-httpclient/pom.xml
+++ b/samples/client/petstore/java/apache-httpclient/pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <systemPropertyVariables>
                         <property>
@@ -84,7 +84,6 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
-                    <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
             <plugin>
@@ -262,8 +261,8 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -275,6 +274,6 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
index e6db7f775a..fa2ead5348 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Client;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +27,7 @@ import java.util.Map;
 /**
  * API tests for AnotherFakeApi
  */
-@Ignore
+@Disabled
 public class AnotherFakeApiTest {
 
     private final AnotherFakeApi api = new AnotherFakeApi();
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java
index 32943c2bb9..a057e1c6eb 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.FooGetDefaultResponse;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  * API tests for DefaultApi
  */
-@Ignore
+@Disabled
 public class DefaultApiTest {
 
     private final DefaultApi api = new DefaultApi();
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 5bdb09bab4..dbc0cceb6e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -26,9 +26,9 @@ import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.OuterObjectWithEnumProperty;
 import org.openapitools.client.model.Pet;
 import org.openapitools.client.model.User;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -40,7 +40,7 @@ import java.util.Map;
 /**
  * API tests for FakeApi
  */
-@Ignore
+@Disabled
 public class FakeApiTest {
 
     private final FakeApi api = new FakeApi();
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
index 99d49a695d..125162d60c 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Client;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +27,7 @@ import java.util.Map;
 /**
  * API tests for FakeClassnameTags123Api
  */
-@Ignore
+@Disabled
 public class FakeClassnameTags123ApiTest {
 
     private final FakeClassnameTags123Api api = new FakeClassnameTags123Api();
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/PetApiTest.java
index 6a8c50258e..50c24acbfa 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -18,9 +18,9 @@ import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
 import java.util.Set;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,7 +30,7 @@ import java.util.Map;
 /**
  * API tests for PetApi
  */
-@Ignore
+@Disabled
 public class PetApiTest {
 
     private final PetApi api = new PetApi();
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
index c7df74110d..5abd4f0bc8 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Order;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +27,7 @@ import java.util.Map;
 /**
  * API tests for StoreApi
  */
-@Ignore
+@Disabled
 public class StoreApiTest {
 
     private final StoreApi api = new StoreApi();
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/UserApiTest.java
index cffd945d32..325d33fcc6 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -15,9 +15,9 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.User;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +27,7 @@ import java.util.Map;
 /**
  * API tests for UserApi
  */
-@Ignore
+@Disabled
 public class UserApiTest {
 
     private final UserApi api = new UserApi();
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
index 4f6fd800ab..832d746f72 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
index 41e6497ece..d4426e578e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
index d2e17831ba..9df6e6291a 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
index 14fd8022fe..11d4d7313a 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -22,9 +22,9 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
index 58b7521c6a..7fce2f458f 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
index 10ad938f52..3d98032d55 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
index bcbb9c54b2..ad7d482159 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
index f7662d6c46..e4bebcd238 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
index 1acef2d396..8c231167d6 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.SingleRefType;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AnimalTest.java
index 930e5c17d0..2b04312bbe 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -24,9 +24,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.BigCat;
 import org.openapitools.client.model.Cat;
 import org.openapitools.client.model.Dog;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
index 57a1c4f37e..7d6ca2902a 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
index 4f127b838b..1db82cbdea 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayTestTest.java
index 5874400602..4a3a3cc839 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CapitalizationTest.java
index c69ffc12a0..1f133e4142 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CatTest.java
index 90fdba14c2..50037f5484 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CatTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CatTest.java
@@ -23,9 +23,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Animal;
 import org.openapitools.client.model.BigCat;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java
index 393f73bd5e..84df0f1e24 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
index 2616181bec..a109c6f717 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
@@ -23,9 +23,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.ParentWithNullable;
 import org.openapitools.jackson.nullable.JsonNullable;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for ChildWithNullable
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClassModelTest.java
index 5005bcb800..0efd2b0375 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClientTest.java
index bda3b360b7..9fee039a47 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClientTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
index a61e43f63a..06d5864039 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DogTest.java
index de77d6711b..0f9f43fd3c 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DogTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/DogTest.java
@@ -22,9 +22,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumArraysTest.java
index 73206626b9..bd426ae14b 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumClassTest.java
index 9e45543fac..19518a5f66 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumClassTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumClassTest.java
@@ -13,9 +13,9 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumTestTest.java
index 8907cfa8e8..223a3d674b 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.OuterEnum;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
index 88c1d374be..1792f6169d 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for FakeBigDecimalMap200Response
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
index 493d84aa1b..53b20d7bdd 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.ModelFile;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
index 5830df74c8..85c3e9a29e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Foo;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooTest.java
index 195e487a79..b1825eb48e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FooTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FormatTestTest.java
index 48bec93d99..ceaa76fef0 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -23,9 +23,9 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.UUID;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
index da9073d450..9a76d3c953 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
index 15cc82702c..d627568b70 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
@@ -22,9 +22,9 @@ import org.openapitools.jackson.nullable.JsonNullable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MapTestTest.java
index 22c8519472..c85527e853 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
index f29932e96b..c5f70f4c8f 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -23,9 +23,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
index 0cd3f97619..0952e6472d 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
index be8cca35e3..d57f868004 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelFileTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelFileTest.java
index a0247ae71b..4b2d710521 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelFileTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelFileTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelListTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelListTest.java
index 0ead99db3a..f39c6a118e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelListTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelListTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelReturnTest.java
index b6ca02f8d2..a6968d2b87 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NameTest.java
index 07684c9eb4..39ff782a3e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NameTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NameTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NullableClassTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NullableClassTest.java
index cb3a631c91..86e5a4e724 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NullableClassTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NullableClassTest.java
@@ -29,9 +29,9 @@ import org.openapitools.jackson.nullable.JsonNullable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
index 878095093a..88a5503ccf 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
index c59d5beba3..72978f6509 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
@@ -22,9 +22,9 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.client.model.DeprecatedObject;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java
index f31e10a9df..17f411d1ed 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.time.OffsetDateTime;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
index 8b823572e5..11d7eeac3b 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
index 59c4eebd2f..db6de4ebd3 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
@@ -13,9 +13,9 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
index fa981c7093..44b97d47c2 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
@@ -13,9 +13,9 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
index 1b98d326bb..908c8ce7e2 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
@@ -13,9 +13,9 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumTest.java
index cf0ebae0fa..f729314202 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterEnumTest.java
@@ -13,9 +13,9 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
index 1a436d40cb..579a7f62fa 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
@@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.OuterEnumInteger;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
index bdd46008b1..828d360428 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
@@ -25,9 +25,9 @@ import org.openapitools.jackson.nullable.JsonNullable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for ParentWithNullable
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java
index b48657d0c9..a10e870d0f 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/PetTest.java
@@ -25,9 +25,9 @@ import java.util.List;
 import java.util.Set;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
index 26356ec204..11ab8eaf4f 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
index 155e2a89b0..7db38f4f33 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
@@ -13,9 +13,9 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
index 4e59989875..c5d7ce076d 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java
index 5aeb2f3f94..382a573036 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TagTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
index 819a1e7fa9..8e5a4ba75d 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for TestInlineFreeformAdditionalPropertiesRequest
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
index 8c096c188f..07eccf57ec 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
index b1655df616..3ce00657e2 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/UserTest.java
index e0153a4cf1..eccfbf5e12 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/UserTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/UserTest.java
@@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java
index 4bab95a912..5dfb646e7f 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 
 /**