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 2022/08/23 13:18:31 UTC
[camel-quarkus] branch main updated: Fix conflict in property name with OS env variable
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
The following commit(s) were added to refs/heads/main by this push:
new add9ed2e39 Fix conflict in property name with OS env variable
add9ed2e39 is described below
commit add9ed2e39da071702d1f78f319b8c9c3b41e6df
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Tue Aug 23 12:47:36 2022 +0200
Fix conflict in property name with OS env variable
---
.../camel/quarkus/component/quartz/it/QuartzClusteredResource.java | 2 +-
.../camel/quarkus/component/quartz/it/QuartzClusteredRoutes.java | 4 ++--
.../quartz-clustered/src/main/resources/application.properties | 2 +-
.../apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredResource.java b/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredResource.java
index e610e7e4c0..af728a417e 100644
--- a/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredResource.java
+++ b/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredResource.java
@@ -49,7 +49,7 @@ public class QuartzClusteredResource {
@Override
public void configure() {
from("quartz:camel-quarkus/1 * * * *")
- .log("Hello from {{node.name}}");
+ .log("Hello from {{quartz.node.name}}");
}
});
}
diff --git a/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredRoutes.java b/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredRoutes.java
index 51e6e42939..71a5a9f530 100644
--- a/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredRoutes.java
+++ b/integration-tests/quartz-clustered/src/main/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredRoutes.java
@@ -23,14 +23,14 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
@ApplicationScoped
public class QuartzClusteredRoutes extends RouteBuilder {
- @ConfigProperty(name = "node.name")
+ @ConfigProperty(name = "quartz.node.name")
String nodeName;
@Override
public void configure() {
if (nodeName.equals("NodeB")) {
from("quartz:camel-quarkus/1 * * * *").routeId("clustered")
- .log("Hello from {{node.name}}");
+ .log("Hello from {{quartz.node.name}}");
}
}
}
diff --git a/integration-tests/quartz-clustered/src/main/resources/application.properties b/integration-tests/quartz-clustered/src/main/resources/application.properties
index 520b46a0f1..3fc1b99e99 100644
--- a/integration-tests/quartz-clustered/src/main/resources/application.properties
+++ b/integration-tests/quartz-clustered/src/main/resources/application.properties
@@ -36,4 +36,4 @@ quarkus.flyway.baseline-on-migrate = true
quarkus.flyway.baseline-version = 1.0
quarkus.flyway.baseline-description = Quartz
-node.name = NodeA
+quartz.node.name = NodeA
diff --git a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
index 1f6cdb91b5..e9e5acb6ce 100644
--- a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
+++ b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
@@ -57,7 +57,7 @@ class QuartzClusteredTest {
// Start secondary application process
QuarkusProcessExecutor quarkusProcessExecutor = new QuarkusProcessExecutor(
- "-Dnode.name=NodeB",
+ "-Dquartz.node.name=NodeB",
"-Dnode.autostart=true",
"-Dquarkus.log.file.path=" + QUARKUS_LOG,
"-Dquarkus.datasource.jdbc.url=" + jdbcUrl,