This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 127108d Fixed wrong default in docs
127108d is described below
commit 127108d1005124b8d33651569780b08fa2b5d5b8
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Aug 7 16:24:50 2019 +0200
Fixed wrong default in docs
---
components/camel-properties/src/main/docs/properties-component.adoc | 2 +-
.../java/org/apache/camel/component/properties/PropertiesComponent.java | 2 +-
.../properties/springboot/PropertiesComponentConfiguration.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-properties/src/main/docs/properties-component.adoc
b/components/camel-properties/src/main/docs/properties-component.adoc
index 127edca..7cce039 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -31,7 +31,7 @@ The Properties component supports 12 options, which are
listed below.
| *initialProperties* (advanced) | Sets initial properties which will be used
before any locations are resolved. | | Properties
| *overrideProperties* (advanced) | Sets a special list of override properties
that take precedence and will use first, if a property exist. | | Properties
| *systemPropertiesMode* (common) | Sets the system property mode. The default
mode (override) is to use system properties if present, and override any
existing properties. | 2 | int
-| *environmentVariableMode* (common) | Sets the OS environment variables mode.
The default mode (override) is to use OS environment variables if present, and
override any existing properties. | 1 | int
+| *environmentVariableMode* (common) | Sets the OS environment variables mode.
The default mode (override) is to use OS environment variables if present, and
override any existing properties. | 2 | int
| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
|===
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index b6a2df5..5094e47 100644
---
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -120,7 +120,7 @@ public class PropertiesComponent extends DefaultComponent
implements org.apache.
private Properties overrideProperties;
@Metadata(defaultValue = "" + SYSTEM_PROPERTIES_MODE_OVERRIDE, enums =
"0,1,2")
private int systemPropertiesMode = SYSTEM_PROPERTIES_MODE_OVERRIDE;
- @Metadata(defaultValue = "" + SYSTEM_PROPERTIES_MODE_FALLBACK, enums =
"0,1,2")
+ @Metadata(defaultValue = "" + ENVIRONMENT_VARIABLES_MODE_OVERRIDE, enums =
"0,1,2")
private int environmentVariableMode = ENVIRONMENT_VARIABLES_MODE_OVERRIDE;
public PropertiesComponent() {
diff --git
a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
index ed5f9b1..606df5c 100644
---
a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
@@ -93,7 +93,7 @@ public class PropertiesComponentConfiguration
* use OS environment variables if present, and override any existing
* properties.
*/
- private Integer environmentVariableMode = 1;
+ private Integer environmentVariableMode = 2;
/**
* Whether the component should resolve property placeholders on itself
when
* starting. Only properties which are of String type can use property
