You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/09/15 08:59:12 UTC

[camel-quarkus] 01/02: Upgrade Camel to 3.11.2

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 130db500bd753c5413d8bf9fa2d4b0660b7550c7
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Sep 14 07:41:01 2021 +0100

    Upgrade Camel to 3.11.2
---
 .../quarkus/component/openapijava/it/OpenApiRoutes.java   | 15 ++++++---------
 .../component/openapijava/it/common/OpenApiTest.java      | 15 ++++++---------
 pom.xml                                                   |  4 ++--
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
index bb65634..8e6a1e3 100644
--- a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
+++ b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
@@ -51,15 +51,12 @@ public class OpenApiRoutes extends RouteBuilder {
                 .apiProperty("schemes", "http,https")
                 .apiProperty("api.path", "/api-docs")
                 .apiProperty("base.path", "/api")
-                .apiProperty("api.termsOfService", "https://camel.apache.org");
-
-        // TODO: Enable license and contact config
-        // https://issues.apache.org/jira/browse/CAMEL-16923
-        // .apiProperty("api.contact.name", "Mr Camel Quarkus")
-        // .apiProperty("api.contact.email", "mrcq@cq.org")
-        // .apiProperty("api.contact.url", "https://camel.apache.org")
-        // .apiProperty("api.license.name", "Apache V2")
-        // .apiProperty("api.license.url", "https://www.apache.org/licenses/LICENSE-2.0");
+                .apiProperty("api.termsOfService", "https://camel.apache.org")
+                .apiProperty("api.contact.name", "Mr Camel Quarkus")
+                .apiProperty("api.contact.email", "mrcq@cq.org")
+                .apiProperty("api.contact.url", "https://camel.apache.org")
+                .apiProperty("api.license.name", "Apache V2")
+                .apiProperty("api.license.url", "https://www.apache.org/licenses/LICENSE-2.0");
 
         rest("/api")
                 .get("/fruits/list")
diff --git a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java
index 58fd803..4f97265 100644
--- a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java
+++ b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java
@@ -183,15 +183,12 @@ public abstract class OpenApiTest {
                         "info.title", is("Camel Quarkus API"),
                         "info.version", is("1.2.3"),
                         "info.description", is("The Awesome Camel Quarkus REST API"),
-                        "info.termsOfService", is("https://camel.apache.org")
-                // TODO: Verify license and contact config
-                // https://issues.apache.org/jira/browse/CAMEL-16923
-                // "info.contact.name", is("Mr Camel Quarkus"),
-                // "info.contact.url", is("https://camel.apache.org"),
-                // "info.contact.email", is("mrcq@cq.org"),
-                // "info.license.name", is("Apache V2"),
-                // "info.license.url", is("https://www.apache.org/licenses/LICENSE-2.0")
-                );
+                        "info.termsOfService", is("https://camel.apache.org"),
+                        "info.contact.name", is("Mr Camel Quarkus"),
+                        "info.contact.url", is("https://camel.apache.org"),
+                        "info.contact.email", is("mrcq@cq.org"),
+                        "info.license.name", is("Apache V2"),
+                        "info.license.url", is("https://www.apache.org/licenses/LICENSE-2.0"));
     }
 
     @ParameterizedTest
diff --git a/pom.xml b/pom.xml
index 42bfd29..2e1dd1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>3.11.1</version>
+        <version>3.11.2</version>
     </parent>
 
     <groupId>org.apache.camel.quarkus</groupId>
@@ -39,7 +39,7 @@
     <properties>
         <!-- Primary dependencies - maintained manually -->
         <camel.major.minor>3.11</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
-        <camel.version>${camel.major.minor}.1</camel.version>
+        <camel.version>${camel.major.minor}.2</camel.version>
         <camel.docs.components.xref>${camel.major.minor}.x@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
         <camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends -->