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/10/11 09:15:55 UTC
[camel] branch main created (now c488049f90e)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
at c488049f90e Polished docs: fixed grammar and wording issues (#8507)
This branch includes the following new commits:
new 15c67534785 CAMEL-18600: properties component - Allow to turn off nested placeholders
new 87455105b69 Upgrade TestContainers to version 1.17.5
new 0b5228797fb Sync deps
new 2321dddade1 CAMEL-18600: properties component - Allow to turn off nested placeholders
new c67673e9d71 CAMEL-18600: properties component - Allow to turn off nested placeholders
new c488049f90e Polished docs: fixed grammar and wording issues (#8507)
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] 01/06: CAMEL-18600: properties component - Allow to turn off nested placeholders
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 15c675347854f3eb1546e0fcd74845af8cca0e4d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Oct 11 10:57:13 2022 +0200
CAMEL-18600: properties component - Allow to turn off nested placeholders
---
.../org/apache/camel/spi/PropertiesComponent.java | 6 +++
.../properties/PropertiesComponentConfigurer.java | 6 +++
.../properties/DefaultPropertiesParser.java | 48 +++++++++++++++---
.../component/properties/PropertiesComponent.java | 18 ++++++-
.../component/properties/PropertiesParser.java | 7 ++-
.../PropertiesComponentNestedFalseTest.java | 57 ++++++++++++++++++++++
.../properties/PropertiesComponentNestedTest.java | 56 +++++++++++++++++++++
7 files changed, 190 insertions(+), 8 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
index 4c284a7618f..a49fbc81bd6 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
@@ -204,6 +204,12 @@ public interface PropertiesComponent extends StaticService {
*/
void setIgnoreMissingLocation(boolean ignoreMissingLocation);
+ /**
+ * Whether to support nested property placeholders. A nested placeholder, means that a placeholder, has also a
+ * placeholder, that should be resolved (recursively).
+ */
+ void setNestedPlaceholder(boolean nestedPlaceholder);
+
/**
* Sets initial properties which will be added before any property locations are loaded.
*/
diff --git a/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java b/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java
index 9da5505251a..a41836deb51 100644
--- a/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java
+++ b/core/camel-base/src/generated/java/org/apache/camel/component/properties/PropertiesComponentConfigurer.java
@@ -41,6 +41,8 @@ public class PropertiesComponentConfigurer extends org.apache.camel.support.comp
case "Location": target.setLocation(property(camelContext, java.lang.String.class, value)); return true;
case "locations":
case "Locations": target.setLocations(property(camelContext, java.util.List.class, value)); return true;
+ case "nestedplaceholder":
+ case "NestedPlaceholder": target.setNestedPlaceholder(property(camelContext, boolean.class, value)); return true;
case "overrideproperties":
case "OverrideProperties": target.setOverrideProperties(property(camelContext, java.util.Properties.class, value)); return true;
case "propertiesfunctionresolver":
@@ -76,6 +78,8 @@ public class PropertiesComponentConfigurer extends org.apache.camel.support.comp
case "Location": return java.lang.String.class;
case "locations":
case "Locations": return java.util.List.class;
+ case "nestedplaceholder":
+ case "NestedPlaceholder": return boolean.class;
case "overrideproperties":
case "OverrideProperties": return java.util.Properties.class;
case "propertiesfunctionresolver":
@@ -112,6 +116,8 @@ public class PropertiesComponentConfigurer extends org.apache.camel.support.comp
case "Location": return target.getLocation();
case "locations":
case "Locations": return target.getLocations();
+ case "nestedplaceholder":
+ case "NestedPlaceholder": return target.isNestedPlaceholder();
case "overrideproperties":
case "OverrideProperties": return target.getOverrideProperties();
case "propertiesfunctionresolver":
diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
index aed9f3c6ebc..5f74bf043a3 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
@@ -62,9 +62,11 @@ public class DefaultPropertiesParser implements PropertiesParser {
@Override
public String parseUri(
- String text, PropertiesLookup properties, boolean defaultFallbackEnabled, boolean keepUnresolvedOptional)
+ String text, PropertiesLookup properties, boolean defaultFallbackEnabled, boolean keepUnresolvedOptional,
+ boolean nestedPlaceholder)
throws IllegalArgumentException {
- ParsingContext context = new ParsingContext(properties, defaultFallbackEnabled, keepUnresolvedOptional);
+ ParsingContext context
+ = new ParsingContext(properties, defaultFallbackEnabled, keepUnresolvedOptional, nestedPlaceholder);
String answer = context.parse(text);
if (keepUnresolvedOptional && answer != null && answer.contains(UNRESOLVED_PREFIX_TOKEN)) {
// replace temporary unresolved keys back to with placeholders so they are kept as-is
@@ -86,11 +88,14 @@ public class DefaultPropertiesParser implements PropertiesParser {
private final PropertiesLookup properties;
private final boolean defaultFallbackEnabled;
private final boolean keepUnresolvedOptional;
+ private final boolean nestedPlaceholder;
- ParsingContext(PropertiesLookup properties, boolean defaultFallbackEnabled, boolean keepUnresolvedOptional) {
+ ParsingContext(PropertiesLookup properties, boolean defaultFallbackEnabled, boolean keepUnresolvedOptional,
+ boolean nestedPlaceholder) {
this.properties = properties;
this.defaultFallbackEnabled = defaultFallbackEnabled;
this.keepUnresolvedOptional = keepUnresolvedOptional;
+ this.nestedPlaceholder = nestedPlaceholder;
}
/**
@@ -100,7 +105,38 @@ public class DefaultPropertiesParser implements PropertiesParser {
* @return Evaluated string
*/
public String parse(String input) {
- return doParse(input, new HashSet<String>());
+ if (nestedPlaceholder) {
+ return doParseNested(input, new HashSet<String>());
+ } else {
+ return doParse(input);
+ }
+ }
+
+ /**
+ * Parses the given input string and replaces all properties (not nested)
+ *
+ * @param input Input string
+ * @return Evaluated string
+ */
+ private String doParse(String input) {
+ if (input == null) {
+ return null;
+ }
+
+ StringBuilder answer = new StringBuilder();
+ Property property;
+ while ((property = readProperty(input)) != null) {
+ String before = input.substring(0, property.getBeginIndex());
+ String after = input.substring(property.getEndIndex());
+ String parsed = property.getValue();
+ if (parsed != null) {
+ answer.append(before);
+ answer.append(parsed);
+ }
+ input = after;
+ }
+ answer.append(input);
+ return answer.toString();
}
/**
@@ -110,7 +146,7 @@ public class DefaultPropertiesParser implements PropertiesParser {
* @param replacedPropertyKeys Already replaced property keys used for tracking circular references
* @return Evaluated string
*/
- private String doParse(String input, Set<String> replacedPropertyKeys) {
+ private String doParseNested(String input, Set<String> replacedPropertyKeys) {
if (input == null) {
return null;
}
@@ -133,7 +169,7 @@ public class DefaultPropertiesParser implements PropertiesParser {
String before = answer.substring(0, property.getBeginIndex());
String after = answer.substring(property.getEndIndex());
- String parsed = doParse(property.getValue(), newReplaced);
+ String parsed = doParseNested(property.getValue(), newReplaced);
if (parsed != null) {
answer = before + parsed + after;
} else {
diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index d7e53a0fed2..da06caa6b2e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -114,6 +114,7 @@ public class PropertiesComponent extends ServiceSupport
private List<PropertiesLocation> locations = new ArrayList<>();
private String location;
private boolean ignoreMissingLocation;
+ private boolean nestedPlaceholder = true;
private String encoding;
private boolean defaultFallbackEnabled = true;
private Properties initialProperties;
@@ -310,7 +311,8 @@ public class PropertiesComponent extends ServiceSupport
key = PREFIX_TOKEN + key.substring(NEGATE_PREFIX.length());
}
- String answer = propertiesParser.parseUri(key, properties, defaultFallbackEnabled, keepUnresolvedOptional);
+ String answer
+ = propertiesParser.parseUri(key, properties, defaultFallbackEnabled, keepUnresolvedOptional, nestedPlaceholder);
if (negate) {
if ("true".equalsIgnoreCase(answer)) {
answer = "false";
@@ -461,6 +463,20 @@ public class PropertiesComponent extends ServiceSupport
this.ignoreMissingLocation = ignoreMissingLocation;
}
+ @ManagedAttribute(description = "Nested placeholder")
+ public boolean isNestedPlaceholder() {
+ return nestedPlaceholder;
+ }
+
+ /**
+ * Whether to support nested property placeholders. A nested placeholder, means that a placeholder, has also a
+ * placeholder, that should be resolved (recursively).
+ */
+ @Override
+ public void setNestedPlaceholder(boolean nestedPlaceholder) {
+ this.nestedPlaceholder = nestedPlaceholder;
+ }
+
/**
* @return a list of properties which will be used before any locations are resolved (can't be null).
*/
diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
index d2516403275..cb9f1cd67f0 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
@@ -28,10 +28,15 @@ public interface PropertiesParser {
* @param properties the properties resolved which values should be looked up
* @param fallback whether to support using fallback values if a property cannot be found
* @param keepUnresolvedOptional whether to keep placeholders that are optional and was unresolved
+ * @param nestedPlaceholder whether to support nested property placeholders. A nested placeholder, means
+ * that a placeholder, has also a placeholder, that should be resolved
+ * (recursively).
* @return the parsed text with replaced placeholders
* @throws IllegalArgumentException if uri syntax is not valid or a property is not found
*/
- String parseUri(String text, PropertiesLookup properties, boolean fallback, boolean keepUnresolvedOptional)
+ String parseUri(
+ String text, PropertiesLookup properties, boolean fallback, boolean keepUnresolvedOptional,
+ boolean nestedPlaceholder)
throws IllegalArgumentException;
/**
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestedFalseTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestedFalseTest.java
new file mode 100644
index 00000000000..4e5ca7b194a
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestedFalseTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package org.apache.camel.component.properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Test;
+
+public class PropertiesComponentNestedFalseTest extends ContextTestSupport {
+
+ @Test
+ public void testNestedFalse() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("mock:{{cool.result}}");
+ getMockEndpoint("mock:result").expectedHeaderReceived("foo", "Hello mock:{{cool.result}} and Cheese how are you?");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .setBody().constant("{{cool.concat}}")
+ .setHeader("foo").constant("Hello {{cool.concat}} and {{cool.other.name}} how are you?")
+ .to("mock:result");
+ }
+ };
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.getPropertiesComponent().setLocation("classpath:org/apache/camel/component/properties/myproperties.properties");
+ context.getPropertiesComponent().setNestedPlaceholder(false);
+ return context;
+ }
+
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestedTest.java
new file mode 100644
index 00000000000..a1e6a5613fe
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestedTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package org.apache.camel.component.properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Test;
+
+public class PropertiesComponentNestedTest extends ContextTestSupport {
+
+ @Test
+ public void testNested() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("mock:result");
+ getMockEndpoint("mock:result").expectedHeaderReceived("foo", "Hello mock:result and Cheese how are you?");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .setBody().constant("{{cool.concat}}")
+ .setHeader("foo").constant("Hello {{cool.concat}} and {{cool.other.name}} how are you?")
+ .to("mock:result");
+ }
+ };
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.getPropertiesComponent().setLocation("classpath:org/apache/camel/component/properties/myproperties.properties");
+ return context;
+ }
+
+}
[camel] 04/06: CAMEL-18600: properties component - Allow to turn off nested placeholders
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2321dddade17bff1583703b583d93c9890baf9c3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Oct 11 11:07:09 2022 +0200
CAMEL-18600: properties component - Allow to turn off nested placeholders
---
core/camel-base/src/main/docs/properties-component.adoc | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/camel-base/src/main/docs/properties-component.adoc b/core/camel-base/src/main/docs/properties-component.adoc
index c458295699e..e1b0d58357d 100644
--- a/core/camel-base/src/main/docs/properties-component.adoc
+++ b/core/camel-base/src/main/docs/properties-component.adoc
@@ -140,6 +140,7 @@ The option is a java.util.Properties type. | | String
| *camel.component.properties.location* | A list of locations to load properties.
You can use comma to separate multiple locations.
This option will override any default locations and only use the locations from this option. | | String
+| *camel.component.properties.nested-placeholder* | Whether to support nested property placeholders. A nested placeholder, means that a placeholder, has also a placeholder, that should be resolved (recursively). | false | Boolean
| *camel.component.properties.override-properties* | Sets a special list of override properties that take precedence and will use first, if a property exist.
The option is a java.util.Properties type. | | String
| *camel.component.properties.properties-parser* | To use a custom PropertiesParser.
[camel] 06/06: Polished docs: fixed grammar and wording issues (#8507)
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c488049f90e69653ca19b631bff7eb80e54b40cb
Author: Elena Sadler <36...@users.noreply.github.com>
AuthorDate: Tue Oct 11 04:14:12 2022 -0500
Polished docs: fixed grammar and wording issues (#8507)
* Polished docs: fixed grammar and wording issues
* Added more concise wording
---
.../modules/ROOT/pages/getting-started.adoc | 33 ++++++++++------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/getting-started.adoc b/docs/user-manual/modules/ROOT/pages/getting-started.adoc
index c8e421d399a..61e9ea578e7 100644
--- a/docs/user-manual/modules/ROOT/pages/getting-started.adoc
+++ b/docs/user-manual/modules/ROOT/pages/getting-started.adoc
@@ -1,31 +1,30 @@
= Getting Started
-You can get started with Apache Camel using different ways, such as:
+You can get started with Apache Camel in a variety of ways, such as:
- Using online Project generators
- Using the Camel CLI (command line)
- Using Camel Karavan (visual UI Camel designer)
-And these approaches requires more knowledge to perform:
+And some more alternative methods:
- Adding Camel to an existing project
- Using IDE tooling wizards
- Using Maven Archetypes
-- Copy an existing Camel example and modify
+- Cloning an existing example to modify
== Using online Project generators
-You can use https://kameleon.dev/#/standalone[Camel Kameleon] which is Camels own
+You can use https://kameleon.dev/#/standalone[Camel Kameleon] which is Camel's own
online project generator. This generator is Camel focused only, which is recommended
-for most users to Camel.
+for most Camel users.
You can also use https://start.spring.io/[Spring Boot Initializer] which is the Spring Boot
-generator that also has Camel support. However, this generator does not allow users
-to fine-grained choose which Camel components, data formats, kamelets etc. to use.
+generator that also has Camel support. However, this generator does not allow users to have fine-grained control over which components, data formats, kamelets etc. they can use.
-And there is https://code.quarkus.io/[Code with Quarkus] which is the Quarkus
-generator that have great Camel support.
+And there is https://code.quarkus.io/[Code with Quarkus], the Quarkus
+generator, which has great support with Camel.
== Getting Started from command line (CLI)
@@ -87,20 +86,19 @@ You can run in live coding mode, as shown:
camel run hello.java --dev
----
-And then you can do source updates to `hello.java` and when the file is saved,
-Camel will automatically do live updates.
+While in live coding mode, whenever you save changes to `hello.java`, Camel will automatically load the updated version.
*Step 5*
-Make sure to look at the xref:camel-jbang.adoc[Camel JBang] documentation, for more details on the powers
+Make sure to check out the xref:camel-jbang.adoc[Camel JBang] documentation, for more details on the powers
of the Camel CLI. You will also find information how you can _export_ what you have built
with the Camel CLI into a vanilla Camel Spring Boot or Camel Quarkus project.
== Getting started with Camel using Karavan
The https://github.com/apache/camel-karavan[Camel Karavan] is a toolkit for visually
-designing Camel integrations, and fully integrated with xref:camel-jbang.adoc[Camel JBang]
-to quickly try Camel while using the designer.
+designing Camel integrations, it is fully integrated with xref:camel-jbang.adoc[Camel JBang]
+which allows users to easily try Camel while using the designer.
== Alternative ways of getting started with Camel
@@ -119,9 +117,8 @@ Apache Camel via Spring Boot Initializer or Code with Quarkus.
Apache Camel comes with a set of xref:camel-maven-archetypes.adoc[Camel Maven Archetypes],
you can use to create a new Camel project.
-=== Copy an existing example
+=== Cloning an existing example to modify
-You can find an existing example which are hosted on github,
-such as https://github.com/apache/camel-spring-boot-examples[Camel Spring Boot examples]
-where you can find an example and copy, and then modify.
+There are tons of Camel examples hosted on Github that you can clone and modify,
+such as https://github.com/apache/camel-spring-boot-examples[Camel Spring Boot examples].
[camel] 03/06: Sync deps
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0b5228797fb8c8dd6864021c0244bdaa67915005
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Oct 11 11:02:56 2022 +0200
Sync deps
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 22e7e9ba579..99d29d58d6a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -523,7 +523,7 @@
<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>
- <testcontainers-version>1.17.4</testcontainers-version>
+ <testcontainers-version>1.17.5</testcontainers-version>
<tika-version>2.5.0</tika-version>
<trimStackTrace>false</trimStackTrace>
<twilio-version>7.55.3</twilio-version>
[camel] 05/06: CAMEL-18600: properties component - Allow to turn off nested placeholders
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c67673e9d71d39e4bbb1bf9f5bd3bdb99c47036a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Oct 11 11:08:31 2022 +0200
CAMEL-18600: properties component - Allow to turn off nested placeholders
---
core/camel-base/src/main/docs/properties-component.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/camel-base/src/main/docs/properties-component.adoc b/core/camel-base/src/main/docs/properties-component.adoc
index e1b0d58357d..928b5461454 100644
--- a/core/camel-base/src/main/docs/properties-component.adoc
+++ b/core/camel-base/src/main/docs/properties-component.adoc
@@ -120,9 +120,9 @@ For fine grained configuration of the location, then this can be done as follows
----
-== Spring Boot Auto-Configuration
+== Options
-The component supports 10 options, which are listed below.
+The component supports the following options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
[camel] 02/06: Upgrade TestContainers to version 1.17.5
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 87455105b694b48bb5f51202ab212e1ef298eddd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Oct 11 09:54:59 2022 +0200
Upgrade TestContainers to version 1.17.5
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ad9f7e1785f..56b262c46d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -511,7 +511,7 @@
<stax-api-version>1.0.1</stax-api-version>
<stringtemplate-version>4.3.4</stringtemplate-version>
<templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
- <testcontainers-version>1.17.4</testcontainers-version>
+ <testcontainers-version>1.17.5</testcontainers-version>
<tika-version>2.5.0</tika-version>
<twilio-version>7.55.3</twilio-version>
<twitter4j-version>4.0.7</twitter4j-version>