You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2021/05/19 11:41:16 UTC
[camel] 01/01: make use of Java8 JSR310 Impl for
camel-restdsl-openapi/swagger-plugin
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch java8-jsr310
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ec9c8c8e435a972b932a714eec4c5f5f0fe64e19
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Wed May 19 13:40:36 2021 +0200
make use of Java8 JSR310 Impl for camel-restdsl-openapi/swagger-plugin
---
dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 2 +-
.../src/it/customized-v3/pom.xml | 9 ++-------
.../src/it/customized/pom.xml | 7 +------
.../src/it/expanded-v3-yaml/pom.xml | 2 +-
.../src/it/simple-dto-v3/pom.xml | 16 +++++++---------
.../src/it/simple-dto/pom.xml | 14 ++++++--------
.../src/it/simple-v3-yaml/pom.xml | 2 +-
.../src/it/simple-v3/pom.xml | 2 +-
.../src/it/simple-xml-dto-v3/pom.xml | 16 +++++++---------
.../src/it/simple-xml-dto/pom.xml | 16 +++++++---------
.../src/it/simple-xml-v3/pom.xml | 2 +-
.../src/it/simple-xml/pom.xml | 2 +-
.../src/it/spring-boot-starter-support/pom.xml | 7 ++++++-
.../src/main/docs/camel-restdsl-openapi-plugin.adoc | 12 +-----------
.../maven/generator/openapi/AbstractGenerateMojo.java | 2 +-
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 2 +-
.../src/it/client-validation/pom.xml | 7 +------
.../src/it/customized/pom.xml | 7 +------
.../src/it/simple-dto/pom.xml | 9 ++-------
.../src/it/simple-xml-dto/pom.xml | 14 ++++++--------
.../src/it/simple-xml/pom.xml | 2 +-
.../src/it/spring-boot-starter-support/pom.xml | 2 +-
.../src/main/docs/camel-restdsl-swagger-plugin.adoc | 16 +++-------------
.../maven/generator/swagger/AbstractGenerateMojo.java | 2 +-
26 files changed, 63 insertions(+), 113 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 2ef5afe..1b2b0bd 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -170,7 +170,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
</dependency>
</dependencies>
</profile>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index bb55d1e..ccb3a5a 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -201,7 +201,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>1.3.2</version>
</dependency>
</dependencies>
</profile>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index a3f50cc..25b13de 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml
index 6711104..781a4b1 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>customized</id>
+ <id>customized-v3</id>
<goals>
<goal>generate</goal>
</goals>
@@ -80,12 +80,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
</dependencies>
</project>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized/pom.xml
index 099cc9e..6001534 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/customized/pom.xml
@@ -80,12 +80,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
</dependencies>
</project>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml
index 9d66292..f89a249 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>expanded-v3-yaml</id>
<goals>
<goal>generate</goal>
</goals>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
index 19aaec7..326788c 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
@@ -52,22 +52,17 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>2.1.0</version>
+ <version>2.1.9</version>
</dependency>
</dependencies>
@@ -79,13 +74,16 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple-dto</id>
+ <id>simple-dto-v3</id>
<goals>
<goal>generate-with-dto</goal>
</goals>
<configuration>
<modelPackage>com.foo</modelPackage>
<modelWithXml>false</modelWithXml>
+ <configOptions>
+ <dateLibrary>java8</dateLibrary>
+ </configOptions>
</configuration>
</execution>
</executions>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
index 3c512d2..627ce5d 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
@@ -52,22 +52,17 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>2.1.0</version>
+ <version>2.1.9</version>
</dependency>
</dependencies>
@@ -86,6 +81,9 @@
<configuration>
<modelPackage>com.foo</modelPackage>
<modelWithXml>false</modelWithXml>
+ <configOptions>
+ <dateLibrary>java8</dateLibrary>
+ </configOptions>
</configuration>
</execution>
</executions>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml
index 600fe83..f2e5cf5 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-v3-yaml</id>
<goals>
<goal>generate</goal>
</goals>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml
index d995eef..590788a 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-v3</id>
<goals>
<goal>generate</goal>
</goals>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
index a16bb71..8d0a7ed 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
@@ -52,22 +52,17 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>2.1.0</version>
+ <version>2.1.9</version>
</dependency>
</dependencies>
@@ -79,13 +74,16 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-xml-dto-v3</id>
<goals>
<goal>generate-xml-with-dto</goal>
</goals>
<configuration>
<blueprint>true</blueprint>
<filterOperation>find*,deletePet,updatePet</filterOperation>
+ <configOptions>
+ <dateLibrary>java8</dateLibrary>
+ </configOptions>
</configuration>
</execution>
</executions>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
index 499cf87..aed57ef 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
@@ -52,22 +52,17 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>2.1.0</version>
+ <version>2.1.9</version>
</dependency>
</dependencies>
@@ -79,13 +74,16 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-xml-dto</id>
<goals>
<goal>generate-xml-with-dto</goal>
</goals>
<configuration>
<blueprint>true</blueprint>
<filterOperation>find*,deletePet,updatePet</filterOperation>
+ <configOptions>
+ <dateLibrary>java8</dateLibrary>
+ </configOptions>
</configuration>
</execution>
</executions>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml
index fca3776..365f081 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-xml-v3</id>
<goals>
<goal>generate-xml</goal>
</goals>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml/pom.xml
index 9de5458..b298fae 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-xml</id>
<goals>
<goal>generate-xml</goal>
</goals>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml
index 58b704e..2c66119 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/spring-boot-starter-support/pom.xml
@@ -41,10 +41,15 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>spring-boot-starter-support</id>
<goals>
<goal>generate</goal>
</goals>
+ <configuration>
+ <configOptions>
+ <dateLibrary>java8</dateLibrary>
+ </configOptions>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc b/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
index 6339fff..93627f2 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
@@ -99,11 +99,6 @@ The DTO classes may require additional dependencies such as:
<version>2.8.6</version>
</dependency>
<dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
<version>2.1.9</version>
@@ -173,11 +168,6 @@ The DTO classes may require additional dependencies such as:
<version>2.8.6</version>
</dependency>
<dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
<version>2.1.9</version>
@@ -190,7 +180,7 @@ The plugin supports the following *additional* options
|========================================
| Parameter | Default Value | Description
-| `swaggerCodegenMavenPluginVersion` | 3.0.19 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
+| `swaggerCodegenMavenPluginVersion` | 3.0.25 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
| `modelOutput` | | Target output path (default is ${project.build.directory}/generated-sources/openapi)
| `modelPackage` | `io.swagger.client.model` | The package to use for generated model objects/classes
| `modelNamePrefix` | | Sets the pre- or suffix for model classes and enums
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
index df25d91..594a5bf 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
@@ -117,7 +117,7 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
@Parameter
String basePath;
- @Parameter(defaultValue = "3.0.19")
+ @Parameter(defaultValue = "3.0.25")
String swaggerCodegenMavenPluginVersion;
@Parameter(defaultValue = "${project}", readonly = true)
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 10620b2..7e8818c 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/client-validation/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/client-validation/pom.xml
index 76c5fb7..a1f9511 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/client-validation/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/client-validation/pom.xml
@@ -82,12 +82,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
</dependencies>
</project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
index 3aaad86..aa3b92e 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
@@ -80,12 +80,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
</dependencies>
</project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
index 35325ba..e71ae98 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
@@ -52,17 +52,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
</dependency>
</dependencies>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
index 0f1d75a..ea090f7 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
@@ -52,17 +52,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
</dependency>
</dependencies>
@@ -74,13 +69,16 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-xml-dto</id>
<goals>
<goal>generate-xml-with-dto</goal>
</goals>
<configuration>
<blueprint>true</blueprint>
<filterOperation>find*,deletePet,updatePet</filterOperation>
+ <configOptions>
+ <dateLibrary>java8</dateLibrary>
+ </configOptions>
</configuration>
</execution>
</executions>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
index aba3f53..3b3bece 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>simple-xml</id>
<goals>
<goal>generate-xml</goal>
</goals>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/spring-boot-starter-support/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/spring-boot-starter-support/pom.xml
index 6d71852..5df5314 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/spring-boot-starter-support/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/spring-boot-starter-support/pom.xml
@@ -41,7 +41,7 @@
<version>@project.version@</version>
<executions>
<execution>
- <id>simple</id>
+ <id>spring-boot-starter-support</id>
<goals>
<goal>generate</goal>
</goals>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc b/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc
index addea6c..18c1e59 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc
@@ -95,12 +95,7 @@ The DTO classes may require additional dependencies such as:
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
----
@@ -162,12 +157,7 @@ The DTO classes may require additional dependencies such as:
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.7</version>
+ <version>2.8.6</version>
</dependency>
----
@@ -177,7 +167,7 @@ The plugin supports the following *additional* options
|========================================
| Parameter | Default Value | Description
-| `swaggerCodegenMavenPluginVersion` | 2.3.1 | The version of the `io.swagger:swagger-codegen-maven-plugin` maven plugin to be used.
+| `swaggerCodegenMavenPluginVersion` | 2.4.12 | The version of the `io.swagger:swagger-codegen-maven-plugin` maven plugin to be used.
| `modelOutput` | | Target output path (default is ${project.build.directory}/generated-sources/swagger)
| `modelPackage` | `io.swagger.client.model` | The package to use for generated model objects/classes
| `modelNamePrefix` | | Sets the pre- or suffix for model classes and enums
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
index a4fec42..3d7c504 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
@@ -97,7 +97,7 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
@Parameter(defaultValue = "${project.basedir}/src/spec/swagger.json", required = true)
String specificationUri;
- @Parameter(defaultValue = "2.4.12")
+ @Parameter(defaultValue = "2.4.19")
String swaggerCodegenMavenPluginVersion;
// A map of the language-specific parameters passed to the swagger-codegen-maven-plugin