Skip to content

Commit 3be9094

Browse files
HugoMarioHugoMario
authored
Merge pull request #1246 from swagger-api/issue-1244
updated gradle wrapper and build.gradle template for java generators
2 parents aeb1e6e + f051d34 commit 3be9094

File tree

11 files changed

+193
-168
lines changed

11 files changed

+193
-168
lines changed

‎src/main/resources/handlebars/Java/build.gradle.mustache

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = '{{artifactVersion}}'
66

77
buildscript {
88
repositories {
9-
jcenter()
9+
mavenCentral()
1010
}
1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +15,7 @@ buildscript {
1515
}
1616

1717
repositories {
18-
jcenter()
18+
mavenCentral()
1919
}
2020

2121

@@ -87,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
8787
} else {
8888
8989
apply plugin: 'java'
90-
apply plugin: 'maven'
90+
apply plugin: 'maven-publish'
9191
9292
{{#java8}}
9393
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -98,9 +98,12 @@ if(hasProperty('target') && target == 'android') {
9898
targetCompatibility = JavaVersion.VERSION_1_7
9999
{{/java8}}
100100

101-
install {
102-
repositories.mavenInstaller {
103-
pom.artifactId = '{{artifactId}}'
101+
publishing {
102+
publications {
103+
maven(MavenPublication) {
104+
artifactId = '{{artifactId}}'
105+
from components.java
106+
}
104107
}
105108
}
106109

@@ -125,28 +128,28 @@ ext {
125128

126129
dependencies {
127130
{{#useOas2}}
128-
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
131+
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
129132
{{/useOas2}}
130133
{{^useOas2}}
131-
compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
134+
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
132135
{{/useOas2}}
133-
compile "com.sun.jersey:jersey-client:$jersey_version"
134-
compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
135-
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
136-
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
137-
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
138-
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
136+
implementation "com.sun.jersey:jersey-client:$jersey_version"
137+
implementation "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
138+
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
139+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
140+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
141+
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
139142
{{#joda}}
140-
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
143+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
141144
{{/joda}}
142145
{{#java8}}
143-
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
146+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
144147
{{/java8}}
145148
{{#threetenbp}}
146-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:2.6.4"
149+
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:2.6.4"
147150
{{/threetenbp}}
148151
{{^java8}}
149-
compile "com.brsanthu:migbase64:2.2"
152+
implementation "com.brsanthu:migbase64:2.2"
150153
{{/java8}}
151-
testCompile "junit:junit:$junit_version"
154+
testImplementation "junit:junit:$junit_version"
152155
}

‎src/main/resources/handlebars/Java/gradle-wrapper.jar

-9.94 KB
Binary file not shown.

‎src/main/resources/handlebars/Java/gradle-wrapper.properties.mustache

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Tue May 17 23:08:05 CST 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip

‎src/main/resources/handlebars/Java/libraries/feign/build.gradle.mustache

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = '{{artifactVersion}}'
66

77
buildscript {
88
repositories {
9-
jcenter()
9+
mavenCentral()
1010
}
1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +15,7 @@ buildscript {
1515
}
1616

1717
repositories {
18-
jcenter()
18+
mavenCentral()
1919
}
2020

2121

@@ -87,14 +87,17 @@ if(hasProperty('target') && target == 'android') {
8787
} else {
8888
8989
apply plugin: 'java'
90-
apply plugin: 'maven'
90+
apply plugin: 'maven-publish'
9191
9292
sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
9393
targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
9494

95-
install {
96-
repositories.mavenInstaller {
97-
pom.artifactId = '{{artifactId}}'
95+
publishing {
96+
publications {
97+
maven(MavenPublication) {
98+
artifactId = '{{artifactId}}'
99+
from components.java
100+
}
98101
}
99102
}
100103

@@ -123,31 +126,31 @@ ext {
123126

124127
dependencies {
125128
{{#useOas2}}
126-
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
129+
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
127130
{{/useOas2}}
128131
{{^useOas2}}
129-
compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
132+
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
130133
{{/useOas2}}
131-
compile "io.github.openfeign:feign-core:$feign_version"
132-
compile "io.github.openfeign:feign-jackson:$feign_version"
133-
compile "io.github.openfeign:feign-slf4j:$feign_version"
134-
compile "io.github.openfeign.form:feign-form:$feign_form_version"
135-
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
136-
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
137-
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
134+
implementation "io.github.openfeign:feign-core:$feign_version"
135+
implementation "io.github.openfeign:feign-jackson:$feign_version"
136+
implementation "io.github.openfeign:feign-slf4j:$feign_version"
137+
implementation "io.github.openfeign.form:feign-form:$feign_form_version"
138+
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
139+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
140+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
138141
{{#joda}}
139-
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
142+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
140143
{{/joda}}
141144
{{#java8}}
142-
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
145+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
143146
{{/java8}}
144147
{{#threetenbp}}
145-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
148+
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
146149
{{/threetenbp}}
147-
compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
150+
implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
148151
exclude group: "org.json", module: "json"
149152
}
150-
compile "org.json:json:20180130"
151-
compile "com.brsanthu:migbase64:2.2"
152-
testCompile "junit:junit:$junit_version"
153+
implementation "org.json:json:20180130"
154+
implementation "com.brsanthu:migbase64:2.2"
155+
testImplementation "junit:junit:$junit_version"
153156
}

‎src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = '{{artifactVersion}}'
66

77
buildscript {
88
repositories {
9-
jcenter()
9+
mavenCentral()
1010
}
1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +15,7 @@ buildscript {
1515
}
1616

1717
repositories {
18-
jcenter()
18+
mavenCentral()
1919
}
2020

2121

@@ -87,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
8787
} else {
8888
8989
apply plugin: 'java'
90-
apply plugin: 'maven'
90+
apply plugin: 'maven-publish'
9191
{{#java8}}
9292
sourceCompatibility = JavaVersion.VERSION_1_8
9393
targetCompatibility = JavaVersion.VERSION_1_8
@@ -97,9 +97,12 @@ if(hasProperty('target') && target == 'android') {
9797
targetCompatibility = JavaVersion.VERSION_1_7
9898
{{/java8}}
9999

100-
install {
101-
repositories.mavenInstaller {
102-
pom.artifactId = '{{artifactId}}'
100+
publishing {
101+
publications {
102+
maven(MavenPublication) {
103+
artifactId = '{{artifactId}}'
104+
from components.java
105+
}
103106
}
104107
}
105108

@@ -127,32 +130,32 @@ ext {
127130

128131
dependencies {
129132
{{#useOas2}}
130-
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
133+
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
131134
{{/useOas2}}
132135
{{^useOas2}}
133-
compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
136+
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
134137
{{/useOas2}}
135-
compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
136-
compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
137-
compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
138-
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
139-
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
140-
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
138+
implementation "org.glassfish.jersey.core:jersey-client:$jersey_version"
139+
implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
140+
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
141+
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
142+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
143+
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
141144
{{#joda}}
142-
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
145+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
143146
{{/joda}}
144147
{{#java8}}
145-
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
148+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
146149
{{/java8}}
147150
{{#supportJava6}}
148-
compile "commons-io:commons-io:$commons_io_version"
149-
compile "org.apache.commons:commons-lang3:$commons_lang3_version"
151+
implementation "commons-io:commons-io:$commons_io_version"
152+
implementation "org.apache.commons:commons-lang3:$commons_lang3_version"
150153
{{/supportJava6}}
151154
{{#threetenbp}}
152-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
155+
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:2.6.4"
153156
{{/threetenbp}}
154157
{{^java8}}
155-
compile "com.brsanthu:migbase64:2.2"
158+
implementation "com.brsanthu:migbase64:2.2"
156159
{{/java8}}
157-
testCompile "junit:junit:$junit_version"
160+
testImplementation "junit:junit:$junit_version"
158161
}

‎src/main/resources/handlebars/Java/libraries/okhttp-gson/build.gradle.mustache

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = '{{artifactVersion}}'
66

77
buildscript {
88
repositories {
9-
jcenter()
9+
mavenCentral()
1010
}
1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +15,7 @@ buildscript {
1515
}
1616

1717
repositories {
18-
jcenter()
18+
mavenCentral()
1919
}
2020

2121

@@ -87,14 +87,17 @@ if(hasProperty('target') && target == 'android') {
8787
} else {
8888
8989
apply plugin: 'java'
90-
apply plugin: 'maven'
90+
apply plugin: 'maven-publish'
9191
9292
sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
9393
targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
9494

95-
install {
96-
repositories.mavenInstaller {
97-
pom.artifactId = '{{artifactId}}'
95+
publishing {
96+
publications {
97+
maven(MavenPublication) {
98+
artifactId = '{{artifactId}}'
99+
from components.java
100+
}
98101
}
99102
}
100103

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

107110
dependencies {
108111
{{#useOas2}}
109-
compile 'io.swagger:swagger-annotations:1.5.15'
112+
implementation 'io.swagger:swagger-annotations:1.5.15'
110113
{{/useOas2}}
111114
{{^useOas2}}
112-
compile 'io.swagger.core.v3:swagger-annotations:2.0.0'
115+
implementation 'io.swagger.core.v3:swagger-annotations:2.0.0'
113116
{{/useOas2}}
114-
compile 'com.squareup.okhttp:okhttp:2.7.5'
115-
compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
116-
compile 'com.google.code.gson:gson:2.8.1'
117-
compile 'io.gsonfire:gson-fire:1.8.3'
117+
implementation 'com.squareup.okhttp:okhttp:2.7.5'
118+
implementation 'com.squareup.okhttp:logging-interceptor:2.7.5'
119+
implementation 'com.google.code.gson:gson:2.8.1'
120+
implementation 'io.gsonfire:gson-fire:1.8.3'
118121
{{#joda}}
119-
compile 'joda-time:joda-time:2.9.9'
122+
implementation 'joda-time:joda-time:2.9.9'
120123
{{/joda}}
121124
{{#threetenbp}}
122-
compile 'org.threeten:threetenbp:1.3.5'
125+
implementation 'org.threeten:threetenbp:1.3.5'
123126
{{/threetenbp}}
124-
testCompile 'junit:junit:4.12'
127+
testImplementation 'junit:junit:4.12'
125128
}

‎src/main/resources/handlebars/Java/libraries/okhttp4-gson/build.gradle.mustache

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = '{{artifactVersion}}'
66

77
buildscript {
88
repositories {
9-
jcenter()
9+
mavenCentral()
1010
}
1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:2.3.+'
@@ -82,14 +82,17 @@ if(hasProperty('target') && target == 'android') {
8282
} else {
8383
8484
apply plugin: 'java'
85-
apply plugin: 'maven'
85+
apply plugin: 'maven-publish'
8686
8787
sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
8888
targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
8989

90-
install {
91-
repositories.mavenInstaller {
92-
pom.artifactId = '{{artifactId}}'
90+
publishing {
91+
publications {
92+
maven(MavenPublication) {
93+
artifactId = '{{artifactId}}'
94+
from components.java
95+
}
9396
}
9497
}
9598

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

102105
dependencies {
103-
compile 'io.swagger:swagger-annotations:1.6.9'
104-
compile 'com.squareup.okhttp:okhttp:4.10.0'
105-
compile 'com.squareup.okhttp:logging-interceptor:4.10.0'
106-
compile 'com.google.code.gson:gson:2.10.1'
107-
compile 'io.gsonfire:gson-fire:1.8.5'
106+
implementation 'io.swagger:swagger-annotations:1.6.9'
107+
implementation 'com.squareup.okhttp:okhttp:4.10.0'
108+
implementation 'com.squareup.okhttp:logging-interceptor:4.10.0'
109+
implementation 'com.google.code.gson:gson:2.10.1'
110+
implementation 'io.gsonfire:gson-fire:1.8.5'
108111
{{#joda}}
109-
compile 'joda-time:joda-time:2.12.1'
112+
implementation 'joda-time:joda-time:2.12.1'
110113
{{/joda}}
111114
{{#threetenbp}}
112-
compile 'org.threeten:threetenbp:1.6.5'
115+
implementation 'org.threeten:threetenbp:1.6.5'
113116
{{/threetenbp}}
114-
testCompile 'junit:junit:4.13.2'
117+
testImplementation 'junit:junit:4.13.2'
115118
}

0 commit comments

Comments
 (0)