Changes to Sample unrelated to the Feign upgrade

Author: lucasls

samples/client/petstore/java/feign/.swagger-codegen/VERSION

@@ -1 +1 @@
-3.0.36-SNAPSHOT
+3.0.67

samples/client/petstore/java/feign/build.gradle

@@ -6,7 +6,7 @@ version = '1.0.0'
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +15,7 @@ buildscript {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 
@@ -76,14 +76,17 @@ if(hasProperty('target') && target == 'android') {
 } else {
 
     apply plugin: 'java'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
 
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'swagger-petstore-feign'
+    publishing {
+        publications {
+            maven(MavenPublication) {
+               artifactId = 'swagger-petstore-feign'
+               from components.java
+            }
         }
     }
 
@@ -103,19 +106,19 @@ ext {
 }
 
 dependencies {
-    compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
-    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"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
+    implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_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"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_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"
 }

samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.jar

@@ -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

samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties

@@ -250,7 +250,7 @@
     <swagger-core-version>2.0.0</swagger-core-version>
     <feign-version>11.6</feign-version>
     <feign-form-version>3.8.0</feign-form-version>
-    <jackson-version>2.10.1</jackson-version>
+    <jackson-version>2.15.2</jackson-version>
     <junit-version>4.13.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.2</oltu-version>

samples/client/petstore/java/feign/pom.xml

@@ -20,6 +20,7 @@
 import io.swagger.client.auth.*;
 import io.swagger.client.auth.OAuth.AccessTokenListener;
 
+
 public class ApiClient {
   public interface Api {}
 

samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java

@@ -12,6 +12,7 @@
 
 package io.swagger.client;
 
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java

@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface AnimalApi extends ApiClient.Api {
 
   /**

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnimalApi.java

@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface AnotherFakeApi extends ApiClient.Api {
 
   /**

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java

@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface DogApi extends ApiClient.Api {
 
   /**