From bc869c1e1e77fa9b78215c1d0327089fee24f91f Mon Sep 17 00:00:00 2001
From: MalteBellmann <45335722+MalteBellmann@users.noreply.github.com>
Date: Sun, 24 Mar 2024 12:39:12 +0100
Subject: [PATCH] feat: upgrade java generator to version 7.3.0 (#332)

Refers to https://github.com/ory/hydra-client-java/issues/19
---
 contrib/poms/client/pom.xml     | 27 +++++++--------------------
 contrib/poms/hydra/pom.xml      | 27 +++++++--------------------
 contrib/poms/keto/pom.xml       | 27 +++++++--------------------
 contrib/poms/kratos/pom.xml     | 27 +++++++--------------------
 contrib/poms/oathkeeper/pom.xml | 27 +++++++--------------------
 scripts/generate.sh             |  2 +-
 6 files changed, 36 insertions(+), 101 deletions(-)

diff --git a/contrib/poms/client/pom.xml b/contrib/poms/client/pom.xml
index 7025e3b1fb0..5ad2388fccb 100644
--- a/contrib/poms/client/pom.xml
+++ b/contrib/poms/client/pom.xml
@@ -342,11 +342,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -417,27 +412,19 @@
             <version>${junit-platform-runner.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito-core-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.10.0</okhttp-version>
-        <gson-version>2.9.1</gson-version>
-        <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
+        <gson-fire-version>1.9.0</gson-fire-version>
+        <okhttp-version>4.11.0</okhttp-version>
+        <gson-version>2.10.1</gson-version>
+        <commons-lang3-version>3.13.0</commons-lang3-version>
+        <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.9.1</junit-version>
-        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
-        <mockito-core-version>3.12.4</mockito-core-version>
+        <junit-version>5.10.0</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/contrib/poms/hydra/pom.xml b/contrib/poms/hydra/pom.xml
index ef220b95c82..1ee9631eada 100644
--- a/contrib/poms/hydra/pom.xml
+++ b/contrib/poms/hydra/pom.xml
@@ -334,11 +334,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -409,27 +404,19 @@
             <version>${junit-platform-runner.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito-core-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.10.0</okhttp-version>
-        <gson-version>2.9.1</gson-version>
-        <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
+        <gson-fire-version>1.9.0</gson-fire-version>
+        <okhttp-version>4.11.0</okhttp-version>
+        <gson-version>2.10.1</gson-version>
+        <commons-lang3-version>3.13.0</commons-lang3-version>
+        <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.9.1</junit-version>
-        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
-        <mockito-core-version>3.12.4</mockito-core-version>
+        <junit-version>5.10.0</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/contrib/poms/keto/pom.xml b/contrib/poms/keto/pom.xml
index e566cdc404a..f0fc6cce61b 100644
--- a/contrib/poms/keto/pom.xml
+++ b/contrib/poms/keto/pom.xml
@@ -334,11 +334,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -409,27 +404,19 @@
             <version>${junit-platform-runner.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito-core-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.10.0</okhttp-version>
-        <gson-version>2.9.1</gson-version>
-        <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
+        <gson-fire-version>1.9.0</gson-fire-version>
+        <okhttp-version>4.11.0</okhttp-version>
+        <gson-version>2.10.1</gson-version>
+        <commons-lang3-version>3.13.0</commons-lang3-version>
+        <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.9.1</junit-version>
-        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
-        <mockito-core-version>3.12.4</mockito-core-version>
+        <junit-version>5.10.0</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/contrib/poms/kratos/pom.xml b/contrib/poms/kratos/pom.xml
index 2c14eb338ae..f31c6caf7a9 100644
--- a/contrib/poms/kratos/pom.xml
+++ b/contrib/poms/kratos/pom.xml
@@ -334,11 +334,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -409,27 +404,19 @@
             <version>${junit-platform-runner.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito-core-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.10.0</okhttp-version>
-        <gson-version>2.9.1</gson-version>
-        <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
+        <gson-fire-version>1.9.0</gson-fire-version>
+        <okhttp-version>4.11.0</okhttp-version>
+        <gson-version>2.10.1</gson-version>
+        <commons-lang3-version>3.13.0</commons-lang3-version>
+        <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.9.1</junit-version>
-        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
-        <mockito-core-version>3.12.4</mockito-core-version>
+        <junit-version>5.10.0</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/contrib/poms/oathkeeper/pom.xml b/contrib/poms/oathkeeper/pom.xml
index e58ff366507..4f1be9c6da4 100644
--- a/contrib/poms/oathkeeper/pom.xml
+++ b/contrib/poms/oathkeeper/pom.xml
@@ -334,11 +334,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
         <!-- @Nullable annotation -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
@@ -409,27 +404,19 @@
             <version>${junit-platform-runner.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito-core-version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <gson-fire-version>1.8.5</gson-fire-version>
-        <swagger-core-version>1.6.5</swagger-core-version>
-        <okhttp-version>4.10.0</okhttp-version>
-        <gson-version>2.9.1</gson-version>
-        <commons-lang3-version>3.12.0</commons-lang3-version>
-        <jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
+        <gson-fire-version>1.9.0</gson-fire-version>
+        <okhttp-version>4.11.0</okhttp-version>
+        <gson-version>2.10.1</gson-version>
+        <commons-lang3-version>3.13.0</commons-lang3-version>
+        <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.9.1</junit-version>
-        <junit-platform-runner.version>1.9.1</junit-platform-runner.version>
-        <mockito-core-version>3.12.4</mockito-core-version>
+        <junit-version>5.10.0</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/scripts/generate.sh b/scripts/generate.sh
index a0a89185648..963a01448cd 100755
--- a/scripts/generate.sh
+++ b/scripts/generate.sh
@@ -91,7 +91,7 @@ java () {
 
   # Upgrading Java requires adjusting the pom.xml files in contrib/client. Usually,
   # new versions of the generator introduce changes to the pom dependencies.
-  openapi-generator-cli version-manager set 6.2.1
+  openapi-generator-cli version-manager set 7.3.0
   openapi-generator-cli generate -i "${SPEC_FILE}" \
     -g java \
     -o "$dir" \