Skip to content

Commit 0c737b5

Browse files
thorstenhirschthorstenhirsch
committed
upgrade resteasy to junit5
1 parent 4441ab3 commit 0c737b5

File tree

81 files changed

+255
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+255
-258
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<plugin>
6262
<groupId>org.apache.maven.plugins</groupId>
6363
<artifactId>maven-surefire-plugin</artifactId>
64-
<version>2.12</version>
64+
<version>2.22.2</version>
6565
<configuration>
6666
<systemPropertyVariables>
6767
<property>
@@ -71,7 +71,6 @@
7171
</systemPropertyVariables>
7272
<argLine>-Xms512m -Xmx1500m</argLine>
7373
<parallel>methods</parallel>
74-
<forkMode>pertest</forkMode>
7574
</configuration>
7675
</plugin>
7776
<plugin>
@@ -278,8 +277,8 @@
278277
</dependency>
279278
<!-- test dependencies -->
280279
<dependency>
281-
<groupId>junit</groupId>
282-
<artifactId>junit</artifactId>
280+
<groupId>org.junit.jupiter</groupId>
281+
<artifactId>junit-jupiter-api</artifactId>
283282
<version>${junit-version}</version>
284283
<scope>test</scope>
285284
</dependency>
@@ -306,6 +305,6 @@
306305
{{/useJakartaEe}}
307306
<threetenbp-version>2.9.10</threetenbp-version>
308307
<maven-plugin-version>1.0.0</maven-plugin-version>
309-
<junit-version>4.13</junit-version>
308+
<junit-version>5.10.2</junit-version>
310309
</properties>
311310
</project>

