From bd450ed4b5b13d4a1a6bbb036c23bafe1247866f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 02:33:06 +0000
Subject: [PATCH 1/2] Bump org.openapitools:openapi-generator-maven-plugin from
 5.0.1 to 7.2.0

Bumps org.openapitools:openapi-generator-maven-plugin from 5.0.1 to 7.2.0.

---
updated-dependencies:
- dependency-name: org.openapitools:openapi-generator-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 admin-ui/pom.xml                    | 2 +-
 knowledge-directory/pom.xml         | 2 +-
 smart-connector-rest-server/pom.xml | 2 +-
 smart-connector/pom.xml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-ui/pom.xml b/admin-ui/pom.xml
index 570a3c6e1..13fd0689a 100644
--- a/admin-ui/pom.xml
+++ b/admin-ui/pom.xml
@@ -152,7 +152,7 @@
 			<plugin>
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>5.0.1</version>
+				<version>7.2.0</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
diff --git a/knowledge-directory/pom.xml b/knowledge-directory/pom.xml
index b630a1a88..c476e1855 100644
--- a/knowledge-directory/pom.xml
+++ b/knowledge-directory/pom.xml
@@ -155,7 +155,7 @@
 			<plugin>
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>5.0.1</version>
+				<version>7.2.0</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
diff --git a/smart-connector-rest-server/pom.xml b/smart-connector-rest-server/pom.xml
index e5e865935..73b97cd89 100644
--- a/smart-connector-rest-server/pom.xml
+++ b/smart-connector-rest-server/pom.xml
@@ -154,7 +154,7 @@
 			<plugin>
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>5.0.1</version>
+				<version>7.2.0</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
diff --git a/smart-connector/pom.xml b/smart-connector/pom.xml
index 388ea4022..882c3bcc9 100644
--- a/smart-connector/pom.xml
+++ b/smart-connector/pom.xml
@@ -187,7 +187,7 @@
 			<plugin>
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>5.0.1</version>
+				<version>7.2.0</version>
 				<executions>
 					<!-- Generate InterKnowledgeEngineRuntime protocol classes -->
 					<execution>

From 92ebf31df0fc67b8ba955d95908fb1b3ecad709e Mon Sep 17 00:00:00 2001
From: lathouwerssam <sophie.lathouwers@tno.nl>
Date: Mon, 15 Jan 2024 17:09:04 +0100
Subject: [PATCH 2/2] Fixes unknown jsr310 dependency and Admin UI's openapi
 spec

---
 .../src/main/resources/openapi-admin-ui.yaml  |   2 +-
 smart-connector-rest-server/pom.xml           | 406 +++++++++---------
 2 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/admin-ui/src/main/resources/openapi-admin-ui.yaml b/admin-ui/src/main/resources/openapi-admin-ui.yaml
index f5d6a6b2a..879585e51 100644
--- a/admin-ui/src/main/resources/openapi-admin-ui.yaml
+++ b/admin-ui/src/main/resources/openapi-admin-ui.yaml
@@ -17,7 +17,7 @@ paths:
       parameters:
         - name: include-meta
           in: path
-          required: false
+          required: true
           description: Whether to include meta knowledge interactions.
           schema:
             type: boolean
