diff --git a/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh b/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh index eb79a73b25a..837af96bdaa 100755 --- a/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh +++ b/bin/jaxrs-cxf-petstore-server-annotated-base-path.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-annotated-base-path -DhideGenerationTimestamp=true,useAnnotatedBasePath=true" +ags="$@ generate --artifact-id swagger-cxf-annotated-basepath -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-annotated-base-path -DhideGenerationTimestamp=true,useAnnotatedBasePath=true" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/jaxrs-cxf-petstore-server-non-spring-application.sh b/bin/jaxrs-cxf-petstore-server-non-spring-application.sh index e22a18dea6e..ac85e109deb 100755 --- a/bin/jaxrs-cxf-petstore-server-non-spring-application.sh +++ b/bin/jaxrs-cxf-petstore-server-non-spring-application.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-non-spring-app -DhideGenerationTimestamp=true,generateNonSpringApplication=true" +ags="$@ generate --artifact-id swagger-cxf-server-non-spring -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-non-spring-app -DhideGenerationTimestamp=true,generateNonSpringApplication=true" java $JAVA_OPTS -jar $executable $ags diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 1e030af9bf1..35688ec366c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1123,8 +1123,6 @@ public class DefaultCodegen { String datatype = null; if (p instanceof StringProperty && "number".equals(p.getFormat())) { datatype = "BigDecimal"; - } else if (p instanceof StringProperty) { - datatype = "string"; } else if (p instanceof ByteArrayProperty) { datatype = "ByteArray"; } else if (p instanceof BinaryProperty) { @@ -1163,6 +1161,8 @@ public class DefaultCodegen { datatype = "Object"; LOGGER.error(e.getMessage(), e); } + } else if (p instanceof StringProperty) { + datatype = "string"; } else { if (p != null) { datatype = p.getType(); diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache index c7d253ad685..32cb2e4302e 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache @@ -263,7 +263,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.4.0 2.1.0 2.8.7 diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache index 1cc0f3f440b..15fc98b2cb6 100644 --- a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache @@ -119,7 +119,7 @@ 1.0.0 - 1.0.12 + 1.0.14 9.2.9.v20150224 1.0.1 4.8.2 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache index 328511bdf55..f3d02db08e1 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -178,7 +178,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 @@ -188,7 +188,7 @@ 1.1.0.Final {{/useBeanValidation}} 3.1.11 - 2.8.4 + 2.8.9 UTF-8 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 5a2ed782474..ad4c3ae9c33 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -229,7 +229,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 @@ -245,7 +245,7 @@ 1.3.3.RELEASE {{/generateSpringBootApplication}} 3.1.11 - 2.8.4 + 2.8.9 UTF-8 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index 4ac349ef1f0..bf58a208a1f 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -191,7 +191,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 1.19.1 2.8.7 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache index a28823d5858..b0f5c23bb01 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache @@ -188,7 +188,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 2.8.7 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index 7b7107f197a..3f855bd2eda 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -174,7 +174,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache index ac1215cff2d..6111e483b20 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -164,7 +164,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache index 2aa9f4e809c..3a3dce18f25 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache @@ -9,7 +9,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 org.springframework.boot diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache index 743aca536a8..2c890843eac 100644 --- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache @@ -75,7 +75,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache index 8e2790095b1..3a5c4d0e036 100644 --- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache @@ -216,7 +216,7 @@ 2.3.9 1.2 2.2 - 1.5.12 + 1.5.15 1.0.0 4.8.1 diff --git a/modules/swagger-codegen/src/main/resources/android/pom.mustache b/modules/swagger-codegen/src/main/resources/android/pom.mustache index c4c4e3a5b9d..a7bb0ad4b30 100644 --- a/modules/swagger-codegen/src/main/resources/android/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/android/pom.mustache @@ -145,7 +145,7 @@ - 1.5.12 + 1.5.15 2.3.1 4.8.1 1.0.0 diff --git a/modules/swagger-codegen/src/main/resources/scala/pom.mustache b/modules/swagger-codegen/src/main/resources/scala/pom.mustache index d459d29a975..679d345347c 100644 --- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache @@ -220,7 +220,7 @@ 1.2 2.2 1.19 - 1.5.12 + 1.5.15 1.0.5 1.0.0 2.4.2 diff --git a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache index a865adc3c11..4972cb349c1 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache +++ b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache @@ -273,7 +273,7 @@ - 1.5.9 + 1.5.15 2.22.2 2.7.5 {{^java8}} diff --git a/pom.xml b/pom.xml index a5b71298c67..fa3de66f46c 100644 --- a/pom.xml +++ b/pom.xml @@ -888,10 +888,10 @@ - 1.0.29 + 1.0.30 2.11.1 3.3.0 - 1.5.12 + 1.5.15 2.4 1.2 4.8.1 diff --git a/pom.xml.circleci b/pom.xml.circleci index 1091befa94c..4d0732e22fa 100644 --- a/pom.xml.circleci +++ b/pom.xml.circleci @@ -897,10 +897,10 @@ - 1.0.28 + 1.0.30 2.11.1 3.3.0 - 1.5.12 + 1.5.15 2.4 1.2 4.8.1 diff --git a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml index 9ab87a8691c..dbd7942c973 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml +++ b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml @@ -206,7 +206,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 2.7.5 2.6.2 2.9.3 diff --git a/samples/client/petstore-security-test/scala/pom.xml b/samples/client/petstore-security-test/scala/pom.xml index a54aac0067d..53980f82fc1 100644 --- a/samples/client/petstore-security-test/scala/pom.xml +++ b/samples/client/petstore-security-test/scala/pom.xml @@ -215,7 +215,7 @@ 1.2 2.2 1.19 - 1.5.12 + 1.5.15 1.0.5 1.0.0 2.4.2 diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml index 38d1f45025b..406d9d6ea73 100644 --- a/samples/client/petstore/akka-scala/pom.xml +++ b/samples/client/petstore/akka-scala/pom.xml @@ -216,7 +216,7 @@ 2.3.9 1.2 2.2 - 1.5.12 + 1.5.15 1.0.0 4.8.1 diff --git a/samples/client/petstore/android/httpclient/pom.xml b/samples/client/petstore/android/httpclient/pom.xml index 75ef31f534d..caa541789be 100644 --- a/samples/client/petstore/android/httpclient/pom.xml +++ b/samples/client/petstore/android/httpclient/pom.xml @@ -145,7 +145,7 @@ - 1.5.12 + 1.5.15 2.3.1 4.8.1 1.0.0 diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index d21f1775565..8abcc8d6bf7 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -247,10 +247,10 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.4.0 2.1.0 - 2.8.7 + 2.8.9 2.6.4 4.12 1.0.0 diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index 4398ea01e8f..11737e1547a 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -184,7 +184,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/client/petstore/jaxrs-cxf/pom.xml b/samples/client/petstore/jaxrs-cxf/pom.xml index a530a3e6fb2..a61e8918261 100644 --- a/samples/client/petstore/jaxrs-cxf/pom.xml +++ b/samples/client/petstore/jaxrs-cxf/pom.xml @@ -162,7 +162,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml index 02c83f264df..2ad1f31df4e 100644 --- a/samples/client/petstore/scala/pom.xml +++ b/samples/client/petstore/scala/pom.xml @@ -220,7 +220,7 @@ 1.2 2.2 1.19 - 1.5.12 + 1.5.15 1.0.5 1.0.0 2.4.2 diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index 80f9232eed3..f8763abcd83 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -9,7 +9,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 org.springframework.boot diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml index 2fff1695b88..92265cc8ccf 100644 --- a/samples/server/petstore/java-inflector/pom.xml +++ b/samples/server/petstore/java-inflector/pom.xml @@ -119,7 +119,7 @@ 1.0.0 - 1.0.12 + 1.0.14 9.2.9.v20150224 1.0.1 4.8.2 diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml index b1145335c66..511883af0bd 100644 --- a/samples/server/petstore/java-msf4j/pom.xml +++ b/samples/server/petstore/java-msf4j/pom.xml @@ -92,7 +92,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION index 7fea99011a6..f9f7450d135 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml index 307ee24ba70..a7040fdae1c 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml @@ -112,6 +112,13 @@ ${junit-version} test + + + javax.validation + validation-api + ${beanvalidation-version} + provided + org.apache.cxf @@ -151,6 +158,18 @@ ${cxf-version} compile + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-jaxrs-version} + compile + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson-jaxrs-version} + compile + @@ -165,13 +184,15 @@ 1.7 ${java.version} ${java.version} - 1.5.10 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 1.1.7 2.5 + 1.1.0.Final 3.1.11 + 2.8.9 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION index 7fea99011a6..f9f7450d135 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml index 97d19784600..d2012f38a76 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml @@ -3,7 +3,7 @@ io.swagger swagger-cxf-server-non-spring war - swagger-cxf-non-spring + swagger-cxf-server-non-spring 1.0.0 src/main/java @@ -112,6 +112,13 @@ ${junit-version} test + + + javax.validation + validation-api + ${beanvalidation-version} + provided + org.apache.cxf @@ -151,6 +158,18 @@ ${cxf-version} compile + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-jaxrs-version} + compile + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson-jaxrs-version} + compile + @@ -165,13 +184,15 @@ 1.7 ${java.version} ${java.version} - 1.5.10 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 1.1.7 2.5 + 1.1.0.Final 3.1.11 + 2.8.9 UTF-8 diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 999c3123463..aad54511529 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -184,7 +184,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 4.12 diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml index 93f4ec76ecb..4387e631154 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml @@ -162,7 +162,7 @@ - 1.5.9 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index 5a1e46c3fe4..0155af16b22 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -163,7 +163,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index 762c0ccf7b9..a760e1662ea 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -158,7 +158,7 @@ - 1.5.12 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml index 1d0cfada829..ea3ff373067 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml @@ -154,7 +154,7 @@ - 1.5.9 + 1.5.15 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index feaca47dd95..b1516889769 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -189,7 +189,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 1.19.1 2.8.7 diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index 39125b0a9b2..287ab883220 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -173,7 +173,7 @@ 1.7 ${java.version} ${java.version} - 1.5.12 + 1.5.15 9.2.9.v20150224 2.22.2 2.8.7