Skip to content

Commit

Permalink
Merge pull request #1246 from swagger-api/issue-1244
Browse files Browse the repository at this point in the history 
updated gradle wrapper and build.gradle template for java generators
  • Loading branch information
@HugoMario
HugoMario authored Jan 21, 2024
2 parents aeb1e6e + f051d34 commit 3be9094
Show file tree
Hide file tree
Showing 11 changed files with 193 additions and 168 deletions.
41 changes: 22 additions & 19 deletions src/main/resources/handlebars/Java/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = '{{artifactVersion}}'

buildscript {
repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.+'
Expand All @@ -15,7 +15,7 @@ buildscript {
}

repositories {
jcenter()
mavenCentral()
}


Expand Down Expand Up @@ -87,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
} else {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'maven-publish'
{{#java8}}
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -98,9 +98,12 @@ if(hasProperty('target') && target == 'android') {
targetCompatibility = JavaVersion.VERSION_1_7
{{/java8}}

install {
repositories.mavenInstaller {
pom.artifactId = '{{artifactId}}'
publishing {
publications {
maven(MavenPublication) {
artifactId = '{{artifactId}}'
from components.java
}
}
}

Expand All @@ -125,28 +128,28 @@ ext {

dependencies {
{{#useOas2}}
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
{{/useOas2}}
{{^useOas2}}
compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
{{/useOas2}}
compile "com.sun.jersey:jersey-client:$jersey_version"
compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
implementation "com.sun.jersey:jersey-client:$jersey_version"
implementation "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
{{#joda}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
{{/joda}}
{{#java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}}
{{#threetenbp}}
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:2.6.4"
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:2.6.4"
{{/threetenbp}}
{{^java8}}
compile "com.brsanthu:migbase64:2.2"
implementation "com.brsanthu:migbase64:2.2"
{{/java8}}
testCompile "junit:junit:$junit_version"
testImplementation "junit:junit:$junit_version"
}
Binary file modified src/main/resources/handlebars/Java/gradle-wrapper.jar
View file
Binary file not shown.
5 changes: 3 additions & 2 deletions src/main/resources/handlebars/Java/gradle-wrapper.properties.mustache
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Tue May 17 23:08:05 CST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
47 changes: 25 additions & 22 deletions src/main/resources/handlebars/Java/libraries/feign/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = '{{artifactVersion}}'

buildscript {
repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.+'
Expand All @@ -15,7 +15,7 @@ buildscript {
}

repositories {
jcenter()
mavenCentral()
}


Expand Down Expand Up @@ -87,14 +87,17 @@ if(hasProperty('target') && target == 'android') {
} else {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'maven-publish'
sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}

install {
repositories.mavenInstaller {
pom.artifactId = '{{artifactId}}'
publishing {
publications {
maven(MavenPublication) {
artifactId = '{{artifactId}}'
from components.java
}
}
}

Expand Down Expand Up @@ -123,31 +126,31 @@ ext {

dependencies {
{{#useOas2}}
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
{{/useOas2}}
{{^useOas2}}
compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
{{/useOas2}}
compile "io.github.openfeign:feign-core:$feign_version"
compile "io.github.openfeign:feign-jackson:$feign_version"
compile "io.github.openfeign:feign-slf4j:$feign_version"
compile "io.github.openfeign.form:feign-form:$feign_form_version"
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "io.github.openfeign:feign-core:$feign_version"
implementation "io.github.openfeign:feign-jackson:$feign_version"
implementation "io.github.openfeign:feign-slf4j:$feign_version"
implementation "io.github.openfeign.form:feign-form:$feign_form_version"
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
{{#joda}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
{{/joda}}
{{#java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}}
{{#threetenbp}}
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
{{/threetenbp}}
compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
exclude group: "org.json", module: "json"
}
compile "org.json:json:20180130"
compile "com.brsanthu:migbase64:2.2"
testCompile "junit:junit:$junit_version"
implementation "org.json:json:20180130"
implementation "com.brsanthu:migbase64:2.2"
testImplementation "junit:junit:$junit_version"
}
45 changes: 24 additions & 21 deletions src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = '{{artifactVersion}}'

buildscript {
repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.+'
Expand All @@ -15,7 +15,7 @@ buildscript {
}

repositories {
jcenter()
mavenCentral()
}


Expand Down Expand Up @@ -87,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
} else {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'maven-publish'
{{#java8}}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -97,9 +97,12 @@ if(hasProperty('target') && target == 'android') {
targetCompatibility = JavaVersion.VERSION_1_7
{{/java8}}

install {
repositories.mavenInstaller {
pom.artifactId = '{{artifactId}}'
publishing {
publications {
maven(MavenPublication) {
artifactId = '{{artifactId}}'
from components.java
}
}
}

Expand Down Expand Up @@ -127,32 +130,32 @@ ext {

dependencies {
{{#useOas2}}
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
{{/useOas2}}
{{^useOas2}}
compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
{{/useOas2}}
compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
{{#joda}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
{{/joda}}
{{#java8}}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
{{/java8}}
{{#supportJava6}}
compile "commons-io:commons-io:$commons_io_version"
compile "org.apache.commons:commons-lang3:$commons_lang3_version"
implementation "commons-io:commons-io:$commons_io_version"
implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
{{/supportJava6}}
{{#threetenbp}}
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:2.6.4"
{{/threetenbp}}
{{^java8}}
compile "com.brsanthu:migbase64:2.2"
implementation "com.brsanthu:migbase64:2.2"
{{/java8}}
testCompile "junit:junit:$junit_version"
testImplementation "junit:junit:$junit_version"
}
33 changes: 18 additions & 15 deletions src/main/resources/handlebars/Java/libraries/okhttp-gson/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = '{{artifactVersion}}'

buildscript {
repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.+'
Expand All @@ -15,7 +15,7 @@ buildscript {
}

repositories {
jcenter()
mavenCentral()
}


Expand Down Expand Up @@ -87,14 +87,17 @@ if(hasProperty('target') && target == 'android') {
} else {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'maven-publish'
sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}

install {
repositories.mavenInstaller {
pom.artifactId = '{{artifactId}}'
publishing {
publications {
maven(MavenPublication) {
artifactId = '{{artifactId}}'
from components.java
}
}
}

Expand All @@ -106,20 +109,20 @@ if(hasProperty('target') && target == 'android') {

dependencies {
{{#useOas2}}
compile 'io.swagger:swagger-annotations:1.5.15'
implementation 'io.swagger:swagger-annotations:1.5.15'
{{/useOas2}}
{{^useOas2}}
compile 'io.swagger.core.v3:swagger-annotations:2.0.0'
implementation 'io.swagger.core.v3:swagger-annotations:2.0.0'
{{/useOas2}}
compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
compile 'com.google.code.gson:gson:2.8.1'
compile 'io.gsonfire:gson-fire:1.8.3'
implementation 'com.squareup.okhttp:okhttp:2.7.5'
implementation 'com.squareup.okhttp:logging-interceptor:2.7.5'
implementation 'com.google.code.gson:gson:2.8.1'
implementation 'io.gsonfire:gson-fire:1.8.3'
{{#joda}}
compile 'joda-time:joda-time:2.9.9'
implementation 'joda-time:joda-time:2.9.9'
{{/joda}}
{{#threetenbp}}
compile 'org.threeten:threetenbp:1.3.5'
implementation 'org.threeten:threetenbp:1.3.5'
{{/threetenbp}}
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
}
29 changes: 16 additions & 13 deletions src/main/resources/handlebars/Java/libraries/okhttp4-gson/build.gradle.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = '{{artifactVersion}}'

buildscript {
repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.+'
Expand Down Expand Up @@ -82,14 +82,17 @@ if(hasProperty('target') && target == 'android') {
} else {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'maven-publish'
sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}

install {
repositories.mavenInstaller {
pom.artifactId = '{{artifactId}}'
publishing {
publications {
maven(MavenPublication) {
artifactId = '{{artifactId}}'
from components.java
}
}
}

Expand All @@ -100,16 +103,16 @@ if(hasProperty('target') && target == 'android') {
}

dependencies {
compile 'io.swagger:swagger-annotations:1.6.9'
compile 'com.squareup.okhttp:okhttp:4.10.0'
compile 'com.squareup.okhttp:logging-interceptor:4.10.0'
compile 'com.google.code.gson:gson:2.10.1'
compile 'io.gsonfire:gson-fire:1.8.5'
implementation 'io.swagger:swagger-annotations:1.6.9'
implementation 'com.squareup.okhttp:okhttp:4.10.0'
implementation 'com.squareup.okhttp:logging-interceptor:4.10.0'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'io.gsonfire:gson-fire:1.8.5'
{{#joda}}
compile 'joda-time:joda-time:2.12.1'
implementation 'joda-time:joda-time:2.12.1'
{{/joda}}
{{#threetenbp}}
compile 'org.threeten:threetenbp:1.6.5'
implementation 'org.threeten:threetenbp:1.6.5'
{{/threetenbp}}
testCompile 'junit:junit:4.13.2'
testImplementation 'junit:junit:4.13.2'
}
Loading

0 comments on commit 3be9094

Please sign in to comment.