FINERACT-1984: OAuth2.1

fineract-client/build.gradle

@@ -52,7 +52,8 @@ task buildJavaSdk(type: org.openapitools.generator.gradle.plugin.tasks.GenerateT
         useRxJava2: 'false',
         library: 'retrofit2',
         hideGenerationTimestamp: 'true',
-        containerDefaultToNull: 'true'
+        containerDefaultToNull: 'true',
+        oauth2Implementation: 'none'
     ]
     generateModelTests = false
     generateApiTests = false
@@ -137,7 +138,16 @@ task cleanupGeneratedJavaFiles() {
     
     inputs.dir(tempDir)
     outputs.dir(targetDir)
-    
+
+    //TODO: remove harcoded, autogenerated Oltu's OAuthOkHttpClient.java from the generated files
+    doFirst {
+        delete fileTree(tempDir) {
+            include "src/main/java/org/apache/fineract/client/auth/OAuthOkHttpClient.java"
+        }
+        delete fileTree(targetDir) {
+            include "src/main/java/org/apache/fineract/client/auth/OAuthOkHttpClient.java"
+        }
+    }
     doLast {
         copy {
             from tempDir

fineract-client/dependencies.gradle

@@ -35,11 +35,5 @@ dependencies {
             'com.squareup.okhttp3:logging-interceptor',
             )
 
-    // org.apache.oltu.oauth2 is used in org.apache.fineract.client.auth.OAuthOkHttpClient (only; can be excluded by consumers not requiring OAuth)
-    implementation('org.apache.oltu.oauth2:org.apache.oltu.oauth2.client') {
-        exclude group: 'org.apache.oltu.oauth2', module: 'org.apache.oltu.oauth2.common'
-        exclude group: 'org.slf4j'
-    }
-
     testImplementation 'org.assertj:assertj-core'
 }