From 646515af79a3fa2d93fa74327d060a18a77e26e4 Mon Sep 17 00:00:00 2001
From: Anna Karyakina <akarjakina@gmail.com>
Date: Tue, 13 Jun 2023 13:02:52 -0700
Subject: [PATCH] Preparing the 23.1.2 release with corrected dependencies

---
 README.md    | 16 ++++++----------
 build.gradle | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 7c57f35..47f76df 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.fortify</groupId>
     <artifactId>ssc-restapi-client</artifactId>
-    <version>23.1.1</version>
+    <version>23.1.2</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -37,17 +37,9 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "com.fortify:ssc-restapi-client:23.1.1"
+compile "com.fortify:ssc-restapi-client:23.1.2"
 ```
 
-### Others
-
-At first generate the JAR by running the gradle build
-Then manually install the following JARs:
-
-* build/libs/ssc-restapi-client-23.1.1.jar
-* build/swagger-code-ssc/build/target/lib/*.jar
-
 ## Getting Started
 
 Please follow the [installation](#installation) instruction and execute the following Java code:
@@ -101,6 +93,10 @@ Authentication schemes defined for the API:
 - **API key parameter name**: Authorization
 - **Location**: HTTP header
 
+## Compatibility:
+
+The first two digits of the ssc-restapi-client version correspond to the version of SSC where the REST API specification has been pulled from. The last digit is reserved for fixing problems with this library itself, it does not affect compatibility.
+SSC API was designed with backwards compatibility in mind, so you are most likely should be able to use the newer client with an older SSC (and vice versa). Not all features may be available in this case.
 
 ## Recommendation
 
diff --git a/build.gradle b/build.gradle
index b964332..69597ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ repositories {
 }
 
 group = 'com.fortify'
-version = '23.1.1'
+version = '23.1.2'
 description 'Fortify SSC REST API client'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -33,9 +33,11 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'io.gsonfire:gson-fire:1.8.5'
   implementation 'com.google.code.findbugs:jsr305:3.0.2'
-  implementation 'javax.ws.rs:jsr311-api:1.1.1'
-  implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
   implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+  implementation 'com.squareup.okio:okio-jvm:3.3.0'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21'
   testImplementation 'junit:junit:4.13.2'
 }
 
@@ -63,11 +65,9 @@ task fixAndCopySwaggerSpec(type: Sync) {
     into(modifiedSpecDir)
     from(originalSpecDir) {
         filteringCharset = "UTF-8"
-        filter({ String s ->
-            s.replaceAll(/[\u00ab\u00bb]/, "")    // [«»]
-        })
-        filter({ String s ->
-            s.replaceAll(/Custom Tag/, 'Custom Tag Audit')    // [Custom Tag]
+        filter({ String line ->
+            line.replaceAll(/[\u00ab\u00bb]/, "")    // [«»]
+                .replaceAll(/([\/<"])Custom Tag([>"])/, '$1Custom Tag Audit$2')    // upper case [Custom Tag]
         })
     }
 }
@@ -86,6 +86,8 @@ openApiGenerate {
     configOptions = [
         dateLibrary: "java8",
         library: "okhttp-gson",
+        serializationLibrary: "gson",
+        openApiNullable: "false",
         hideGenerationTimestamp: "true"
     ]
 }