diff --git a/smart-connector-rest-server/pom.xml b/smart-connector-rest-server/pom.xml
index 73b97cd89..404ff4c65 100644
--- a/smart-connector-rest-server/pom.xml
+++ b/smart-connector-rest-server/pom.xml
@@ -1,204 +1,204 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>smart-connector-rest-server</artifactId>
-	<name>Knowledge Engine - Smart Connector Rest Server</name>
-	<parent>
-		<groupId>eu.knowledge.engine</groupId>
-		<artifactId>ke-parent</artifactId>
-		<version>${revision}</version>
-	</parent>
-
-	<properties>
-		<swagger-core-version>1.5.18</swagger-core-version>
-		<jetty-version>9.4.51.v20230217</jetty-version>
-		<jersey2-version>2.35</jersey2-version>
-		<jackson-version>2.9.9</jackson-version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-jersey2-jaxrs</artifactId>
-			<scope>compile</scope>
-			<version>${swagger-core-version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.glassfish.jersey.containers</groupId>
-					<artifactId>
-						jersey-container-servlet-core
-					</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.validation</groupId>
-					<artifactId>validation-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-joda</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.25</version>
-		</dependency>
-		<!-- Jetty -->
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty-version}</version>
-		</dependency>
-
-		<!-- Jersey2 -->
-
-		<dependency>
-			<groupId>org.glassfish.jersey.containers</groupId>
-			<artifactId>jersey-container-jetty-servlet</artifactId>
-			<version>${jersey2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
-			<version>${jersey2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.ext</groupId>
-			<artifactId>jersey-bean-validation</artifactId>
-			<version>${jersey2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-multipart</artifactId>
-			<version>${jersey2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-jaxb</artifactId>
-			<version>${jersey2-version}</version>
-		</dependency>
-
-		<!-- Add XML suport -->
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.1</version>
-		</dependency>
-
-
-		<!-- jena -->
-		<dependency>
-			<groupId>org.apache.jena</groupId>
-			<artifactId>apache-jena-libs</artifactId>
-			<type>pom</type>
-		</dependency>
-
-		<!-- okhttp for example client -->
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<version>4.9.1</version>
-		</dependency>
-		<dependency>
-			<groupId>eu.knowledge.engine</groupId>
-			<artifactId>smart-connector-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!-- unit tests -->
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.7.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.7.0</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- maven model for dynamic version info -->
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-model</artifactId>
-			<version>3.9.4</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.openapitools</groupId>
-				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>7.2.0</version>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<packageName>eu.knowledge.engine.rest</packageName>
-							<apiPackage>eu.knowledge.engine.rest.api</apiPackage>
-							<modelPackage>eu.knowledge.engine.rest.model</modelPackage>
-							<inputSpec>${project.basedir}/src/main/resources/openapi-sc.yaml</inputSpec>
-							<generatorName>jaxrs-jersey</generatorName>
-							<generateSupportingFiles>true</generateSupportingFiles>
-							<generateApis>true</generateApis>
-							<apisToGenerate>KnowledgeInteractionLifeCycle,SmartConnectorLease,VersionInfo</apisToGenerate>
-							<configOptions>
-								<implFolder>dummy</implFolder>
-								<strictSpec>true</strictSpec>
-								<useTags>true</useTags>
-								<additionalModelTypeAnnotations>@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)</additionalModelTypeAnnotations>
-							</configOptions>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.2.0</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.basedir}/target/generated-sources/openapi/src/gen/java</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>smart-connector-rest-server</artifactId>
+	<name>Knowledge Engine - Smart Connector Rest Server</name>
+	<parent>
+		<groupId>eu.knowledge.engine</groupId>
+		<artifactId>ke-parent</artifactId>
+		<version>${revision}</version>
+	</parent>
+
+	<properties>
+		<swagger-core-version>1.5.18</swagger-core-version>
+		<jetty-version>9.4.51.v20230217</jetty-version>
+		<jersey2-version>2.35</jersey2-version>
+		<jackson-version>2.9.9</jackson-version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-jersey2-jaxrs</artifactId>
+			<scope>compile</scope>
+			<version>${swagger-core-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.glassfish.jersey.containers</groupId>
+					<artifactId>
+						jersey-container-servlet-core
+					</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>validation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+		<!-- Jetty -->
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty-version}</version>
+		</dependency>
+
+		<!-- Jersey2 -->
+
+		<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-jetty-servlet</artifactId>
+			<version>${jersey2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.ext</groupId>
+			<artifactId>jersey-bean-validation</artifactId>
+			<version>${jersey2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-multipart</artifactId>
+			<version>${jersey2-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-jaxb</artifactId>
+			<version>${jersey2-version}</version>
+		</dependency>
+
+		<!-- Add XML suport -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+
+
+		<!-- jena -->
+		<dependency>
+			<groupId>org.apache.jena</groupId>
+			<artifactId>apache-jena-libs</artifactId>
+			<type>pom</type>
+		</dependency>
+
+		<!-- okhttp for example client -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>4.9.1</version>
+		</dependency>
+		<dependency>
+			<groupId>eu.knowledge.engine</groupId>
+			<artifactId>smart-connector-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- unit tests -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.7.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.7.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- maven model for dynamic version info -->
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-model</artifactId>
+			<version>3.9.4</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.openapitools</groupId>
+				<artifactId>openapi-generator-maven-plugin</artifactId>
+				<version>7.2.0</version>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<packageName>eu.knowledge.engine.rest</packageName>
+							<apiPackage>eu.knowledge.engine.rest.api</apiPackage>
+							<modelPackage>eu.knowledge.engine.rest.model</modelPackage>
+							<inputSpec>${project.basedir}/src/main/resources/openapi-sc.yaml</inputSpec>
+							<generatorName>jaxrs-jersey</generatorName>
+							<generateSupportingFiles>true</generateSupportingFiles>
+							<generateApis>true</generateApis>
+							<apisToGenerate>KnowledgeInteractionLifeCycle,SmartConnectorLease,VersionInfo</apisToGenerate>
+							<configOptions>
+								<implFolder>dummy</implFolder>
+								<strictSpec>true</strictSpec>
+								<useTags>true</useTags>
+								<additionalModelTypeAnnotations>@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)</additionalModelTypeAnnotations>
+							</configOptions>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>${project.basedir}/target/generated-sources/openapi/src/gen/java</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file