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 2022/10/17 09:47:16 UTC
[camel] branch main updated (8df17b13807 -> 3af9453712e)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 8df17b13807 CAMEL-18565: camel-main - Should not swallow file not found exception when loading routes, and routes-include-pattern refers to a non existing file.
new 209ba3fc4b8 Upgrade swagger-java-parser to 1.0.62
new b68b1fff466 camel-rest - Fix NPE with better exception if component not on classpath
new 479af0d5798 Skip undertow due to SSL testing issue on CI servers
new 3af9453712e Upgrade apicurio to 1.1.26
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 4 ++--
.../apache/camel/component/rest/openapi/HttpsTest.java | 1 +
.../apache/camel/component/rest/swagger/HttpsTest.java | 1 +
.../apache/camel/support/RestProducerFactoryHelper.java | 15 +++++++++------
parent/pom.xml | 4 ++--
5 files changed, 15 insertions(+), 10 deletions(-)
[camel] 01/04: Upgrade swagger-java-parser to 1.0.62
Posted by da...@apache.org.
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
commit 209ba3fc4b8f848e52245db330f879323f91719f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 17 11:34:11 2022 +0200
Upgrade swagger-java-parser to 1.0.62
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index cbcb0c923ce..02dc8aa3b12 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -524,7 +524,7 @@
<stompjms-version>1.19</stompjms-version>
<stringtemplate-version>4.3.4</stringtemplate-version>
<swagger-java-guava-version>27.1-jre</swagger-java-guava-version>
- <swagger-java-parser-version>1.0.56</swagger-java-parser-version>
+ <swagger-java-parser-version>1.0.62</swagger-java-parser-version>
<swagger-java-version>1.6.4</swagger-java-version>
<swagger-openapi3-version>2.1.13</swagger-openapi3-version>
<templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index c6eaee53fdb..264e039d39c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -511,7 +511,7 @@
<stompjms-version>1.19</stompjms-version>
<swagger-java-version>1.6.4</swagger-java-version>
<swagger-openapi3-version>2.1.13</swagger-openapi3-version>
- <swagger-java-parser-version>1.0.56</swagger-java-parser-version>
+ <swagger-java-parser-version>1.0.62</swagger-java-parser-version>
<swagger-java-guava-version>27.1-jre</swagger-java-guava-version>
<stax-api-version>1.0.1</stax-api-version>
<stringtemplate-version>4.3.4</stringtemplate-version>
[camel] 02/04: camel-rest - Fix NPE with better exception if component not on classpath
Posted by da...@apache.org.
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
commit b68b1fff46684352192fb69a86cea4d2965fe31e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 17 11:40:23 2022 +0200
camel-rest - Fix NPE with better exception if component not on classpath
---
.../apache/camel/support/RestProducerFactoryHelper.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RestProducerFactoryHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/RestProducerFactoryHelper.java
index 2910e835a5c..d8cc9cf4015 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/RestProducerFactoryHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/RestProducerFactoryHelper.java
@@ -42,21 +42,19 @@ public final class RestProducerFactoryHelper {
public static void setupComponentFor(
final String url, final CamelContext camelContext,
- final Map<String, Object> componentProperties)
- throws Exception {
- final String scheme = StringHelper.before(url, ":");
+ final Map<String, Object> componentProperties) {
+ final String scheme = StringHelper.before(url, ":");
setupComponent(scheme, camelContext, componentProperties);
}
public static Component setupComponent(
final String componentName, final CamelContext camelContext,
- final Map<String, Object> componentProperties)
- throws Exception {
+ final Map<String, Object> componentProperties) {
+
if (componentName == null) {
return null;
}
-
if (componentProperties == null || componentProperties.isEmpty()) {
return camelContext.getComponent(componentName);
}
@@ -76,6 +74,11 @@ public final class RestProducerFactoryHelper {
// component was not added to the context we can configure it
final Component newlyCreated = camelContext.getComponent(componentName, true, false);
+ if (newlyCreated == null) {
+ throw new IllegalArgumentException(
+ "Cannot find component with name " + componentName
+ + ". Make sure you have the component on the classpath");
+ }
PropertyBindingSupport.build().withRemoveParameters(false).withIgnoreCase(true)
.withConfigurer(newlyCreated.getComponentPropertyConfigurer())
.bind(camelContext, newlyCreated, componentProperties);
[camel] 03/04: Skip undertow due to SSL testing issue on CI servers
Posted by da...@apache.org.
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
commit 479af0d57988e21e80aae2a374ea26272d2a4e8a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 17 11:45:38 2022 +0200
Skip undertow due to SSL testing issue on CI servers
---
.../src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java | 1 +
.../src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java
index b7b485c5434..34fb974fbce 100644
--- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java
+++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java
@@ -144,6 +144,7 @@ public abstract class HttpsTest extends CamelTestSupport {
public static Iterable<String> knownProducers() {
final List<String> producers = new ArrayList<>(Arrays.asList(RestEndpoint.DEFAULT_REST_PRODUCER_COMPONENTS));
// skip http due security certificate testing problems
+ producers.remove("undertow");
producers.remove("vertx-http");
producers.remove("http");
return producers;
diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
index 467993b577e..9e9ac19d8ad 100644
--- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
+++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
@@ -162,6 +162,7 @@ public abstract class HttpsTest extends CamelTestSupport {
public static Iterable<String> knownProducers() {
final List<String> producers = new ArrayList<>(Arrays.asList(RestEndpoint.DEFAULT_REST_PRODUCER_COMPONENTS));
// skip http due security certificate testing problems
+ producers.remove("undertow");
producers.remove("vertx-http");
producers.remove("http");
return producers;
[camel] 04/04: Upgrade apicurio to 1.1.26
Posted by da...@apache.org.
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
commit 3af9453712e81e72b216c16f5cce5f90af84a6d8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 17 11:46:55 2022 +0200
Upgrade apicurio to 1.1.26
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 02dc8aa3b12..dcf99db99af 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -40,7 +40,7 @@
<apache-drill-version>1.19.0</apache-drill-version>
<apache-gora-version>0.9</apache-gora-version>
<apacheds-version>2.0.0.AM26</apacheds-version>
- <apicurio-version>1.1.20</apicurio-version>
+ <apicurio-version>1.1.26</apicurio-version>
<arangodb-java-version>6.19.0</arangodb-java-version>
<aries-blueprint-api-version>1.0.1</aries-blueprint-api-version>
<aries-blueprint-cm-version>1.3.2</aries-blueprint-cm-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 264e039d39c..b4e74c63cde 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<apache-any23-version>2.7</apache-any23-version>
<apache-drill-version>1.19.0</apache-drill-version>
<apache-gora-version>0.9</apache-gora-version>
- <apicurio-version>1.1.20</apicurio-version>
+ <apicurio-version>1.1.26</apicurio-version>
<arangodb-java-version>6.19.0</arangodb-java-version>
<aries-blueprint-api-version>1.0.1</aries-blueprint-api-version>
<aries-blueprint-cm-version>1.3.2</aries-blueprint-cm-version>