From 8d6740de9f70b6b01fd6b2001abd68e80c54dd57 Mon Sep 17 00:00:00 2001
From: Jeffrey D <11084623+Nephery@users.noreply.github.com>
Date: Thu, 9 Jan 2025 14:55:49 -0500
Subject: [PATCH] upgrade to swagger codegen 3 (#68)

---
 semp-client/pom.xml | 85 ++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 56 deletions(-)

diff --git a/semp-client/pom.xml b/semp-client/pom.xml
index 66eb74c..858a370 100644
--- a/semp-client/pom.xml
+++ b/semp-client/pom.xml
@@ -13,72 +13,69 @@
 
   <name>Solace SEMP V2 Client</name>
   <description>Generated Solace SEMP V2 wrapper and client</description>
-	<url>https://github.com/${repoName}/solace-integration-test-support/tree/${project.scm.tag}/semp-client</url>
+  <url>https://github.com/${repoName}/solace-integration-test-support/tree/${project.scm.tag}/semp-client</url>
 
   <properties>
-    <swagger-core-version>1.5.24</swagger-core-version>
-    <okhttp-version>2.7.5</okhttp-version>
-    <gson-version>2.8.9</gson-version>
-    <gson-fire-version>1.8.3</gson-fire-version>
-    <threetenbp-version>1.4.1</threetenbp-version>
+    <swagger-core-version>2.2.27</swagger-core-version>
+    <okhttp-version>4.12.0</okhttp-version>
+    <gson-fire-version>1.9.0</gson-fire-version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-bom</artifactId>
+        <version>${okhttp-version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
-      <groupId>io.swagger</groupId>
+      <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.okhttp</groupId>
+      <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.okhttp</groupId>
+      <groupId>com.squareup.okhttp3</groupId>
       <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp-version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${gson-version}</version>
     </dependency>
     <dependency>
       <groupId>io.gsonfire</groupId>
       <artifactId>gson-fire</artifactId>
       <version>${gson-fire-version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.threeten</groupId>
-      <artifactId>threetenbp</artifactId>
-      <version>${threetenbp-version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
-    <!-- test dependencies -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>com.solace.test.integration</groupId>
       <artifactId>pubsubplus-testcontainer</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
@@ -91,29 +88,25 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.11.0</version>
       </plugin>
-
       <plugin>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.codegen.v3</groupId>
         <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>2.4.21</version>
+        <version>3.0.66</version>
         <configuration>
-          <output>${project.build.directory}/generated-sources/swagger</output>
+<!--          <configHelp>true</configHelp> &lt;!&ndash; Enable to see possible config options &ndash;&gt;-->
           <language>java</language>
-          <!--<library>jersey2</library>-->
-          <generateApiDocumentation>false</generateApiDocumentation>
           <generateApiTests>false</generateApiTests>
           <generateModelTests>false</generateModelTests>
+          <generateApiDocumentation>false</generateApiDocumentation>
           <generateModelDocumentation>false</generateModelDocumentation>
-          <!--<supportingFilesToGenerate>ApiClient.java,ApiException.java,ApiKeyAuth.java,ApiResponse.java,Authentication.java,Configuration.java,HttpBasicAuth.java,JSON.java,OAuth.java,Pair.java,RFC3339DateFormat.java,StringUtil.java</supportingFilesToGenerate>-->
           <configOptions>
-            <disallowAdditionalPropertiesIfNotPresent>false
-            </disallowAdditionalPropertiesIfNotPresent>
             <sourceFolder>src/main/java</sourceFolder>
-            <interfaceOnly>true</interfaceOnly>
-            <useTags>true</useTags>
-            <dateLibrary>java8</dateLibrary>
+            <useRuntimeException>true</useRuntimeException>
+            <library>okhttp4-gson</library>
+            <jakarta>true</jakarta>
+            <dateLibrary>java11</dateLibrary>
             <hideGenerationTimestamp>true</hideGenerationTimestamp>
           </configOptions>
         </configuration>
@@ -159,26 +152,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.12</version>
-        <executions>
-          <execution>
-            <id>generate-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${basedir}/target/generated-sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file