Skip to content

Commit 570696c

Browse files
committed
Updating the SSC spec to 23.2 and the dependencies to their latest versions
1 parent 646515a commit 570696c

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Fortify Software Security Center REST API java client
44
Communicate with Fortify Software Security Center through REST API in java, a swagger generated client
5-
- API version: 1:23.1.0.0145
5+
- API version: 1:23.2.0.0153
66

77
## Generation:
88

@@ -27,7 +27,7 @@ Add this dependency to your project's POM:
2727
<dependency>
2828
<groupId>com.fortify</groupId>
2929
<artifactId>ssc-restapi-client</artifactId>
30-
<version>23.1.2</version>
30+
<version>23.2</version>
3131
<scope>compile</scope>
3232
</dependency>
3333
```
@@ -37,7 +37,7 @@ Add this dependency to your project's POM:
3737
Add this dependency to your project's build file:
3838

3939
```groovy
40-
compile "com.fortify:ssc-restapi-client:23.1.2"
40+
compile "com.fortify:ssc-restapi-client:23.2"
4141
```
4242

4343
## Getting Started

build.gradle

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java'
33
id 'idea'
4-
id ('org.openapi.generator') version('5.4.0')
4+
id ('org.openapi.generator') version('7.0.1')
55
id 'maven-publish'
66
id 'signing'
77
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
@@ -12,7 +12,7 @@ repositories {
1212
}
1313

1414
group = 'com.fortify'
15-
version = '23.1.2'
15+
version = '23.2'
1616
description 'Fortify SSC REST API client'
1717

1818
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -27,17 +27,16 @@ ext {
2727

2828
dependencies {
2929

30-
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
31-
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
32-
implementation 'io.swagger:swagger-annotations:1.6.10'
30+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
31+
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
3332
implementation 'com.google.code.gson:gson:2.10.1'
3433
implementation 'io.gsonfire:gson-fire:1.8.5'
3534
implementation 'com.google.code.findbugs:jsr305:3.0.2'
36-
implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
37-
implementation 'com.squareup.okio:okio-jvm:3.3.0'
38-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
39-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21'
40-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21'
35+
implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
36+
implementation 'com.squareup.okio:okio-jvm:3.6.0'
37+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
38+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20'
39+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20'
4140
testImplementation 'junit:junit:4.13.2'
4241
}
4342

@@ -61,13 +60,14 @@ artifacts {
6160
}
6261

6362
task fixAndCopySwaggerSpec(type: Sync) {
64-
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'
63+
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'
6564
into(modifiedSpecDir)
6665
from(originalSpecDir) {
6766
filteringCharset = "UTF-8"
6867
filter({ String line ->
6968
line.replaceAll(/[\u00ab\u00bb]/, "") // [«»]
7069
.replaceAll(/([\/<"])Custom Tag([>"])/, '$1Custom Tag Audit$2') // upper case [Custom Tag]
70+
.replaceAll(/([\/"])URI"/, '$1URI_1"') // avoid collision with java.net.URI
7171
})
7272
}
7373
}
@@ -88,7 +88,9 @@ openApiGenerate {
8888
library: "okhttp-gson",
8989
serializationLibrary: "gson",
9090
openApiNullable: "false",
91-
hideGenerationTimestamp: "true"
91+
hideGenerationTimestamp: "true",
92+
annotationLibrary: "none",
93+
useJakartaEe: "true"
9294
]
9395
}
9496

src/swagger/spec.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)