loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

exclude commons package from org.apache.oltu.oauth2 to provide a more long-term fix.

Browse Source
This commit is contained in:
Joseph Elliott 2018-01-08 14:41:57 +01:00
parent c642d8a89b
commit 673be4e88f
12 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
View File

@ -100,7 +100,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
oltu_version = "1.0.0" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
{{#usePlayWS}} {{#usePlayWS}}
{{#play24}} {{#play24}}
@ -142,7 +142,9 @@ dependencies {
compile "io.reactivex.rxjava2:rxjava:$rx_java_version" compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
{{/useRxJava2}} {{/useRxJava2}}
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
{{#joda}} {{#joda}}
compile "joda-time:joda-time:$jodatime_version" compile "joda-time:joda-time:$jodatime_version"

8
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
View File

@ -212,6 +212,12 @@
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>
@ -349,7 +355,7 @@
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>
</project> </project>

6
samples/client/petstore/java/retrofit2-play24/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
oltu_version = "1.0.0" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
jackson_version = "2.6.6" jackson_version = "2.6.6"
play_version = "2.4.11" play_version = "2.4.11"
@ -108,7 +108,9 @@ dependencies {
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "com.typesafe.play:play-java-ws_2.11:$play_version" compile "com.typesafe.play:play-java-ws_2.11:$play_version"
compile "com.squareup.retrofit2:converter-jackson:$retrofit_version" compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"

9
samples/client/petstore/java/retrofit2-play24/pom.xml
View File

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>
@ -270,7 +277,7 @@
<jackson-version>2.6.6</jackson-version> <jackson-version>2.6.6</jackson-version>
<play-version>2.4.11</play-version> <play-version>2.4.11</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>
</project> </project>

6
samples/client/petstore/java/retrofit2-play25/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
oltu_version = "1.0.0" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
jackson_version = "2.7.8" jackson_version = "2.7.8"
play_version = "2.5.14" play_version = "2.5.14"
@ -109,7 +109,9 @@ dependencies {
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"
compile "com.typesafe.play:play-java-ws_2.11:$play_version" compile "com.typesafe.play:play-java-ws_2.11:$play_version"

9
samples/client/petstore/java/retrofit2-play25/pom.xml
View File

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>
@ -276,7 +283,7 @@
<play-version>2.5.15</play-version> <play-version>2.5.15</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>
</project> </project>

6
samples/client/petstore/java/retrofit2/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
oltu_version = "1.0.0" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.15"
junit_version = "4.12" junit_version = "4.12"
@ -107,7 +107,9 @@ dependencies {
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"

9
samples/client/petstore/java/retrofit2/pom.xml
View File

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>
@ -243,7 +250,7 @@
<swagger-core-version>1.5.15</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>
</project> </project>

6
samples/client/petstore/java/retrofit2rx/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
oltu_version = "1.0.0" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.15"
junit_version = "4.12" junit_version = "4.12"
@ -110,7 +110,9 @@ dependencies {
compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
compile "io.reactivex:rxjava:$rx_java_version" compile "io.reactivex:rxjava:$rx_java_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"

9
samples/client/petstore/java/retrofit2rx/pom.xml
View File

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>
@ -254,7 +261,7 @@
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<rxjava-version>1.3.0</rxjava-version> <rxjava-version>1.3.0</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>
</project> </project>

6
samples/client/petstore/java/retrofit2rx2/build.gradle
View File

@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
oltu_version = "1.0.0" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.15"
junit_version = "4.12" junit_version = "4.12"
@ -110,7 +110,9 @@ dependencies {
compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
compile "io.reactivex.rxjava2:rxjava:$rx_java_version" compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"

9
samples/client/petstore/java/retrofit2rx2/pom.xml
View File

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>
@ -254,7 +261,7 @@
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.3.0</retrofit-version>
<rxjava-version>2.1.1</rxjava-version> <rxjava-version>2.1.1</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>
</project> </project>