forked from loafle/openapi-generator-original
upgrade to JUnit 4.13 (#4899)
This commit is contained in:
parent
89e963c072
commit
178a3e24bd
@ -102,7 +102,7 @@ ext {
|
|||||||
jersey_version = "2.6"
|
jersey_version = "2.6"
|
||||||
commons_io_version=2.5
|
commons_io_version=2.5
|
||||||
commons_lang3_version=3.6
|
commons_lang3_version=3.6
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
threetenbp_version = "2.6.4"
|
threetenbp_version = "2.6.4"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ index 04a9d55..7a93c50 100644
|
|||||||
@@ -140,9 +142,18 @@ ext {
|
@@ -140,9 +142,18 @@ ext {
|
||||||
jersey_version = "1.19.4"
|
jersey_version = "1.19.4"
|
||||||
jodatime_version = "2.9.9"
|
jodatime_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
+ aspectjVersion = '1.9.0'
|
+ aspectjVersion = '1.9.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<spring-boot-version>2.0.7.RELEASE</spring-boot-version>
|
<spring-boot-version>2.0.7.RELEASE</spring-boot-version>
|
||||||
<springfox-version>2.8.0</springfox-version>
|
<springfox-version>2.8.0</springfox-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -40,5 +40,5 @@ dependencies {
|
|||||||
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
|
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
|
||||||
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
|
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
|
||||||
compile 'io.github.http-builder-ng:http-builder-ng-core:1.0.3'
|
compile 'io.github.http-builder-ng:http-builder-ng-core:1.0.3'
|
||||||
testCompile "junit:junit:4.11"
|
testCompile "junit:junit:4.13"
|
||||||
}
|
}
|
||||||
|
@ -141,7 +141,7 @@ ext {
|
|||||||
jackson_databind_nullable_version = "0.2.1"
|
jackson_databind_nullable_version = "0.2.1"
|
||||||
jersey_version = "1.19.4"
|
jersey_version = "1.19.4"
|
||||||
jodatime_version = "2.9.9"
|
jodatime_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -128,7 +128,7 @@ ext {
|
|||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
|
feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
|
||||||
feign_form_version = "2.1.0"
|
feign_form_version = "2.1.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
oltu_version = "1.0.1"
|
oltu_version = "1.0.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
||||||
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
|
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
|
||||||
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -320,7 +320,7 @@
|
|||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<oltu-version>1.0.1</oltu-version>
|
<oltu-version>1.0.1</oltu-version>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -126,7 +126,7 @@ ext {
|
|||||||
google_api_client_version = "1.23.0"
|
google_api_client_version = "1.23.0"
|
||||||
jersey_common_version = "2.25.1"
|
jersey_common_version = "2.25.1"
|
||||||
jodatime_version = "2.9.9"
|
jodatime_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
jackson_threeten_version = "2.9.10"
|
jackson_threeten_version = "2.9.10"
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
|
@ -27,7 +27,7 @@ lazy val root = (project in file(".")).
|
|||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -316,6 +316,6 @@
|
|||||||
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -130,7 +130,7 @@ ext {
|
|||||||
{{^supportJava6}}
|
{{^supportJava6}}
|
||||||
jersey_version = "2.27"
|
jersey_version = "2.27"
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
threetenbp_version = "2.9.10"
|
threetenbp_version = "2.9.10"
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
|
@ -32,7 +32,7 @@ lazy val root = (project in file(".")).
|
|||||||
"org.apache.commons" % "commons-lang3" % "3.6",
|
"org.apache.commons" % "commons-lang3" % "3.6",
|
||||||
"commons-io" % "commons-io" % "2.5",
|
"commons-io" % "commons-io" % "2.5",
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -367,6 +367,6 @@
|
|||||||
<threetenbp-version>2.9.10</threetenbp-version>
|
<threetenbp-version>2.9.10</threetenbp-version>
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -160,7 +160,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<swagger-core-version>1.5.18</swagger-core-version>
|
<swagger-core-version>1.5.18</swagger-core-version>
|
||||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<logback-version>1.1.7</logback-version>
|
<logback-version>1.1.7</logback-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
{{#useBeanValidation}}
|
{{#useBeanValidation}}
|
||||||
|
@ -52,7 +52,7 @@ artifacts {
|
|||||||
ext {
|
ext {
|
||||||
swagger_annotations_version = "1.5.22"
|
swagger_annotations_version = "1.5.22"
|
||||||
jackson_version = "2.9.9"
|
jackson_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -216,6 +216,6 @@
|
|||||||
<maven.compiler.target>11</maven.compiler.target>
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
<jackson-version>2.9.9</jackson-version>
|
<jackson-version>2.9.9</jackson-version>
|
||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -142,7 +142,7 @@ dependencies {
|
|||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
compile 'org.threeten:threetenbp:1.4.0'
|
compile 'org.threeten:threetenbp:1.4.0'
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.13'
|
||||||
}
|
}
|
||||||
|
|
||||||
javadoc {
|
javadoc {
|
||||||
|
@ -25,7 +25,7 @@ lazy val root = (project in file(".")).
|
|||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
||||||
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
|
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -320,7 +320,7 @@
|
|||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<javax-annotation-version>1.0</javax-annotation-version>
|
<javax-annotation-version>1.0</javax-annotation-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -97,7 +97,7 @@ if(hasProperty('target') && target == 'android') {
|
|||||||
ext {
|
ext {
|
||||||
swagger_annotations_version = "1.5.21"
|
swagger_annotations_version = "1.5.21"
|
||||||
rest_assured_version = "4.0.0"
|
rest_assured_version = "4.0.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
{{#jackson}}
|
{{#jackson}}
|
||||||
jackson_version = "2.9.10"
|
jackson_version = "2.9.10"
|
||||||
jackson_databind_version = "2.9.10"
|
jackson_databind_version = "2.9.10"
|
||||||
|
@ -27,7 +27,7 @@ lazy val root = (project in file(".")).
|
|||||||
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
"com.squareup.okio" % "okio" % "1.13.0" % "compile",
|
"com.squareup.okio" % "okio" % "1.13.0" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -331,6 +331,6 @@
|
|||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
{{/jackson}}
|
{{/jackson}}
|
||||||
<okio-version>1.13.0</okio-version>
|
<okio-version>1.13.0</okio-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -131,7 +131,7 @@ ext {
|
|||||||
commons_io_version=2.5
|
commons_io_version=2.5
|
||||||
commons_lang3_version=3.5
|
commons_lang3_version=3.5
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -29,7 +29,7 @@ lazy val root = (project in file(".")).
|
|||||||
"org.apache.commons" % "commons-lang3" % "3.5" % "compile",
|
"org.apache.commons" % "commons-lang3" % "3.5" % "compile",
|
||||||
"commons-io" % "commons-io" % "2.5" % "compile",
|
"commons-io" % "commons-io" % "2.5" % "compile",
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -306,6 +306,6 @@
|
|||||||
<commons_lang3_version>3.6</commons_lang3_version>
|
<commons_lang3_version>3.6</commons_lang3_version>
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -125,7 +125,7 @@ ext {
|
|||||||
jackson_databind_nullable_version = "0.2.1"
|
jackson_databind_nullable_version = "0.2.1"
|
||||||
spring_web_version = "4.3.9.RELEASE"
|
spring_web_version = "4.3.9.RELEASE"
|
||||||
jodatime_version = "2.9.9"
|
jodatime_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
jackson_threeten_version = "2.9.10"
|
jackson_threeten_version = "2.9.10"
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
|
@ -319,6 +319,6 @@
|
|||||||
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -111,7 +111,7 @@ ext {
|
|||||||
oltu_version = "1.0.1"
|
oltu_version = "1.0.1"
|
||||||
retrofit_version = "1.9.0"
|
retrofit_version = "1.9.0"
|
||||||
swagger_annotations_version = "1.5.21"
|
swagger_annotations_version = "1.5.21"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
jodatime_version = "2.9.3"
|
jodatime_version = "2.9.3"
|
||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
threetenbp_version = "1.4.0"
|
threetenbp_version = "1.4.0"
|
||||||
|
@ -17,7 +17,7 @@ lazy val root = (project in file(".")).
|
|||||||
{{#threetenbp}}
|
{{#threetenbp}}
|
||||||
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -280,6 +280,6 @@
|
|||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
<oltu-version>1.0.1</oltu-version>
|
<oltu-version>1.0.1</oltu-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -138,7 +138,7 @@ ext {
|
|||||||
{{/play26}}
|
{{/play26}}
|
||||||
{{/usePlayWS}}
|
{{/usePlayWS}}
|
||||||
swagger_annotations_version = "1.5.22"
|
swagger_annotations_version = "1.5.22"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
{{#useRxJava}}
|
{{#useRxJava}}
|
||||||
rx_java_version = "1.3.0"
|
rx_java_version = "1.3.0"
|
||||||
{{/useRxJava}}
|
{{/useRxJava}}
|
||||||
|
@ -53,7 +53,7 @@ lazy val root = (project in file(".")).
|
|||||||
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
|
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.11" % "test"
|
"com.novocode" % "junit-interface" % "0.11" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -404,6 +404,6 @@
|
|||||||
<threetenbp-version>1.4.0</threetenbp-version>
|
<threetenbp-version>1.4.0</threetenbp-version>
|
||||||
{{/threetenbp}}
|
{{/threetenbp}}
|
||||||
<oltu-version>1.0.1</oltu-version>
|
<oltu-version>1.0.1</oltu-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -31,7 +31,7 @@ ext {
|
|||||||
jackson_version = "2.9.10"
|
jackson_version = "2.9.10"
|
||||||
jackson_databind_version = "2.9.10.1"
|
jackson_databind_version = "2.9.10.1"
|
||||||
vertx_version = "3.4.2"
|
vertx_version = "3.4.2"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -292,6 +292,6 @@
|
|||||||
<jackson-version>2.9.10</jackson-version>
|
<jackson-version>2.9.10</jackson-version>
|
||||||
<jackson-databind>2.9.10.1</jackson-databind>
|
<jackson-databind>2.9.10.1</jackson-databind>
|
||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -146,7 +146,7 @@
|
|||||||
<jackson-version>2.9.10</jackson-version>
|
<jackson-version>2.9.10</jackson-version>
|
||||||
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<reactor-version>3.1.8.RELEASE</reactor-version>
|
<reactor-version>3.1.8.RELEASE</reactor-version>
|
||||||
<reactor-netty-version>0.7.8.RELEASE</reactor-netty-version>
|
<reactor-netty-version>0.7.8.RELEASE</reactor-netty-version>
|
||||||
{{#joda}}
|
{{#joda}}
|
||||||
|
@ -356,6 +356,6 @@
|
|||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
<jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
|
<jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -206,7 +206,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<swagger-core-version>1.5.22</swagger-core-version>
|
<swagger-core-version>1.5.22</swagger-core-version>
|
||||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<logback-version>1.1.7</logback-version>
|
<logback-version>1.1.7</logback-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
{{#useBeanValidation}}
|
{{#useBeanValidation}}
|
||||||
|
@ -337,7 +337,7 @@
|
|||||||
{{/generateSpringBootApplication}}
|
{{/generateSpringBootApplication}}
|
||||||
{{/generateSpringApplication}}
|
{{/generateSpringApplication}}
|
||||||
{{^generateSpringBootApplication}}
|
{{^generateSpringBootApplication}}
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<logback-version>1.1.7</logback-version>
|
<logback-version>1.1.7</logback-version>
|
||||||
{{/generateSpringBootApplication}}
|
{{/generateSpringBootApplication}}
|
||||||
<cxf-version>3.3.0</cxf-version>
|
<cxf-version>3.3.0</cxf-version>
|
||||||
|
@ -200,7 +200,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<swagger-core-version>1.5.18</swagger-core-version>
|
<swagger-core-version>1.5.18</swagger-core-version>
|
||||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<logback-version>1.1.7</logback-version>
|
<logback-version>1.1.7</logback-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
{{#useBeanValidation}}
|
{{#useBeanValidation}}
|
||||||
|
@ -251,7 +251,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<swagger-core-version>1.5.22</swagger-core-version>
|
<swagger-core-version>1.5.22</swagger-core-version>
|
||||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<logback-version>1.1.7</logback-version>
|
<logback-version>1.1.7</logback-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
{{#useBeanValidation}}
|
{{#useBeanValidation}}
|
||||||
|
@ -208,7 +208,7 @@
|
|||||||
<jersey-version>1.19.1</jersey-version>
|
<jersey-version>1.19.1</jersey-version>
|
||||||
<jackson-version>2.9.9</jackson-version>
|
<jackson-version>2.9.9</jackson-version>
|
||||||
<slf4j-version>1.7.21</slf4j-version>
|
<slf4j-version>1.7.21</slf4j-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -217,7 +217,7 @@
|
|||||||
<commons_io_version>2.5</commons_io_version>
|
<commons_io_version>2.5</commons_io_version>
|
||||||
<commons_lang3_version>3.5</commons_lang3_version>
|
<commons_lang3_version>3.5</commons_lang3_version>
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<logback-version>1.1.7</logback-version>
|
<logback-version>1.1.7</logback-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
@ -25,7 +25,7 @@ dependencies {
|
|||||||
{{#java8}}
|
{{#java8}}
|
||||||
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9'
|
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9'
|
||||||
{{/java8}}
|
{{/java8}}
|
||||||
testCompile 'junit:junit:4.12',
|
testCompile 'junit:junit:4.13',
|
||||||
'org.hamcrest:hamcrest-core:1.3'
|
'org.hamcrest:hamcrest-core:1.3'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ dependencies {
|
|||||||
//TODO: swaggerFeature
|
//TODO: swaggerFeature
|
||||||
compile 'io.swagger:swagger-jaxrs:1.5.12'
|
compile 'io.swagger:swagger-jaxrs:1.5.12'
|
||||||
|
|
||||||
testCompile 'junit:junit:4.12',
|
testCompile 'junit:junit:4.13',
|
||||||
'org.hamcrest:hamcrest-core:1.3'
|
'org.hamcrest:hamcrest-core:1.3'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<jetty-version>9.2.15.v20160210</jetty-version>
|
<jetty-version>9.2.15.v20160210</jetty-version>
|
||||||
<slf4j-version>1.7.21</slf4j-version>
|
<slf4j-version>1.7.21</slf4j-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
<springfox-version>2.8.0</springfox-version>
|
<springfox-version>2.8.0</springfox-version>
|
||||||
<jackson-version>2.9.9</jackson-version>
|
<jackson-version>2.9.9</jackson-version>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<junit.version>4.12</junit.version>
|
<junit.version>4.13</junit.version>
|
||||||
<vertx.version>3.4.1</vertx.version>
|
<vertx.version>3.4.1</vertx.version>
|
||||||
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
||||||
<vertx-swagger-router.version>{{vertxSwaggerRouterVersion}}</vertx-swagger-router.version>
|
<vertx-swagger-router.version>{{vertxSwaggerRouterVersion}}</vertx-swagger-router.version>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<vertx.version>3.6.3</vertx.version>
|
<vertx.version>3.6.3</vertx.version>
|
||||||
<slf4j.version>1.7.26</slf4j.version>
|
<slf4j.version>1.7.26</slf4j.version>
|
||||||
<junit.version>4.12</junit.version>
|
<junit.version>4.13</junit.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -91,7 +91,7 @@ ext {
|
|||||||
gson_version = "2.3.1"
|
gson_version = "2.3.1"
|
||||||
httpclient_version = "4.5.2"
|
httpclient_version = "4.5.2"
|
||||||
httpcore_version = "4.4.4"
|
httpcore_version = "4.4.4"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -76,7 +76,7 @@ ext {
|
|||||||
httpcore_version = "4.4.4"
|
httpcore_version = "4.4.4"
|
||||||
httpclient_version = "4.3.3"
|
httpclient_version = "4.3.3"
|
||||||
volley_version = "1.0.0"
|
volley_version = "1.0.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
robolectric_version = "3.0"
|
robolectric_version = "3.0"
|
||||||
concurrent_unit_version = "0.4.2"
|
concurrent_unit_version = "0.4.2"
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
<version.encoder>1.2</version.encoder>
|
<version.encoder>1.2</version.encoder>
|
||||||
<version.metrics>3.1.2</version.metrics>
|
<version.metrics>3.1.2</version.metrics>
|
||||||
<version.logback>1.1.7</version.logback>
|
<version.logback>1.1.7</version.logback>
|
||||||
<version.junit>4.12</version.junit>
|
<version.junit>4.13</version.junit>
|
||||||
<version.mockito>2.1.0-beta.124</version.mockito>
|
<version.mockito>2.1.0-beta.124</version.mockito>
|
||||||
<version.undertow>1.4.0.Final</version.undertow>
|
<version.undertow>1.4.0.Final</version.undertow>
|
||||||
<version.jsonpath>2.2.0</version.jsonpath>
|
<version.jsonpath>2.2.0</version.jsonpath>
|
||||||
|
@ -64,5 +64,5 @@ dependencies {
|
|||||||
compile "io.ktor:ktor-client-core:$ktor_version"
|
compile "io.ktor:ktor-client-core:$ktor_version"
|
||||||
compile "io.ktor:ktor-client-apache:$ktor_version"
|
compile "io.ktor:ktor-client-apache:$ktor_version"
|
||||||
compile "ch.qos.logback:logback-classic:1.2.1"
|
compile "ch.qos.logback:logback-classic:1.2.1"
|
||||||
testCompile group: 'junit', name: 'junit', version: '4.12'
|
testCompile group: 'junit', name: 'junit', version: '4.13'
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<kotlin.version>1.3.10</kotlin.version>
|
<kotlin.version>1.3.10</kotlin.version>
|
||||||
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
|
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
|
||||||
<junit.version>4.12</junit.version>
|
<junit.version>4.13</junit.version>
|
||||||
<vertx.version>3.4.1</vertx.version>
|
<vertx.version>3.4.1</vertx.version>
|
||||||
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
||||||
<vertx-openapi-router.version>1.0.2</vertx-openapi-router.version>
|
<vertx-openapi-router.version>1.0.2</vertx-openapi-router.version>
|
||||||
|
@ -14,7 +14,7 @@ libraryDependencies ++= Seq(
|
|||||||
"de.heikoseeberger" %% "akka-http-json4s" % "1.25.2",
|
"de.heikoseeberger" %% "akka-http-json4s" % "1.25.2",
|
||||||
// test dependencies
|
// test dependencies
|
||||||
"org.scalatest" %% "scalatest" % "3.0.5" % "test",
|
"org.scalatest" %% "scalatest" % "3.0.5" % "test",
|
||||||
"junit" % "junit" % "4.12" % "test"
|
"junit" % "junit" % "4.13" % "test"
|
||||||
)
|
)
|
||||||
|
|
||||||
resolvers ++= Seq(Resolver.mavenLocal)
|
resolvers ++= Seq(Resolver.mavenLocal)
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
<joda.time.version>2.10.1</joda.time.version>
|
<joda.time.version>2.10.1</joda.time.version>
|
||||||
<typesafeconfig.version>1.3.3</typesafeconfig.version>
|
<typesafeconfig.version>1.3.3</typesafeconfig.version>
|
||||||
<akka.http.json4s.version>1.25.2</akka.http.json4s.version>
|
<akka.http.json4s.version>1.25.2</akka.http.json4s.version>
|
||||||
<junit.version>4.12</junit.version>
|
<junit.version>4.13</junit.version>
|
||||||
<scala.test.version>3.0.5</scala.test.version>
|
<scala.test.version>3.0.5</scala.test.version>
|
||||||
|
|
||||||
<scala.maven.plugin.version>3.3.1</scala.maven.plugin.version>
|
<scala.maven.plugin.version>3.3.1</scala.maven.plugin.version>
|
||||||
|
@ -14,7 +14,7 @@ libraryDependencies ++= Seq(
|
|||||||
"joda-time" % "joda-time" % "2.9.9",
|
"joda-time" % "joda-time" % "2.9.9",
|
||||||
"org.joda" % "joda-convert" % "1.9.2",
|
"org.joda" % "joda-convert" % "1.9.2",
|
||||||
"org.scalatest" %% "scalatest" % "3.0.4" % "test",
|
"org.scalatest" %% "scalatest" % "3.0.4" % "test",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5"
|
"com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -244,7 +244,7 @@
|
|||||||
<maven-plugin.version>1.0.0</maven-plugin.version>
|
<maven-plugin.version>1.0.0</maven-plugin.version>
|
||||||
<jackson-version>2.9.9</jackson-version>
|
<jackson-version>2.9.9</jackson-version>
|
||||||
|
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
|
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
|
||||||
<scala-test-version>3.0.4</scala-test-version>
|
<scala-test-version>3.0.4</scala-test-version>
|
||||||
<async-httpclient-version>0.3.5</async-httpclient-version>
|
<async-httpclient-version>0.3.5</async-httpclient-version>
|
||||||
|
@ -129,7 +129,7 @@ ext {
|
|||||||
commons_io_version=2.5
|
commons_io_version=2.5
|
||||||
commons_lang3_version=3.5
|
commons_lang3_version=3.5
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -30,7 +30,7 @@ lazy val root = (project in file(".")).
|
|||||||
"org.apache.commons" % "commons-lang3" % "3.5",
|
"org.apache.commons" % "commons-lang3" % "3.5",
|
||||||
"commons-io" % "commons-io" % "2.5",
|
"commons-io" % "commons-io" % "2.5",
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -305,6 +305,6 @@
|
|||||||
<commons_lang3_version>3.5</commons_lang3_version>
|
<commons_lang3_version>3.5</commons_lang3_version>
|
||||||
{{/supportJava6}}
|
{{/supportJava6}}
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
2
pom.xml
2
pom.xml
@ -1405,7 +1405,7 @@
|
|||||||
<felix-version>3.3.1</felix-version>
|
<felix-version>3.3.1</felix-version>
|
||||||
<commons-io-version>2.4</commons-io-version>
|
<commons-io-version>2.4</commons-io-version>
|
||||||
<commons-cli-version>1.2</commons-cli-version>
|
<commons-cli-version>1.2</commons-cli-version>
|
||||||
<junit-version>4.8.1</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<jackson-version>2.8.9</jackson-version>
|
<jackson-version>2.8.9</jackson-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<commons-lang-version>3.4</commons-lang-version>
|
<commons-lang-version>3.4</commons-lang-version>
|
||||||
|
@ -53,7 +53,7 @@ ext {
|
|||||||
gson_version = "2.3.1"
|
gson_version = "2.3.1"
|
||||||
httpclient_version = "4.5.2"
|
httpclient_version = "4.5.2"
|
||||||
httpcore_version = "4.4.4"
|
httpcore_version = "4.4.4"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -58,7 +58,7 @@ ext {
|
|||||||
httpcore_version = "4.4.4"
|
httpcore_version = "4.4.4"
|
||||||
httpclient_version = "4.3.3"
|
httpclient_version = "4.3.3"
|
||||||
volley_version = "1.0.0"
|
volley_version = "1.0.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
robolectric_version = "3.0"
|
robolectric_version = "3.0"
|
||||||
concurrent_unit_version = "0.4.2"
|
concurrent_unit_version = "0.4.2"
|
||||||
}
|
}
|
||||||
|
@ -40,5 +40,5 @@ dependencies {
|
|||||||
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
|
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
|
||||||
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
|
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
|
||||||
compile 'io.github.http-builder-ng:http-builder-ng-core:1.0.3'
|
compile 'io.github.http-builder-ng:http-builder-ng-core:1.0.3'
|
||||||
testCompile "junit:junit:4.11"
|
testCompile "junit:junit:4.13"
|
||||||
}
|
}
|
||||||
|
@ -102,7 +102,7 @@ ext {
|
|||||||
jackson_threetenbp_version = "2.9.10"
|
jackson_threetenbp_version = "2.9.10"
|
||||||
feign_version = "9.7.0"
|
feign_version = "9.7.0"
|
||||||
feign_form_version = "2.1.0"
|
feign_form_version = "2.1.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
oltu_version = "1.0.1"
|
oltu_version = "1.0.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
||||||
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
|
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
|
||||||
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -285,7 +285,7 @@
|
|||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
||||||
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<oltu-version>1.0.1</oltu-version>
|
<oltu-version>1.0.1</oltu-version>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -102,7 +102,7 @@ ext {
|
|||||||
jackson_threetenbp_version = "2.9.10"
|
jackson_threetenbp_version = "2.9.10"
|
||||||
feign_version = "10.2.3"
|
feign_version = "10.2.3"
|
||||||
feign_form_version = "2.1.0"
|
feign_form_version = "2.1.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
oltu_version = "1.0.1"
|
oltu_version = "1.0.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
||||||
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
|
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
|
||||||
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -285,7 +285,7 @@
|
|||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
||||||
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<oltu-version>1.0.1</oltu-version>
|
<oltu-version>1.0.1</oltu-version>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -102,7 +102,7 @@ ext {
|
|||||||
google_api_client_version = "1.23.0"
|
google_api_client_version = "1.23.0"
|
||||||
jersey_common_version = "2.25.1"
|
jersey_common_version = "2.25.1"
|
||||||
jodatime_version = "2.9.9"
|
jodatime_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
jackson_threeten_version = "2.9.10"
|
jackson_threeten_version = "2.9.10"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
|
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
|
||||||
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
|
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
|
||||||
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -263,6 +263,6 @@
|
|||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -117,7 +117,7 @@ ext {
|
|||||||
jackson_databind_nullable_version = "0.2.1"
|
jackson_databind_nullable_version = "0.2.1"
|
||||||
jersey_version = "1.19.4"
|
jersey_version = "1.19.4"
|
||||||
jodatime_version = "2.9.9"
|
jodatime_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -267,6 +267,6 @@
|
|||||||
<jersey-version>1.19.4</jersey-version>
|
<jersey-version>1.19.4</jersey-version>
|
||||||
<jackson-version>2.6.4</jackson-version>
|
<jackson-version>2.6.4</jackson-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -102,7 +102,7 @@ ext {
|
|||||||
jersey_version = "2.6"
|
jersey_version = "2.6"
|
||||||
commons_io_version=2.5
|
commons_io_version=2.5
|
||||||
commons_lang3_version=3.6
|
commons_lang3_version=3.6
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
threetenbp_version = "2.6.4"
|
threetenbp_version = "2.6.4"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.brsanthu" % "migbase64" % "2.2",
|
"com.brsanthu" % "migbase64" % "2.2",
|
||||||
"org.apache.commons" % "commons-lang3" % "3.6",
|
"org.apache.commons" % "commons-lang3" % "3.6",
|
||||||
"commons-io" % "commons-io" % "2.5",
|
"commons-io" % "commons-io" % "2.5",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -295,6 +295,6 @@
|
|||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<threetenbp-version>2.9.10</threetenbp-version>
|
<threetenbp-version>2.9.10</threetenbp-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -99,7 +99,7 @@ ext {
|
|||||||
jackson_databind_version = "2.9.10.1"
|
jackson_databind_version = "2.9.10.1"
|
||||||
jackson_databind_nullable_version = "0.2.1"
|
jackson_databind_nullable_version = "0.2.1"
|
||||||
jersey_version = "2.27"
|
jersey_version = "2.27"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -17,7 +17,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
|
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
|
||||||
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
|
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
|
||||||
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
|
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -281,6 +281,6 @@
|
|||||||
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
<jackson-databind-version>2.9.10.1</jackson-databind-version>
|
||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -99,7 +99,7 @@ ext {
|
|||||||
jackson_databind_version = "2.9.10.1"
|
jackson_databind_version = "2.9.10.1"
|
||||||
jackson_databind_nullable_version = "0.2.1"
|
jackson_databind_nullable_version = "0.2.1"
|
||||||
jersey_version = "2.27"
|
jersey_version = "2.27"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
threetenbp_version = "2.9.10"
|
threetenbp_version = "2.9.10"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
|
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
|
||||||
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
|
||||||
"com.brsanthu" % "migbase64" % "2.2",
|
"com.brsanthu" % "migbase64" % "2.2",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -288,6 +288,6 @@
|
|||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<threetenbp-version>2.9.10</threetenbp-version>
|
<threetenbp-version>2.9.10</threetenbp-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -131,7 +131,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<swagger-core-version>1.5.18</swagger-core-version>
|
<swagger-core-version>1.5.18</swagger-core-version>
|
||||||
<jetty-version>9.2.9.v20150224</jetty-version>
|
<jetty-version>9.2.9.v20150224</jetty-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<logback-version>1.1.7</logback-version>
|
<logback-version>1.1.7</logback-version>
|
||||||
<servlet-api-version>2.5</servlet-api-version>
|
<servlet-api-version>2.5</servlet-api-version>
|
||||||
<cxf-version>3.2.7</cxf-version>
|
<cxf-version>3.2.7</cxf-version>
|
||||||
|
@ -52,7 +52,7 @@ artifacts {
|
|||||||
ext {
|
ext {
|
||||||
swagger_annotations_version = "1.5.22"
|
swagger_annotations_version = "1.5.22"
|
||||||
jackson_version = "2.9.9"
|
jackson_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -209,6 +209,6 @@
|
|||||||
<maven.compiler.target>11</maven.compiler.target>
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
<jackson-version>2.9.9</jackson-version>
|
<jackson-version>2.9.9</jackson-version>
|
||||||
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -107,7 +107,7 @@ dependencies {
|
|||||||
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
|
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
|
||||||
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
|
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
|
||||||
compile 'org.threeten:threetenbp:1.4.0'
|
compile 'org.threeten:threetenbp:1.4.0'
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.13'
|
||||||
}
|
}
|
||||||
|
|
||||||
javadoc {
|
javadoc {
|
||||||
|
@ -18,7 +18,7 @@ lazy val root = (project in file(".")).
|
|||||||
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
||||||
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
||||||
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
|
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -273,7 +273,7 @@
|
|||||||
<threetenbp-version>1.4.0</threetenbp-version>
|
<threetenbp-version>1.4.0</threetenbp-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<javax-annotation-version>1.0</javax-annotation-version>
|
<javax-annotation-version>1.0</javax-annotation-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -107,7 +107,7 @@ dependencies {
|
|||||||
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
|
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
|
||||||
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
|
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
|
||||||
compile 'org.threeten:threetenbp:1.4.0'
|
compile 'org.threeten:threetenbp:1.4.0'
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.13'
|
||||||
}
|
}
|
||||||
|
|
||||||
javadoc {
|
javadoc {
|
||||||
|
@ -18,7 +18,7 @@ lazy val root = (project in file(".")).
|
|||||||
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
||||||
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
||||||
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
|
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -266,7 +266,7 @@
|
|||||||
<threetenbp-version>1.4.0</threetenbp-version>
|
<threetenbp-version>1.4.0</threetenbp-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<javax-annotation-version>1.0</javax-annotation-version>
|
<javax-annotation-version>1.0</javax-annotation-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -97,7 +97,7 @@ if(hasProperty('target') && target == 'android') {
|
|||||||
ext {
|
ext {
|
||||||
swagger_annotations_version = "1.5.21"
|
swagger_annotations_version = "1.5.21"
|
||||||
rest_assured_version = "4.0.0"
|
rest_assured_version = "4.0.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
gson_version = "2.8.5"
|
gson_version = "2.8.5"
|
||||||
gson_fire_version = "1.8.3"
|
gson_fire_version = "1.8.3"
|
||||||
threetenbp_version = "1.4.0"
|
threetenbp_version = "1.4.0"
|
||||||
|
@ -15,7 +15,7 @@ lazy val root = (project in file(".")).
|
|||||||
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
|
||||||
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
|
||||||
"com.squareup.okio" % "okio" % "1.13.0" % "compile",
|
"com.squareup.okio" % "okio" % "1.13.0" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -247,6 +247,6 @@
|
|||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<threetenbp-version>1.4.0</threetenbp-version>
|
<threetenbp-version>1.4.0</threetenbp-version>
|
||||||
<okio-version>1.13.0</okio-version>
|
<okio-version>1.13.0</okio-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
@ -101,7 +101,7 @@ ext {
|
|||||||
threetenbp_version = "2.9.10"
|
threetenbp_version = "2.9.10"
|
||||||
resteasy_version = "3.1.3.Final"
|
resteasy_version = "3.1.3.Final"
|
||||||
jodatime_version = "2.9.9"
|
jodatime_version = "2.9.9"
|
||||||
junit_version = "4.12"
|
junit_version = "4.13"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -20,7 +20,7 @@ lazy val root = (project in file(".")).
|
|||||||
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
|
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
|
||||||
"joda-time" % "joda-time" % "2.9.9" % "compile",
|
"joda-time" % "joda-time" % "2.9.9" % "compile",
|
||||||
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
"com.brsanthu" % "migbase64" % "2.2" % "compile",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.13" % "test",
|
||||||
"com.novocode" % "junit-interface" % "0.10" % "test"
|
"com.novocode" % "junit-interface" % "0.10" % "test"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -249,6 +249,6 @@
|
|||||||
<threetenbp-version>2.9.10</threetenbp-version>
|
<threetenbp-version>2.9.10</threetenbp-version>
|
||||||
<jodatime-version>2.9.9</jodatime-version>
|
<jodatime-version>2.9.9</jodatime-version>
|
||||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||||
<junit-version>4.12</junit-version>
|
<junit-version>4.13</junit-version>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user