update jaxrs cxf, resteasy dependencies (#11414)

2022-01-26 16:23:41 +08:00
parent adcf04c63b
commit 604c1c0806
15 changed files with 14 additions and 15 deletions
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache
@@ -346,7 +346,7 @@
  {{/generateSpringBootApplication}}
 {{/generateSpringApplication}}
 {{^generateSpringBootApplication}}
-    <junit-version>4.13</junit-version>
+    <junit-version>4.13.1</junit-version>
    <logback-version>1.2.0</logback-version>
 {{/generateSpringBootApplication}}
    <cxf-version>3.3.0</cxf-version>
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -266,7 +266,7 @@
    <maven.compiler.target>${java.version}</maven.compiler.target>
    <swagger-core-version>1.5.22</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
-    <junit-version>4.13</junit-version>
+    <junit-version>4.13.1</junit-version>
    <logback-version>1.2.0</logback-version>
 {{#useBeanValidation}}
    <beanvalidation-version>2.0.2</beanvalidation-version>
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache
@@ -25,7 +25,7 @@ dependencies {
 {{#java8}}
    compile         'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9'
 {{/java8}}
-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache
@@ -25,7 +25,7 @@ dependencies {
    //TODO: swaggerFeature
    compile 'io.swagger:swagger-jaxrs:1.5.12'

-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
@@ -201,7 +201,7 @@
    <maven.compiler.target>${java.version}</maven.compiler.target>
    <swagger-core-version>1.5.22</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
-    <junit-version>4.13</junit-version>
+    <junit-version>4.13.1</junit-version>
    <logback-version>1.2.0</logback-version>
    <beanvalidation-version>2.0.2</beanvalidation-version>
    <cxf-version>3.3.0</cxf-version>
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
@@ -201,7 +201,7 @@
    <maven.compiler.target>${java.version}</maven.compiler.target>
    <swagger-core-version>1.5.22</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
-    <junit-version>4.13</junit-version>
+    <junit-version>4.13.1</junit-version>
    <logback-version>1.2.0</logback-version>
    <beanvalidation-version>2.0.2</beanvalidation-version>
    <cxf-version>3.3.0</cxf-version>
--- a/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/FILES
+++ b/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/FILES
@@ -64,7 +64,6 @@ src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
 src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
 src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
 src/main/resources/ApplicationContext.xml
-src/main/resources/test-data.json
 src/main/webapp/WEB-INF/context.xml
 src/main/webapp/WEB-INF/web.xml
 src/test/java/org/openapitools/api/SpringBootApplication.java
--- a/samples/server/petstore/jaxrs-cxf/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf/pom.xml
@@ -201,7 +201,7 @@
    <maven.compiler.target>${java.version}</maven.compiler.target>
    <swagger-core-version>1.5.22</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
-    <junit-version>4.13</junit-version>
+    <junit-version>4.13.1</junit-version>
    <logback-version>1.2.0</logback-version>
    <beanvalidation-version>2.0.2</beanvalidation-version>
    <cxf-version>3.3.0</cxf-version>
--- a/samples/server/petstore/jaxrs-resteasy/default-value/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/default-value/build.gradle
@@ -23,7 +23,7 @@ dependencies {
    //TODO: swaggerFeature
    compile 'io.swagger:swagger-jaxrs:1.5.12'

-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/samples/server/petstore/jaxrs-resteasy/default/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/default/build.gradle
@@ -23,7 +23,7 @@ dependencies {
    //TODO: swaggerFeature
    compile 'io.swagger:swagger-jaxrs:1.5.12'

-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle
@@ -17,7 +17,7 @@ dependencies {
    compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
    providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2'
    compile         'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9'
-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle
@@ -18,7 +18,7 @@ dependencies {
    providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2'
    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
    compile         'joda-time:joda-time:2.7'
-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle
@@ -18,7 +18,7 @@ dependencies {
    providedCompile 'jakarta.validation:jakarta.validation-api:2.0.2'
    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9'
    compile         'joda-time:joda-time:2.7'
-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle
@@ -23,7 +23,7 @@ dependencies {
    //TODO: swaggerFeature
    compile 'io.swagger:swagger-jaxrs:1.5.12'

-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }

--- a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
+++ b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
@@ -23,7 +23,7 @@ dependencies {
    //TODO: swaggerFeature
    compile 'io.swagger:swagger-jaxrs:1.5.12'

-    testCompile     'junit:junit:4.13',
+    testCompile     'junit:junit:4.13.1',
                    'org.hamcrest:hamcrest-core:1.3'
 }