You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/16 08:24:25 UTC
[camel-k-runtime] branch camel-main updated (12bddd60 -> 8ce5c9e7)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
discard 12bddd60 Aligned to the latest unreleased Camel Quarkus and Camel Core
discard 99a0a5d5 Removed an endpoint DSL test
discard a370cbe9 Updated NoRoutesCollector to match the updated interface from Camel
discard de7fe1e4 Fix outdated error handler reference
discard c8336ed3 Aligned to the latest unreleased Camel Quarkus
add 591261c5 build(deps): bump maven-common-artifact-filters from 3.2.0 to 3.3.0
add 3eefeadb Updated CHANGELOG.md
new 1b027cc4 Aligned to the latest unreleased Camel Quarkus
new 722d97b7 Fix outdated error handler reference
new 92d37f32 Updated NoRoutesCollector to match the updated interface from Camel
new 273e63d7 Removed an endpoint DSL test
new 8ce5c9e7 Aligned to the latest unreleased Camel Quarkus and Camel Core
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (12bddd60)
\
N -- N -- N refs/heads/camel-main (8ce5c9e7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 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:
CHANGELOG.md | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[camel-k-runtime] 01/05: Aligned to the latest unreleased Camel Quarkus
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 1b027cc4d06b9fee18338c6da4f38183e7c9fd55
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu May 5 12:30:10 2022 +0200
Aligned to the latest unreleased Camel Quarkus
---
pom.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f03e52d..90a5f894 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.16.0</version>
+ <version>3.17.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,13 +38,14 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
- <camel-version>3.16.0</camel-version>
+ <camel-version>3.17.0-SNAPSHOT</camel-version>
<!-- quarkus -->
- <camel-quarkus-version>2.8.0</camel-quarkus-version>
- <quarkus-version>2.8.0.Final</quarkus-version>
+ <camel-quarkus-version>2.9.0-SNAPSHOT</camel-quarkus-version>
+ <quarkus-version>2.9.0.CR1</quarkus-version>
<quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.0.0-java11</quarkus-native-builder-image>
+
<!-- camel-k -->
<groovy-version>3.0.11</groovy-version>
<spock-version>2.1-groovy-3.0</spock-version>
[camel-k-runtime] 05/05: Aligned to the latest unreleased Camel Quarkus and Camel Core
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 8ce5c9e75f9351fba9c6eceb775052ed99d74f0d
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jun 15 14:23:18 2022 +0200
Aligned to the latest unreleased Camel Quarkus and Camel Core
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 90a5f894..361bf7ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.17.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
- <camel-version>3.17.0-SNAPSHOT</camel-version>
+ <camel-version>3.18.0-SNAPSHOT</camel-version>
<!-- quarkus -->
<camel-quarkus-version>2.9.0-SNAPSHOT</camel-quarkus-version>
[camel-k-runtime] 04/05: Removed an endpoint DSL test
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 273e63d7320664d7f99cfb95784552d7f6269eb2
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu May 5 13:05:08 2022 +0200
Removed an endpoint DSL test
This feature was removed in Camel 3.17
---
.../k/loader/yaml/quarkus/YamlLoaderTest.java | 28 -------------------
.../test/resources/routes_with_endpointdsl.yaml | 31 ----------------------
2 files changed, 59 deletions(-)
diff --git a/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java b/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java
index f1a82eec..466b9a43 100644
--- a/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java
+++ b/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java
@@ -57,32 +57,4 @@ public class YamlLoaderTest {
assertThat(p.getList("endpoints", String.class))
.contains("direct://yaml", "log://yaml");
}
-
- @Test
- public void testLoadRoutesWithEndpointDSL() throws IOException {
- String code;
-
- try (InputStream is = YamlLoaderTest.class.getResourceAsStream("/routes_with_endpointdsl.yaml")) {
- code = IOHelper.loadText(is);
- }
-
- JsonPath p = RestAssured.given()
- .contentType(MediaType.TEXT_PLAIN)
- .accept(MediaType.APPLICATION_JSON)
- .body(code)
- .post("/test/load-routes/MyRoute")
- .then()
- .statusCode(200)
- .extract()
- .body()
- .jsonPath();
-
- assertThat(p.getList("components", String.class))
- .contains("direct");
- assertThat(p.getList("routes", String.class))
- .contains("yaml");
- assertThat(p.getList("endpoints", String.class))
- .contains("direct://route", "direct://route_result")
- .contains("direct://from", "direct://from_result");
- }
}
diff --git a/itests/camel-k-itests-loader-yaml/src/test/resources/routes_with_endpointdsl.yaml b/itests/camel-k-itests-loader-yaml/src/test/resources/routes_with_endpointdsl.yaml
deleted file mode 100644
index 6a53ac00..00000000
--- a/itests/camel-k-itests-loader-yaml/src/test/resources/routes_with_endpointdsl.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-- route:
- id: yaml
- from:
- direct:
- name: 'route'
- steps:
- - direct:
- name: "route_result"
-- from:
- direct:
- name: "from"
- steps:
- - direct:
- name: "from_result"
[camel-k-runtime] 02/05: Fix outdated error handler reference
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 722d97b7b9e888395f4c3b0026ade75cdebf66a0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu May 5 12:30:46 2022 +0200
Fix outdated error handler reference
---
.../main/java/org/apache/camel/k/support/SourcesSupport.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
index 2fc4326b..0c62f72c 100644
--- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
+++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
@@ -150,10 +150,9 @@ public final class SourcesSupport {
"There should not be any template definition when configuring error handler, got " + templates.size());
}
- if (hasErrorHandlerBuilder(builder)) {
- LOGGER.debug("Setting default error handler builder factory as {}", builder.getErrorHandlerBuilder());
- runtime.getCamelContext().adapt(ExtendedCamelContext.class).setErrorHandlerFactory(builder.getErrorHandlerBuilder());
- }
+ LOGGER.debug("Setting default error handler builder factory as {}", builder.getErrorHandlerFactory());
+ runtime.getCamelContext().adapt(ExtendedCamelContext.class).setErrorHandlerFactory(builder.getErrorHandlerFactory());
+
}
});
break;
@@ -175,10 +174,6 @@ public final class SourcesSupport {
}
}
- static boolean hasErrorHandlerBuilder(RouteBuilder builder) {
- return builder.hasErrorHandlerBuilder();
- }
-
public static void loadErrorHandlerSource(Runtime runtime, SourceDefinition errorHandlerSourceDefinition) {
LOGGER.info("Loading error handler from: {}", errorHandlerSourceDefinition);
load(runtime, Sources.fromDefinition(errorHandlerSourceDefinition));
[camel-k-runtime] 03/05: Updated NoRoutesCollector to match the updated interface from Camel
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 92d37f32d28e0b4a9338b616a6f7bd5da59e366b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu May 5 12:36:45 2022 +0200
Updated NoRoutesCollector to match the updated interface from Camel
---
.../src/main/java/org/apache/camel/k/quarkus/Application.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
index 4950bc45..61676949 100644
--- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
+++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java
@@ -33,6 +33,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.main.BaseMainSupport;
import org.apache.camel.main.MainListener;
import org.apache.camel.main.RoutesCollector;
+import org.apache.camel.spi.Resource;
public final class Application {
private Application() {
@@ -150,6 +151,11 @@ public final class Application {
public List<RoutesBuilder> collectRoutesFromRegistry(CamelContext camelContext, String excludePattern, String includePattern) {
return Collections.emptyList();
}
+
+ @Override
+ public Collection<Resource> findRouteResourcesFromDirectory(CamelContext camelContext, String excludePattern, String includePattern) {
+ return Collections.emptyList();
+ }
}
// *********************************