‎modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ for this project used jakarta.validation-api -->
138138
</exclusions>
139139
</dependency>
140140
<dependency>
141-
<groupId>junit</groupId>
142-
<artifactId>junit</artifactId>
141+
<groupId>org.junit.jupiter</groupId>
142+
<artifactId>junit-jupiter-api</artifactId>
143143
<version>${junit-version}</version>
144144
<scope>test</scope>
145145
</dependency>
@@ -150,8 +150,8 @@ for this project used jakarta.validation-api -->
150150
<scope>test</scope>
151151
<exclusions>
152152
<exclusion>
153-
<artifactId>junit</artifactId>
154-
<groupId>junit</groupId>
153+
<artifactId>junit-jupiter-api</artifactId>
154+
<groupId>org.junit.jupiter</groupId>
155155
</exclusion>
156156
<exclusion>
157157
<artifactId>snakeyaml</artifactId>
@@ -198,7 +198,7 @@ for this project used jakarta.validation-api -->
198198
<jetty-version>9.2.9.v20150224</jetty-version>
199199
<resteasy-version>3.0.11.Final</resteasy-version>
200200
<slf4j-version>1.6.3</slf4j-version>
201-
<junit-version>4.13.2</junit-version>
201+
<junit-version>5.10.2</junit-version>
202202
<servlet-api-version>4.0.4</servlet-api-version>
203203
{{#useBeanValidation}}
204204
<beanvalidation-version>2.0.2</beanvalidation-version>

‎modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ for this project used jakarta.validation-api -->
160160
</exclusions>
161161
</dependency>
162162
<dependency>
163-
<groupId>junit</groupId>
164-
<artifactId>junit</artifactId>
163+
<groupId>org.junit.jupiter</groupId>
164+
<artifactId>junit-jupiter-api</artifactId>
165165
<version>${junit-version}</version>
166166
<scope>test</scope>
167167
</dependency>
@@ -172,8 +172,8 @@ for this project used jakarta.validation-api -->
172172
<scope>test</scope>
173173
<exclusions>
174174
<exclusion>
175-
<artifactId>junit</artifactId>
176-
<groupId>junit</groupId>
175+
<artifactId>junit-jupiter-api</artifactId>
176+
<groupId>org.junit.jupiter</groupId>
177177
</exclusion>
178178
<exclusion>
179179
<artifactId>snakeyaml</artifactId>
@@ -216,7 +216,7 @@ for this project used jakarta.validation-api -->
216216
<jetty-version>9.2.9.v20150224</jetty-version>
217217
<resteasy-version>3.13.0.Final</resteasy-version>
218218
<slf4j-version>1.6.3</slf4j-version>
219-
<junit-version>4.13.2</junit-version>
219+
<junit-version>5.10.2</junit-version>
220220
<servlet-api-version>4.0.4</servlet-api-version>
221221
{{#useJakartaEe}}
222222
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

‎samples/client/echo_api/java/resteasy/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-surefire-plugin</artifactId>
57-
<version>2.12</version>
57+
<version>2.22.2</version>
5858
<configuration>
5959
<systemPropertyVariables>
6060
<property>
@@ -64,7 +64,6 @@
6464
</systemPropertyVariables>
6565
<argLine>-Xms512m -Xmx1500m</argLine>
6666
<parallel>methods</parallel>
67-
<forkMode>pertest</forkMode>
6867
</configuration>
6968
</plugin>
7069
<plugin>
@@ -240,8 +239,8 @@
240239
</dependency>
241240
<!-- test dependencies -->
242241
<dependency>
243-
<groupId>junit</groupId>
244-
<artifactId>junit</artifactId>
242+
<groupId>org.junit.jupiter</groupId>
243+
<artifactId>junit-jupiter-api</artifactId>
245244
<version>${junit-version}</version>
246245
<scope>test</scope>
247246
</dependency>
@@ -255,6 +254,6 @@
255254
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
256255
<threetenbp-version>2.9.10</threetenbp-version>
257256
<maven-plugin-version>1.0.0</maven-plugin-version>
258-
<junit-version>4.13</junit-version>
257+
<junit-version>5.10.2</junit-version>
259258
</properties>
260259
</project>

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import java.io.File;
1818
import org.openapitools.client.model.Pet;
1919
import org.openapitools.client.model.Tag;
20-
import org.junit.Test;
21-
import org.junit.Ignore;
22-
import org.junit.Assert;
20+
import org.junit.jupiter.api.Test;
21+
import org.junit.jupiter.api.Disabled;
22+
import org.junit.jupiter.api.Assertions;
2323

2424
import java.io.FileWriter;
2525
import java.io.IOException;
@@ -31,8 +31,8 @@
3131
import java.util.Map;
3232

3333
import static org.hamcrest.CoreMatchers.containsString;
34-
import static org.hamcrest.MatcherAssert.assertThat;
35-
import static org.junit.Assert.assertTrue;
34+
import static org.hamcrest.MatcherAssertions.assertThat;
35+
import static org.junit.jupiter.api.Assertions.assertTrue;
3636

3737
/**
3838
* API tests

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/AuthApiTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
package org.openapitools.client.api;
1515

1616
import org.openapitools.client.ApiException;
17-
import org.junit.Test;
18-
import org.junit.Ignore;
19-
import org.junit.Assert;
17+
import org.junit.jupiter.api.Test;
18+
import org.junit.jupiter.api.Disabled;
19+
import org.junit.jupiter.api.Assertions;
2020

2121
import java.time.LocalDate;
2222
import java.time.OffsetDateTime;

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import java.io.File;
1818
import org.openapitools.client.model.Pet;
1919
import org.openapitools.client.model.Tag;
20-
import org.junit.Test;
21-
import org.junit.Ignore;
22-
import org.junit.Assert;
20+
import org.junit.jupiter.api.Test;
21+
import org.junit.jupiter.api.Disabled;
22+
import org.junit.jupiter.api.Assertions;
2323

2424
import java.io.FileWriter;
2525
import java.io.IOException;
@@ -31,8 +31,8 @@
3131
import java.util.Map;
3232

3333
import static org.hamcrest.CoreMatchers.containsString;
34-
import static org.hamcrest.MatcherAssert.assertThat;
35-
import static org.junit.Assert.assertTrue;
34+
import static org.hamcrest.MatcherAssertions.assertThat;
35+
import static org.junit.jupiter.api.Assertions.assertTrue;
3636

3737
/**
3838
* API tests for BodyApi

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/FormApiTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
package org.openapitools.client.api;
1515

1616
import org.openapitools.client.ApiException;
17-
import org.junit.Test;
18-
import org.junit.Ignore;
19-
import org.junit.Assert;
17+
import org.junit.jupiter.api.Test;
18+
import org.junit.jupiter.api.Disabled;
19+
import org.junit.jupiter.api.Assertions;
2020

2121
import java.time.LocalDate;
2222
import java.time.OffsetDateTime;

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/HeaderApiTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import org.openapitools.client.ApiException;
1717
import org.openapitools.client.model.StringEnumRef;
18-
import org.junit.Test;
19-
import org.junit.Ignore;
20-
import org.junit.Assert;
18+
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.Disabled;
20+
import org.junit.jupiter.api.Assertions;
2121

2222
import java.time.LocalDate;
2323
import java.time.OffsetDateTime;

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/PathApiTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import org.openapitools.client.ApiException;
1717
import org.openapitools.client.model.StringEnumRef;
18-
import org.junit.Test;
19-
import org.junit.Ignore;
20-
import org.junit.Assert;
18+
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.Disabled;
20+
import org.junit.jupiter.api.Assertions;
2121

2222
import java.time.LocalDate;
2323
import java.time.OffsetDateTime;

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/QueryApiTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.openapitools.client.model.StringEnumRef;
2222
import org.openapitools.client.model.TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter;
2323
import org.openapitools.client.model.TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter;
24-
import org.junit.Test;
25-
import org.junit.Ignore;
26-
import org.junit.Assert;
24+
import org.junit.jupiter.api.Test;
25+
import org.junit.jupiter.api.Disabled;
26+
import org.junit.jupiter.api.Assertions;
2727

2828
import java.time.LocalDate;
2929
import java.time.OffsetDateTime;

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/BirdTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import com.fasterxml.jackson.annotation.JsonCreator;
1919
import com.fasterxml.jackson.annotation.JsonTypeName;
2020
import com.fasterxml.jackson.annotation.JsonValue;
21-
import org.junit.Assert;
22-
import org.junit.Ignore;
23-
import org.junit.Test;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Disabled;
23+
import org.junit.jupiter.api.Test;
2424

2525
/**
2626
* Model tests for Bird

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import com.fasterxml.jackson.annotation.JsonCreator;
1919
import com.fasterxml.jackson.annotation.JsonTypeName;
2020
import com.fasterxml.jackson.annotation.JsonValue;
21-
import org.junit.Assert;
22-
import org.junit.Ignore;
23-
import org.junit.Test;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Disabled;
23+
import org.junit.jupiter.api.Test;
2424

2525
/**
2626
* Model tests for Category

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DataQueryTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import java.util.Arrays;
2424
import java.util.List;
2525
import org.openapitools.client.model.Query;
26-
import org.junit.Assert;
27-
import org.junit.Ignore;
28-
import org.junit.Test;
26+
import org.junit.jupiter.api.Assertions;
27+
import org.junit.jupiter.api.Disabled;
28+
import org.junit.jupiter.api.Test;
2929

3030
/**
3131
* Model tests for DataQuery

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DefaultValueTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import com.fasterxml.jackson.annotation.JsonIgnore;
2727
import org.openapitools.jackson.nullable.JsonNullable;
2828
import java.util.NoSuchElementException;
29-
import org.junit.Assert;
30-
import org.junit.Ignore;
31-
import org.junit.Test;
29+
import org.junit.jupiter.api.Assertions;
30+
import org.junit.jupiter.api.Disabled;
31+
import org.junit.jupiter.api.Test;
3232

3333
/**
3434
* Model tests for DefaultValue

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.fasterxml.jackson.annotation.JsonTypeName;
2020
import com.fasterxml.jackson.annotation.JsonValue;
2121
import java.math.BigDecimal;
22-
import org.junit.Assert;
23-
import org.junit.Ignore;
24-
import org.junit.Test;
22+
import org.junit.jupiter.api.Assertions;
23+
import org.junit.jupiter.api.Disabled;
24+
import org.junit.jupiter.api.Test;
2525

2626
/**
2727
* Model tests for NumberPropertiesOnly

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import java.util.List;
2424
import org.openapitools.client.model.Category;
2525
import org.openapitools.client.model.Tag;
26-
import org.junit.Assert;
27-
import org.junit.Ignore;
28-
import org.junit.Test;
26+
import org.junit.jupiter.api.Assertions;
27+
import org.junit.jupiter.api.Disabled;
28+
import org.junit.jupiter.api.Test;
2929

3030
/**
3131
* Model tests for Pet

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/QueryTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.util.ArrayList;
2222
import java.util.Arrays;
2323
import java.util.List;
24-
import org.junit.Assert;
25-
import org.junit.Ignore;
26-
import org.junit.Test;
24+
import org.junit.jupiter.api.Assertions;
25+
import org.junit.jupiter.api.Disabled;
26+
import org.junit.jupiter.api.Test;
2727

2828
/**
2929
* Model tests for Query

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/StringEnumRefTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
package org.openapitools.client.model;
1515

16-
import org.junit.Assert;
17-
import org.junit.Ignore;
18-
import org.junit.Test;
16+
import org.junit.jupiter.api.Assertions;
17+
import org.junit.jupiter.api.Disabled;
18+
import org.junit.jupiter.api.Test;
1919

2020
/**
2121
* Model tests for StringEnumRef

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import com.fasterxml.jackson.annotation.JsonCreator;
1919
import com.fasterxml.jackson.annotation.JsonTypeName;
2020
import com.fasterxml.jackson.annotation.JsonValue;
21-
import org.junit.Assert;
22-
import org.junit.Ignore;
23-
import org.junit.Test;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Disabled;
23+
import org.junit.jupiter.api.Test;
2424

2525
/**
2626
* Model tests for Tag

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import com.fasterxml.jackson.annotation.JsonCreator;
1919
import com.fasterxml.jackson.annotation.JsonTypeName;
2020
import com.fasterxml.jackson.annotation.JsonValue;
21-
import org.junit.Assert;
22-
import org.junit.Ignore;
23-
import org.junit.Test;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Disabled;
23+
import org.junit.jupiter.api.Test;
2424

2525
/**
2626
* Model tests for TestFormObjectMultipartRequestMarker

‎samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import com.fasterxml.jackson.annotation.JsonCreator;
1919
import com.fasterxml.jackson.annotation.JsonTypeName;
2020
import com.fasterxml.jackson.annotation.JsonValue;
21-
import org.junit.Assert;
22-
import org.junit.Ignore;
23-
import org.junit.Test;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Disabled;
23+
import org.junit.jupiter.api.Test;
2424

2525
/**
2626
* Model tests for TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter

0 commit comments

Comments
 (0)