From 9daa47033003e80e5f40bc1ee52e45b8db66881f Mon Sep 17 00:00:00 2001
From: cjenkscybercom <christina.jenks@knowit.se>
Date: Wed, 3 Jan 2024 09:46:39 +0100
Subject: [PATCH 1/2] CSSTUDIO-2026: add openapi/swagger. fix: upgrade
 maven-javadoc-plugin for MJAVADOC-650

---
 pom.xml                                   | 15 ++++++++++++++-
 src/main/resources/application.properties |  7 +++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 415af56..6a81661 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
         <elasticsearch.version>8.2.0</elasticsearch.version>
         <lombok.version>1.18.16</lombok.version>
         <junit.version>5.8.2</junit.version>
+        <springdoc.version>1.6.10</springdoc.version>
         <skipITs>true</skipITs>
         <skipITCoverage>true</skipITCoverage>
         <jacoco.skip>true</jacoco.skip>
@@ -113,6 +114,18 @@
             <version>2.0.1</version>
         </dependency>
 
+        <!-- OpenAPI / Swagger UI -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-security</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -363,7 +376,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 0999452..29f2116 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -183,3 +183,10 @@ default.logbook.url=
 default.tags.url=
 default.properties.url=
 
+########### OpenAPI / Swagger #############
+#OPENAPI
+openapi.server=${OPENAPI_SERVER:http://localhost:8080}
+springdoc.api-docs.path=${API_PATH:/api/spec}
+springdoc.swagger-ui.path=${SWAGGER_PATH:/api/docs}
+springdoc.swagger-ui.disable-swagger-default-url=true
+springdoc.swagger-ui.displayOperationId=true

From 190aa6c132ad458ad51e8f107f1bab98e0eb0e39 Mon Sep 17 00:00:00 2001
From: cjenkscybercom <christina.jenks@knowit.se>
Date: Thu, 11 Jan 2024 16:14:13 +0100
Subject: [PATCH 2/2] CSSTUDIO-2026: upgrade openapi to latest 1.x, remove
 openapi security dependency

---
 pom.xml                                   | 7 +------
 src/main/resources/application.properties | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a81661..30fe462 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <elasticsearch.version>8.2.0</elasticsearch.version>
         <lombok.version>1.18.16</lombok.version>
         <junit.version>5.8.2</junit.version>
-        <springdoc.version>1.6.10</springdoc.version>
+        <springdoc.version>1.7.0</springdoc.version>
         <skipITs>true</skipITs>
         <skipITCoverage>true</skipITCoverage>
         <jacoco.skip>true</jacoco.skip>
@@ -120,11 +120,6 @@
             <artifactId>springdoc-openapi-ui</artifactId>
             <version>${springdoc.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-security</artifactId>
-            <version>${springdoc.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 29f2116..ba1e91d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -185,7 +185,6 @@ default.properties.url=
 
 ########### OpenAPI / Swagger #############
 #OPENAPI
-openapi.server=${OPENAPI_SERVER:http://localhost:8080}
 springdoc.api-docs.path=${API_PATH:/api/spec}
 springdoc.swagger-ui.path=${SWAGGER_PATH:/api/docs}
 springdoc.swagger-ui.disable-swagger-default-url=true