You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/09/21 11:26:59 UTC
[camel] branch main updated: CAMEL-19892: openapi-rest-dsl-generator - Use jakarta instead of javax (#11500)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 85d3e9e050e CAMEL-19892: openapi-rest-dsl-generator - Use jakarta instead of javax (#11500)
85d3e9e050e is described below
commit 85d3e9e050e89cb6383d1e63886833da057da8ef
Author: Michael Würsch <wu...@users.noreply.github.com>
AuthorDate: Thu Sep 21 13:26:52 2023 +0200
CAMEL-19892: openapi-rest-dsl-generator - Use jakarta instead of javax (#11500)
* CAMEL-19892: openapi-rest-dsl-generator - Use jakarta instead of javax annotation
* CAMEL-19892: fixed tests.
* CAMEL-19892: openapi-rest-dsl-generator - Fixed integration tests.
---------
Co-authored-by: Michael Würsch <mi...@helsana.ch>
---
.../camel-restdsl-openapi-plugin/src/it/customized-v3/pom.xml | 2 ++
.../maven/camel-restdsl-openapi-plugin/src/it/customized/pom.xml | 2 ++
.../camel-restdsl-openapi-plugin/src/it/expanded-v3-yaml/pom.xml | 7 +++++++
.../camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml | 2 ++
.../maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml | 2 ++
.../camel-restdsl-openapi-plugin/src/it/simple-v3-yaml/pom.xml | 7 +++++++
.../maven/camel-restdsl-openapi-plugin/src/it/simple-v3/pom.xml | 7 +++++++
.../camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml | 2 ++
.../camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml | 2 ++
.../camel-restdsl-openapi-plugin/src/it/simple-xml-v3/pom.xml | 2 ++
.../maven/camel-restdsl-openapi-plugin/src/it/simple-xml/pom.xml | 2 ++
.../camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml | 2 ++
.../src/it/simple-yaml-kamelet-v3/pom.xml | 2 ++
.../camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml | 2 ++
tooling/maven/camel-restdsl-openapi-plugin/src/it/simple/pom.xml | 7 +++++++
.../apache/camel/generator/openapi/RestDslSourceCodeGenerator.java | 2 +-
.../openapi-rest-dsl-generator/src/test/resources/MyRestRoute.txt | 2 +-
.../src/test/resources/MyRestRouteFilter.txt | 2 +-
.../src/test/resources/MyRestRouteFilterV3.txt | 2 +-
.../src/test/resources/MyRestRouteV3.txt | 2 +-
.../src/test/resources/OpenApiPetstore.txt | 2 +-
.../src/test/resources/OpenApiPetstoreWithRestComponent.txt | 2 +-
.../src/test/resources/OpenApiV3Petstore.txt | 2 +-
.../src/test/resources/OpenApiV3PetstoreWithRestComponent.txt | 2 +-
24 files changed, 59 insertions(+), 9 deletions(-)
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 0558e395cd2..eb7375e01af 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<build>
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 0c5d6dc92cd..cc0a653c0de 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<build>
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 fa603a47af7..78fd49ec4d5 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
@@ -38,6 +40,11 @@
<artifactId>camel-core</artifactId>
<version>@project.version@</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>@jakarta-annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
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 8c4cab9496e..621468eecf1 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
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 ae77a3dfff6..c12b013a304 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
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 a4c01361f5c..308765b9d7b 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
@@ -38,6 +40,11 @@
<artifactId>camel-core</artifactId>
<version>@project.version@</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>@jakarta-annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
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 0bd5b370d4d..70cef1e80c5 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
@@ -38,6 +40,11 @@
<artifactId>camel-core</artifactId>
<version>@project.version@</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>@jakarta-annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
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 e431d4c3389..dacbce775c1 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
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 15244b4ab2c..2b3694c04b0 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
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 cdbb4e174b0..0340e502149 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<build>
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 95028556766..3dd887f7b6c 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
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<build>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
index e68c2d005ca..a302111979e 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml
index 6424e8c1c8c..7526d4e050b 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-kamelet-v3/pom.xml
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<build>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml
index 4390aaed2e8..c0932b98d0d 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-v3/pom.xml
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<build>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple/pom.xml
index c822e63733e..a512ec6f5b3 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple/pom.xml
@@ -30,6 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
@@ -38,6 +40,11 @@
<artifactId>camel-core</artifactId>
<version>@project.version@</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>@jakarta-annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
index 84ee4045007..3c9dfd7cc13 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.function.Function;
import java.util.stream.Collector;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import javax.lang.model.element.Modifier;
import com.squareup.javapoet.AnnotationSpec;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRoute.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRoute.txt
index e550d7e1641..02d756b27f7 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRoute.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRoute.txt
@@ -1,6 +1,6 @@
package com.example;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilter.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilter.txt
index c8d4e2c6b4f..94ad2fd8d18 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilter.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilter.txt
@@ -1,6 +1,6 @@
package com.example;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilterV3.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilterV3.txt
index 063efe57c90..c859e9fbd2c 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilterV3.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteFilterV3.txt
@@ -1,6 +1,6 @@
package com.example;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteV3.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteV3.txt
index b55da717bbc..e51ebbdd43f 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteV3.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/MyRestRouteV3.txt
@@ -1,6 +1,6 @@
package com.example;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstore.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstore.txt
index 5abfdbea9f6..b718f76d093 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstore.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstore.txt
@@ -1,6 +1,6 @@
package io.openapi.petstore;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstoreWithRestComponent.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstoreWithRestComponent.txt
index 4ff6fde968f..6f63eb22a58 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstoreWithRestComponent.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiPetstoreWithRestComponent.txt
@@ -1,6 +1,6 @@
package io.openapi.petstore;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3Petstore.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3Petstore.txt
index 73d27fa5809..6b9f3976bd2 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3Petstore.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3Petstore.txt
@@ -1,6 +1,6 @@
package io.openapi.petstore;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3PetstoreWithRestComponent.txt b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3PetstoreWithRestComponent.txt
index 10a8338f999..2b2faf44b2a 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3PetstoreWithRestComponent.txt
+++ b/tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3PetstoreWithRestComponent.txt
@@ -1,6 +1,6 @@
package io.openapi.petstore;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.rest.CollectionFormat;
import org.apache.camel.model.rest.RestParamType;