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
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 {
oltu_version = "1.0.0"
oltu_version = "1.0.1"
retrofit_version = "2.3.0"
{{#usePlayWS}}
{{#play24}}
@@ -142,7 +142,9 @@ dependencies {
compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
{{/useRxJava2}}
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"
{{#joda}}
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>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.gsonfire</groupId>
@@ -349,7 +355,7 @@
{{#threetenbp}}
<threetenbp-version>1.3.5</threetenbp-version>
{{/threetenbp}}
<oltu-version>1.0.0</oltu-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
</project>