Updating the SSC spec to 23.2 and the dependencies to their latest ve…

…rsions

README.md

@@ -2,7 +2,7 @@
 
 # Fortify Software Security Center REST API java client
 Communicate with Fortify Software Security Center through REST API in java, a swagger generated client
-- API version: 1:23.1.0.0145
+- API version: 1:23.2.0.0153
 
 ## Generation:
 
@@ -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.2</version>
+    <version>23.2</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -37,7 +37,7 @@ 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.2"
+compile "com.fortify:ssc-restapi-client:23.2"
 ```
 
 ## Getting Started

build.gradle

@@ -1,7 +1,7 @@
 plugins {
   id 'java'
   id 'idea'
-  id ('org.openapi.generator') version('5.4.0')
+  id ('org.openapi.generator') version('7.0.1')
   id 'maven-publish'
   id 'signing'
   id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
@@ -12,7 +12,7 @@ repositories {
 }
 
 group = 'com.fortify'
-version = '23.1.2'
+version = '23.2'
 description 'Fortify SSC REST API client'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -27,17 +27,16 @@ ext {
 
 dependencies {
 
-  implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-  implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
-  implementation 'io.swagger:swagger-annotations:1.6.10'
+  implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+  implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
   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 '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'
+  implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
+  implementation 'com.squareup.okio:okio-jvm:3.6.0'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20'
   testImplementation 'junit:junit:4.13.2'
 }
 
@@ -61,13 +60,14 @@ artifacts {
 }
 
 task fixAndCopySwaggerSpec(type: Sync) {
-    description 'Read spec-rest.json and remove « and » characters and rename [Custom Tag] to [Custom Tag Audit] to avoid collision with [Custom tag] (lower case). Write modified file to task temporaryDir'
+    description 'Read spec-rest.json and remove « and » characters and rename [Custom Tag] to [Custom Tag Audit] to avoid collision with [Custom tag] (lower case), also rename URI to URI_1 to avoid collision with java.net.URI in Resource.java. Write modified file to task temporaryDir'
     into(modifiedSpecDir)
     from(originalSpecDir) {
         filteringCharset = "UTF-8"
         filter({ String line ->
             line.replaceAll(/[\u00ab\u00bb]/, "")    // [«»]
                 .replaceAll(/([\/<"])Custom Tag([>"])/, '$1Custom Tag Audit$2')    // upper case [Custom Tag]
+                .replaceAll(/([\/"])URI"/, '$1URI_1"')    // avoid collision with java.net.URI
         })
     }
 }
@@ -88,7 +88,9 @@ openApiGenerate {
         library: "okhttp-gson",
         serializationLibrary: "gson",
         openApiNullable: "false",
-        hideGenerationTimestamp: "true"
+        hideGenerationTimestamp: "true",
+        annotationLibrary: "none",
+        useJakartaEe: "true"
     ]
 }