From 46301f09a0e557c01373f5ecf6bd3a671af376fd Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 24 Aug 2023 00:25:37 +0000 Subject: [PATCH 1/2] fix: upgrade org.springdoc:springdoc-openapi-data-rest from 1.6.12 to 1.7.0 Snyk has created this PR to upgrade org.springdoc:springdoc-openapi-data-rest from 1.6.12 to 1.7.0. See this package in Maven Repository: https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-data-rest/ See this project in Snyk: https://app.snyk.io/org/anbo-de/project/ee44bfa2-9c74-4e6d-bbb8-fa23594b6bd0?utm_source=github&utm_medium=referral&page=upgrade-pr --- qanary_pipeline-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_pipeline-template/pom.xml b/qanary_pipeline-template/pom.xml index 7c0a1e94..9ce95294 100644 --- a/qanary_pipeline-template/pom.xml +++ b/qanary_pipeline-template/pom.xml @@ -20,7 +20,7 @@ qanary-pipeline ${java.version} ${java.version} - 1.6.12 + 1.7.0 From a1b9931d0b5afc3ee2861ad06c90c40ada7702e9 Mon Sep 17 00:00:00 2001 From: Calvin Date: Wed, 11 Oct 2023 15:31:50 +0200 Subject: [PATCH 2/2] resolving dependency issues after upgrade to Springdoc:1.7.0 --- qanary_pipeline-template/pom.xml | 638 +++++++++--------- .../src/main/resources/application.properties | 2 +- 2 files changed, 329 insertions(+), 311 deletions(-) diff --git a/qanary_pipeline-template/pom.xml b/qanary_pipeline-template/pom.xml index 9ce95294..114ae307 100644 --- a/qanary_pipeline-template/pom.xml +++ b/qanary_pipeline-template/pom.xml @@ -1,313 +1,331 @@ - 4.0.0 - qa.pipeline - eu.wdaqua.qanary - 3.7.6 - - org.springframework.boot - spring-boot-starter-parent - 2.7.8 - - - 11 - 2.7.10 - [3.7.0,4.0.0) - 1.4.13 - qanary - qanary-pipeline - ${java.version} - ${java.version} - 1.7.0 - - - - eu.wdaqua.qanary - qa.commons - ${qanary.version} - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-server-ui - ${spring-boot-admin.version} - - - org.springframework.boot - spring-boot-starter-web - - - org.apache.logging.log4j - log4j-to-slf4j - - - org.apache.logging.log4j - log4j-api - - - - - org.yaml - snakeyaml - 2.0 - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - junit - junit - - - - - org.springframework.boot - spring-boot-devtools - true - - - org.springframework - spring-webmvc - - - net.sf.json-lib - json-lib-ext-spring - 1.0.2 - - - org.apache.logging.log4j - log4j-to-slf4j - - - org.apache.logging.log4j - log4j-api - - - log4j - log4j - - - - - org.springframework - spring-test - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - junit - junit - test - - - - org.mockito - mockito-core - 4.6.1 - test - - - - org.mockito - mockito-junit-jupiter - 4.6.1 - test - - - org.apache.jena - jena-arq - 3.0.1 - - - org.apache.logging.log4j - log4j-to-slf4j - - - org.apache.logging.log4j - log4j-api - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - - commons-configuration - commons-configuration - 1.10 - - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - - org.springframework.security - spring-security-core - - - - org.springframework.security - spring-security-web - - - - org.springframework.security - spring-security-config - - - - org.springframework.security - spring-security-test - test - - - - org.springdoc - springdoc-openapi-data-rest - ${springdoc.version} - - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - - org.apache.logging.log4j - log4j-to-slf4j - [2.19.0,3.) - - - org.apache.logging.log4j - log4j-api - - - - - org.glassfish.jaxb - jaxb-runtime - 4.0.1 - - - jakarta.xml.bind - jakarta.xml.bind-api - 4.0.0 - - - - javax.xml.bind - jaxb-api - 2.3.1 - - - eu.wdaqua.qanary - qald.evaluator - [1.0.2,2.0.0) - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - build-info - - build-info - - - - - - org.springframework.boot - spring-boot-maven-plugin - - eu.wdaqua.qanary.QanaryPipeline - - - - - repackage - - - - - - com.spotify - dockerfile-maven-plugin - ${dockerfile-maven-version} - - - default - - build - push - - - - - ${docker.image.prefix}/${docker.image.name} - ${project.version} - - ${project.build.finalName}.jar - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 11 - - - - - - - - net.sf.json-lib - json-lib - 2.4 - - - + 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"> + 4.0.0 + qa.pipeline + eu.wdaqua.qanary + 3.7.6 + + org.springframework.boot + spring-boot-starter-parent + 2.7.8 + + + 11 + 2.7.10 + [3.7.0,4.0.0) + 1.4.13 + qanary + qanary-pipeline + ${java.version} + ${java.version} + 1.7.0 + + + + eu.wdaqua.qanary + qa.commons + ${qanary.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-server-ui + ${spring-boot-admin.version} + + + org.springframework.boot + spring-boot-starter-web + + + org.apache.logging.log4j + log4j-to-slf4j + + + org.apache.logging.log4j + log4j-api + + + + + org.yaml + snakeyaml + 2.0 + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + junit + junit + + + + + org.springframework.boot + spring-boot-devtools + true + + + org.springframework + spring-webmvc + + + net.sf.json-lib + json-lib-ext-spring + 1.0.2 + + + org.apache.logging.log4j + log4j-to-slf4j + + + org.apache.logging.log4j + log4j-api + + + log4j + log4j + + + + + org.springframework + spring-test + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + junit + junit + test + + + + org.mockito + mockito-core + 4.6.1 + test + + + + org.mockito + mockito-junit-jupiter + 4.6.1 + test + + + org.apache.jena + jena-arq + 3.0.1 + + + org.apache.logging.log4j + log4j-to-slf4j + + + org.apache.logging.log4j + log4j-api + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + commons-configuration + commons-configuration + 1.10 + + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + + org.springframework.security + spring-security-core + + + + org.springframework.security + spring-security-web + + + + org.springframework.security + spring-security-config + + + + org.springframework.security + spring-security-test + test + + + + org.springdoc + springdoc-openapi-data-rest + ${springdoc.version} + + + io.swagger.core.v3 + swagger-annotations + + + + + + org.springdoc + springdoc-openapi-ui + ${springdoc.version} + + + io.swagger.core.v3 + swagger-annotations + + + + + + io.swagger.core.v3 + swagger-core-jakarta + 2.2.16 + + + + org.apache.logging.log4j + log4j-to-slf4j + [2.19.0,3.) + + + org.apache.logging.log4j + log4j-api + + + + + org.glassfish.jaxb + jaxb-runtime + 4.0.1 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + + + + javax.xml.bind + jaxb-api + 2.3.1 + + + eu.wdaqua.qanary + qald.evaluator + [1.0.2,2.0.0) + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + build-info + + build-info + + + + + + org.springframework.boot + spring-boot-maven-plugin + + eu.wdaqua.qanary.QanaryPipeline + + + + + repackage + + + + + + com.spotify + dockerfile-maven-plugin + ${dockerfile-maven-version} + + + default + + build + push + + + + + ${docker.image.prefix}/${docker.image.name} + ${project.version} + + ${project.build.finalName}.jar + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 11 + + + + + + + + net.sf.json-lib + json-lib + 2.4 + + + diff --git a/qanary_pipeline-template/src/main/resources/application.properties b/qanary_pipeline-template/src/main/resources/application.properties index 6837d02b..fdbea4b3 100644 --- a/qanary_pipeline-template/src/main/resources/application.properties +++ b/qanary_pipeline-template/src/main/resources/application.properties @@ -100,7 +100,7 @@ configuration.username= configuration.password= ### Springdoc configuration -springdoc.version=1.6.12 +springdoc.version=1.7.0 # swagger-ui custom path springdoc.swagger-ui.path=/swagger-ui.html # /api-docs endpoint custom path