You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by kl...@apache.org on 2023/08/31 21:06:41 UTC
[camel-spring-boot] branch main updated: CAMEL-19793: update dependencies. (#925)
This is an automated email from the ASF dual-hosted git repository.
klease pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 4c5a0cd4b61 CAMEL-19793: update dependencies. (#925)
4c5a0cd4b61 is described below
commit 4c5a0cd4b6182e2f5df574d97743396b48214944
Author: klease <38...@users.noreply.github.com>
AuthorDate: Thu Aug 31 23:06:35 2023 +0200
CAMEL-19793: update dependencies. (#925)
Replace springdoc-openapi-ui with springdoc-openapi-starter-webmvc-ui.
Update version in the parent pom.
Remove swagger-parser-v3 dependency since it is provided by camel-openapi-java.
Fix missing assignment in SpringdocAutoConfiguration.java.
---
components-starter/camel-springdoc-starter/pom.xml | 7 +------
.../camel/springboot/springdoc/SpringdocAutoConfiguration.java | 1 +
pom.xml | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/components-starter/camel-springdoc-starter/pom.xml b/components-starter/camel-springdoc-starter/pom.xml
index eea805c9f8d..2958308ef7e 100644
--- a/components-starter/camel-springdoc-starter/pom.xml
+++ b/components-starter/camel-springdoc-starter/pom.xml
@@ -41,14 +41,9 @@
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc-version}</version>
</dependency>
- <dependency>
- <groupId>io.swagger.parser.v3</groupId>
- <artifactId>swagger-parser-v3</artifactId>
- <version>${swagger-parser-v3-version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-core-starter</artifactId>
diff --git a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
index 337f8b96a7c..f8f2e75b9a5 100644
--- a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
+++ b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
@@ -121,6 +121,7 @@ public class SpringdocAutoConfiguration {
final BeanConfig bc = new BeanConfig();
final Info info = new Info();
+ bc.setInfo(info);
final RestConfiguration rc = camelContext.getRestConfiguration();
Map<String, Object> apiProps = Optional.ofNullable(rc.getApiProperties()).orElseGet(HashMap::new);
initOpenApi(bc, info, apiProps,
diff --git a/pom.xml b/pom.xml
index 294727001f2..2403fbc0fc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
<mycila-license-version>3.0</mycila-license-version>
- <springdoc-version>1.7.0</springdoc-version>
+ <springdoc-version>2.2.0</springdoc-version>
<surefire.version>${maven-surefire-plugin-version}</surefire.version>
<swagger-parser-v3-version>2.1.10</swagger-parser-v3-version>
<cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>