Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ ext {
jersey_version = "2.6"
commons_io_version=2.5
commons_lang3_version=3.6
junit_version = "4.12"
junit_version = "4.13"
threetenbp_version = "2.6.4"
}

Expand Down
2 changes: 1 addition & 1 deletion docs/templating.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ index 04a9d55..7a93c50 100644
@@ -140,9 +142,18 @@ ext {
jersey_version = "1.19.4"
jodatime_version = "2.9.9"
junit_version = "4.12"
junit_version = "4.13"
+ aspectjVersion = '1.9.0'
}

Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-online/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<spring-boot-version>2.0.7.RELEASE</spring-boot-version>
<springfox-version>2.8.0</springfox-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ dependencies {
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$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'
testCompile "junit:junit:4.11"
testCompile "junit:junit:4.13"
}
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ ext {
jackson_databind_nullable_version = "0.2.1"
jersey_version = "1.19.4"
jodatime_version = "2.9.9"
junit_version = "4.12"
junit_version = "4.13"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ext {
{{/threetenbp}}
feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
feign_form_version = "2.1.0"
junit_version = "4.12"
junit_version = "4.13"
oltu_version = "1.0.1"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.13" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
{{#threetenbp}}
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}}
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<oltu-version>1.0.1</oltu-version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ext {
google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1"
jodatime_version = "2.9.9"
junit_version = "4.12"
junit_version = "4.13"
{{#threetenbp}}
jackson_threeten_version = "2.9.10"
{{/threetenbp}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lazy val root = (project in file(".")).
{{#threetenbp}}
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
{{/threetenbp}}
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.13" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,6 @@
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ext {
{{^supportJava6}}
jersey_version = "2.27"
{{/supportJava6}}
junit_version = "4.12"
junit_version = "4.13"
{{#threetenbp}}
threetenbp_version = "2.9.10"
{{/threetenbp}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ lazy val root = (project in file(".")).
"org.apache.commons" % "commons-lang3" % "3.6",
"commons-io" % "commons-io" % "2.5",
{{/supportJava6}}
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.13" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,6 @@
<threetenbp-version>2.9.10</threetenbp-version>
{{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.18</swagger-core-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>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ artifacts {
ext {
swagger_annotations_version = "1.5.22"
jackson_version = "2.9.9"
junit_version = "4.12"
junit_version = "4.13"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,6 @@
<maven.compiler.target>11</maven.compiler.target>
<jackson-version>2.9.9</jackson-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>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ dependencies {
{{#threetenbp}}
compile 'org.threeten:threetenbp:1.4.0'
{{/threetenbp}}
testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.13'
}

javadoc {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ lazy val root = (project in file(".")).
{{/threetenbp}}
"io.gsonfire" % "gson-fire" % "1.8.3" % "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"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
{{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-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>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.21"
rest_assured_version = "4.0.0"
junit_version = "4.12"
junit_version = "4.13"
{{#jackson}}
jackson_version = "2.9.10"
jackson_databind_version = "2.9.10"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lazy val root = (project in file(".")).
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
{{/threetenbp}}
"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"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,6 @@
{{/threetenbp}}
{{/jackson}}
<okio-version>1.13.0</okio-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ ext {
commons_io_version=2.5
commons_lang3_version=3.5
{{/supportJava6}}
junit_version = "4.12"
junit_version = "4.13"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ lazy val root = (project in file(".")).
"org.apache.commons" % "commons-lang3" % "3.5" % "compile",
"commons-io" % "commons-io" % "2.5" % "compile",
{{/supportJava6}}
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.13" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,6 @@
<commons_lang3_version>3.6</commons_lang3_version>
{{/supportJava6}}
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ ext {
jackson_databind_nullable_version = "0.2.1"
spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9"
junit_version = "4.12"
junit_version = "4.13"
{{#threetenbp}}
jackson_threeten_version = "2.9.10"
{{/threetenbp}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,6 @@
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
{{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ext {
oltu_version = "1.0.1"
retrofit_version = "1.9.0"
swagger_annotations_version = "1.5.21"
junit_version = "4.12"
junit_version = "4.13"
jodatime_version = "2.9.3"
{{#threetenbp}}
threetenbp_version = "1.4.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ lazy val root = (project in file(".")).
{{#threetenbp}}
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
{{/threetenbp}}
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.13" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,6 @@
{{/threetenbp}}
<oltu-version>1.0.1</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ ext {
{{/play26}}
{{/usePlayWS}}
swagger_annotations_version = "1.5.22"
junit_version = "4.12"
junit_version = "4.13"
{{#useRxJava}}
rx_java_version = "1.3.0"
{{/useRxJava}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ lazy val root = (project in file(".")).
"org.threeten" % "threetenbp" % "1.4.0" % "compile",
{{/threetenbp}}
"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"
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,6 @@
<threetenbp-version>1.4.0</threetenbp-version>
{{/threetenbp}}
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ext {
jackson_version = "2.9.10"
jackson_databind_version = "2.9.10.1"
vertx_version = "3.4.2"
junit_version = "4.12"
junit_version = "4.13"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,6 @@
<jackson-version>2.9.10</jackson-version>
<jackson-databind>2.9.10.1</jackson-databind>
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10.1</jackson-databind-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-netty-version>0.7.8.RELEASE</reactor-netty-version>
{{#joda}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,6 @@
{{/supportJava6}}
<jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,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.12</junit-version>
<junit-version>4.13</junit-version>
<logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
{{/generateSpringBootApplication}}
{{/generateSpringApplication}}
{{^generateSpringBootApplication}}
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
<logback-version>1.1.7</logback-version>
{{/generateSpringBootApplication}}
<cxf-version>3.3.0</cxf-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.18</swagger-core-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>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,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.12</junit-version>
<junit-version>4.13</junit-version>
<logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<jersey-version>1.19.1</jersey-version>
<jackson-version>2.9.9</jackson-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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
<commons_io_version>2.5</commons_io_version>
<commons_lang3_version>3.5</commons_lang3_version>
{{/supportJava6}}
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
<logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
{{#java8}}
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9'
{{/java8}}
testCompile 'junit:junit:4.12',
testCompile 'junit:junit:4.13',
'org.hamcrest:hamcrest-core:1.3'
}

Expand Down
Loading