You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/07/28 09:28:03 UTC
[camel-k-runtime] branch cq-2.11.0-camel-3.18.0 created (now 4a269380)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch cq-2.11.0-camel-3.18.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
at 4a269380 Step to align to 3.18.0
This branch includes the following new commits:
new d72cb71a Upgrade Camel to version 3.18.0
new 3317bc08 Upgrade Camel Quarkus to version 2.11.0
new 57cff82e Upgrade Quarkus to version 2.11.0.Final
new b7cd5428 Upgrade Quarkus native image to version 22.1.0-java11
new dae99bb4 Aligning Quarkus Platform to version 2.11.1.Final
new 4a269380 Step to align to 3.18.0
The 6 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.
[camel-k-runtime] 01/06: Upgrade Camel to version 3.18.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch cq-2.11.0-camel-3.18.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit d72cb71ae512203038ea0b70339a2c72d6c0ec94
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 26 13:15:30 2022 +0200
Upgrade Camel to version 3.18.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index adc23085..b26e9f07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
- <camel-version>3.16.0</camel-version>
+ <camel-version>3.18.0</camel-version>
<!-- quarkus -->
<camel-quarkus-version>2.8.0</camel-quarkus-version>
[camel-k-runtime] 04/06: Upgrade Quarkus native image to version 22.1.0-java11
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch cq-2.11.0-camel-3.18.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit b7cd54283c3ec9e3b572b2fcd4626382f4b9a40b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 26 13:18:00 2022 +0200
Upgrade Quarkus native image to version 22.1.0-java11
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c4695000..e000e049 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<!-- quarkus -->
<camel-quarkus-version>2.11.0</camel-quarkus-version>
<quarkus-version>2.11.0.Final</quarkus-version>
- <quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.0.0-java11</quarkus-native-builder-image>
+ <quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.1.0-java11</quarkus-native-builder-image>
<!-- camel-k -->
<groovy-version>3.0.11</groovy-version>
[camel-k-runtime] 05/06: Aligning Quarkus Platform to version 2.11.1.Final
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch cq-2.11.0-camel-3.18.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit dae99bb4deae5d2948d093f9d09e6f07c3415d3c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jul 28 10:35:22 2022 +0200
Aligning Quarkus Platform to version 2.11.1.Final
---
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index e000e049..43eada5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
<!-- quarkus -->
<camel-quarkus-version>2.11.0</camel-quarkus-version>
<quarkus-version>2.11.0.Final</quarkus-version>
+ <quarkus-platform-version>2.11.1.Final</quarkus-platform-version>
<quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.1.0-java11</quarkus-native-builder-image>
<!-- camel-k -->
@@ -407,14 +408,14 @@
<dependency>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-bom</artifactId>
- <version>${quarkus-version}</version>
+ <version>${quarkus-platform-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-camel-bom</artifactId>
- <version>${quarkus-version}</version>
+ <version>${quarkus-platform-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
[camel-k-runtime] 02/06: Upgrade Camel Quarkus to version 2.11.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch cq-2.11.0-camel-3.18.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 3317bc08b4a34fba3cc98d67b0fb89c912888326
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 26 13:15:48 2022 +0200
Upgrade Camel Quarkus to version 2.11.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b26e9f07..6c62592e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<camel-version>3.18.0</camel-version>
<!-- quarkus -->
- <camel-quarkus-version>2.8.0</camel-quarkus-version>
+ <camel-quarkus-version>2.11.0</camel-quarkus-version>
<quarkus-version>2.8.0.Final</quarkus-version>
<quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.0.0-java11</quarkus-native-builder-image>
[camel-k-runtime] 06/06: Step to align to 3.18.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch cq-2.11.0-camel-3.18.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 4a2693808af0fe5b67687cee833ab85985c7f1cf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jul 28 11:27:44 2022 +0200
Step to align to 3.18.0
---
.../main/java/org/apache/camel/k/support/SourcesSupport.java | 10 ++--------
.../src/main/java/org/apache/camel/k/quarkus/Application.java | 6 ++++++
.../camel-k-maven-plugin/src/it/generate-catalog/verify.groovy | 3 ++-
3 files changed, 10 insertions(+), 9 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..80e9ad5b 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,8 @@ 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 +173,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));
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..1002fb59 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() {
@@ -146,6 +147,11 @@ public final class Application {
return Collections.emptyList();
}
+ @Override
+ public Collection<Resource> findRouteResourcesFromDirectory(CamelContext camelContext, String excludePattern, String includePattern) {
+ return Collections.emptyList();
+ }
+
@Override
public List<RoutesBuilder> collectRoutesFromRegistry(CamelContext camelContext, String excludePattern, String includePattern) {
return Collections.emptyList();
diff --git a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy
index 032c2465..2381dfe7 100644
--- a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy
+++ b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy
@@ -21,7 +21,8 @@ new File(basedir, "catalog.yaml").withReader {
assert catalog.spec.runtime.version == runtimeVersion
assert catalog.spec.runtime.applicationClass == 'io.quarkus.bootstrap.runner.QuarkusEntryPoint'
assert catalog.spec.runtime.metadata['camel.version'] == camelVersion
- assert catalog.spec.runtime.metadata['quarkus.version'] == quarkusVersion
+ //For 1.14.0 we need to use a different quarkus.platform version released for a last time CVE. Let's re-enable the assert for the next release.
+ //assert catalog.spec.runtime.metadata['quarkus.version'] == quarkusVersion
assert catalog.spec.runtime.metadata['camel-quarkus.version'] == camelQuarkusVersion
assert catalog.spec.runtime.dependencies.any {
[camel-k-runtime] 03/06: Upgrade Quarkus to version 2.11.0.Final
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch cq-2.11.0-camel-3.18.0
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 57cff82edc8427e1d8229f27328078bd0937f85a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 26 13:16:49 2022 +0200
Upgrade Quarkus to version 2.11.0.Final
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6c62592e..c4695000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<!-- quarkus -->
<camel-quarkus-version>2.11.0</camel-quarkus-version>
- <quarkus-version>2.8.0.Final</quarkus-version>
+ <quarkus-version>2.11.0.Final</quarkus-version>
<quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.0.0-java11</quarkus-native-builder-image>
<!-- camel-k -->