You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/09/26 10:17:11 UTC
[camel] branch CAMEL-13947 updated (ca5648f -> 367b534)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ca5648f CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
new 24e29d6 CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
new 6f4e30c CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
new 94036c2 CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features
new 15753c7 CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
new 367b534 CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
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:
apache-camel/pom.xml | 10 -
apache-camel/src/main/descriptors/common-bin.xml | 2 -
bom/camel-bom/pom.xml | 10 -
components/camel-blueprint/pom.xml | 4 -
components/camel-jasypt/pom.xml | 8 +-
components/camel-microprofile-config/pom.xml | 3 +-
components/camel-properties/pom.xml | 49 -----
components/camel-spring-boot/pom.xml | 4 -
.../src/main/docs/spring-boot.adoc | 12 +-
.../PropertiesComponentAutoConfiguration.java | 2 +-
.../PropertiesComponentConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 1 +
components/camel-spring/pom.xml | 4 -
components/camel-test-junit5/pom.xml | 4 -
components/camel-test/pom.xml | 4 -
components/camel-zipkin/pom.xml | 4 -
.../apache/camel/zipkin/ServiceHostFunction.java} | 19 +-
.../apache/camel/zipkin/ServicePortFunction.java} | 17 +-
.../java/org/apache/camel/zipkin/ZipkinTracer.java | 10 +-
components/pom.xml | 1 -
components/readme.adoc | 4 +-
.../src/main/docs/properties-component.adoc | 15 --
.../AbstractLocationPropertiesSource.java | 0
.../properties/ClasspathPropertiesSource.java | 0
.../properties/DefaultPropertiesLookup.java | 0
.../properties/DefaultPropertiesParser.java | 0
.../properties/EnvPropertiesFunction.java | 0
.../component/properties/FilePropertiesSource.java | 0
.../properties/LocationPropertiesSource.java | 0
.../component/properties/PropertiesComponent.java | 0
.../component/properties/PropertiesFunction.java | 0
.../component/properties/PropertiesLocation.java | 0
.../component/properties/PropertiesLookup.java | 0
.../component/properties/PropertiesParser.java | 0
.../component/properties/RefPropertiesSource.java | 0
.../properties/ServiceHostPropertiesFunction.java | 0
.../properties/ServicePortPropertiesFunction.java | 0
.../properties/ServicePropertiesFunction.java | 0
.../properties/SysPropertiesFunction.java | 0
.../apache/camel/component/properties/package.html | 0
.../engine/PropertiesComponentFactoryResolver.java | 6 +-
.../org/apache/camel/properties-component-factory | 0
core/camel-core-engine/pom.xml | 6 -
core/camel-core/pom.xml | 4 -
core/camel-main/pom.xml | 5 -
docs/components/modules/ROOT/nav.adoc | 1 -
.../components/modules/ROOT/pages/spring-boot.adoc | 12 +-
.../ROOT/pages/camel-3-migration-guide.adoc | 6 +-
.../modules/ROOT/pages/properties-component.adoc | 17 +-
parent/pom.xml | 10 -
.../karaf/features/src/main/resources/features.xml | 1 -
.../camel-properties-starter/pom.xml | 53 ------
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
.../src/main/resources/META-INF/spring.factories | 19 --
.../src/main/resources/META-INF/spring.provides | 17 --
platforms/spring-boot/components-starter/pom.xml | 1 -
.../camel-spring-boot-dependencies/pom.xml | 10 -
58 files changed, 51 insertions(+), 520 deletions(-)
delete mode 100644 components/camel-properties/pom.xml
rename {platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot => components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties}/PropertiesComponentAutoConfiguration.java (98%)
rename {platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot => components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties}/PropertiesComponentConfiguration.java (98%)
copy components/{camel-properties/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java => camel-zipkin/src/main/java/org/apache/camel/zipkin/ServiceHostFunction.java} (84%)
copy components/{camel-properties/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java => camel-zipkin/src/main/java/org/apache/camel/zipkin/ServicePortFunction.java} (82%)
rename {components/camel-properties => core/camel-base}/src/main/docs/properties-component.adoc (98%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesParser.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java (100%)
rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/package.html (100%)
rename {components/camel-properties => core/camel-base}/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory (100%)
rename docs/{components => user-manual}/modules/ROOT/pages/properties-component.adoc (98%)
delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/pom.xml
delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.factories
delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.provides
[camel] 01/05: CAMEL-13947: PropertiesComponent should be a static
service and resolved like other similar features.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 24e29d6def49a7e13e91d5129bef2d9d9f9d0276
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Sep 26 11:00:06 2019 +0200
CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
---
apache-camel/pom.xml | 10 -----
apache-camel/src/main/descriptors/common-bin.xml | 2 -
components/camel-properties/pom.xml | 49 ----------------------
components/pom.xml | 1 -
.../src/main/docs/properties-component.adoc | 0
.../AbstractLocationPropertiesSource.java | 0
.../properties/ClasspathPropertiesSource.java | 0
.../properties/DefaultPropertiesLookup.java | 0
.../properties/DefaultPropertiesParser.java | 0
.../properties/EnvPropertiesFunction.java | 0
.../component/properties/FilePropertiesSource.java | 0
.../properties/LocationPropertiesSource.java | 0
.../component/properties/PropertiesComponent.java | 0
.../component/properties/PropertiesFunction.java | 0
.../component/properties/PropertiesLocation.java | 0
.../component/properties/PropertiesLookup.java | 0
.../component/properties/PropertiesParser.java | 0
.../component/properties/RefPropertiesSource.java | 0
.../properties/ServiceHostPropertiesFunction.java | 0
.../properties/ServicePortPropertiesFunction.java | 0
.../properties/ServicePropertiesFunction.java | 0
.../properties/SysPropertiesFunction.java | 0
.../apache/camel/component/properties/package.html | 0
.../org/apache/camel/properties-component-factory | 0
24 files changed, 62 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 9ac79f8..f0279da 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1153,11 +1153,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2677,11 +2672,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index adb73c0..6438386 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -251,7 +251,6 @@
<include>org.apache.camel:camel-pg-replication-slot</include>
<include>org.apache.camel:camel-pgevent</include>
<include>org.apache.camel:camel-printer</include>
- <include>org.apache.camel:camel-properties</include>
<include>org.apache.camel:camel-protobuf</include>
<include>org.apache.camel:camel-pubnub</include>
<include>org.apache.camel:camel-pulsar</include>
@@ -595,7 +594,6 @@
<include>org.apache.camel:camel-pg-replication-slot-starter</include>
<include>org.apache.camel:camel-pgevent-starter</include>
<include>org.apache.camel:camel-printer-starter</include>
- <include>org.apache.camel:camel-properties-starter</include>
<include>org.apache.camel:camel-protobuf-starter</include>
<include>org.apache.camel:camel-pubnub-starter</include>
<include>org.apache.camel:camel-pulsar-starter</include>
diff --git a/components/camel-properties/pom.xml b/components/camel-properties/pom.xml
deleted file mode 100644
index c9245c9..0000000
--- a/components/camel-properties/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-properties</artifactId>
- <packaging>jar</packaging>
-
- <name>Camel :: Properties</name>
- <description>Camel Properties component</description>
- <properties>
- <firstVersion>2.3.0</firstVersion>
- <label>core</label>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/components/pom.xml b/components/pom.xml
index 1a0d396..a4133d1 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -47,7 +47,6 @@
<module>camel-language</module>
<module>camel-log</module>
<module>camel-mock</module>
- <module>camel-properties</module>
<module>camel-ref</module>
<module>camel-rest</module>
<module>camel-seda</module>
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/core/camel-base/src/main/docs/properties-component.adoc
similarity index 100%
rename from components/camel-properties/src/main/docs/properties-component.adoc
rename to core/camel-base/src/main/docs/properties-component.adoc
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesParser.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/package.html b/core/camel-base/src/main/java/org/apache/camel/component/properties/package.html
similarity index 100%
rename from components/camel-properties/src/main/java/org/apache/camel/component/properties/package.html
rename to core/camel-base/src/main/java/org/apache/camel/component/properties/package.html
diff --git a/components/camel-properties/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory b/core/camel-base/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
similarity index 100%
rename from components/camel-properties/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
rename to core/camel-base/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
[camel] 04/05: CAMEL-13947: PropertiesComponent should be a static
service and resolved like other similar features.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 15753c7a938bf209fd52eeda6a66f35de5ee0c54
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Sep 26 11:17:18 2019 +0200
CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
---
docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
index e4e29ca..9365d5f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
@@ -43,7 +43,6 @@ We have also modularized many of the core components and moved them out of `came
- camel-language
- camel-log
- camel-mock
-- camel-properties
- camel-ref
- camel-rest
- camel-saga
@@ -93,6 +92,11 @@ The `properties` component has some advanced options removed: `propertyPrefix`,
The properties component will now use OS environment variables as preferred value. This means you can set an OS environment variable which will override any property values that has been set in property files, JVM system properties etc. You can configure this with the `environmentVariableMode` option on the properties component.
+The `properties` component no longer support using endpoints, such as `properties:myKey`. The properties component is now only a property placeholder service.
+You can therefore no longer lookup the properties component via `camelContext.getComponent("properties")`.
+Instead you can use `camelContext.getPropertiesComponent()`.
+
+
=== Removed components
We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz` and `camel-rxjava` components.
[camel] 03/05: CAMEL-13947: PropertiesComponent should be a static
service and resolved like other similar features
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94036c2d67c8c14bad6ad3293bc4ff949e1871c4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Sep 26 11:13:57 2019 +0200
CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features
---
bom/camel-bom/pom.xml | 10 ----------
components/camel-blueprint/pom.xml | 4 ----
components/camel-jasypt/pom.xml | 5 -----
components/camel-microprofile-config/pom.xml | 3 +--
components/camel-spring-boot/pom.xml | 4 ----
components/camel-spring/pom.xml | 4 ----
components/camel-test-junit5/pom.xml | 4 ----
components/camel-test/pom.xml | 4 ----
components/camel-zipkin/pom.xml | 4 ----
components/readme.adoc | 2 --
core/camel-base/src/main/docs/properties-component.adoc | 15 ---------------
parent/pom.xml | 10 ----------
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ----------
13 files changed, 1 insertion(+), 78 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 3a461ee..041167d 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2210,16 +2210,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index e2ae1f3..cf3b728 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -56,10 +56,6 @@
<artifactId>camel-bean</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index 84db56c..4eeab49 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -48,11 +48,6 @@
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>${jasypt-version}</version>
diff --git a/components/camel-microprofile-config/pom.xml b/components/camel-microprofile-config/pom.xml
index 793bd6a..e8bb0b7 100644
--- a/components/camel-microprofile-config/pom.xml
+++ b/components/camel-microprofile-config/pom.xml
@@ -40,10 +40,9 @@
<dependencies>
- <!-- extends the properties component -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
+ <artifactId>camel-support</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index ee22f30..c6f9a73 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -77,10 +77,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-main</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
<!-- JMX is enabled by default -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 5780b2a..415ef74 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -44,10 +44,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-main</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-test-junit5/pom.xml b/components/camel-test-junit5/pom.xml
index 9edc25b..7479fa1 100644
--- a/components/camel-test-junit5/pom.xml
+++ b/components/camel-test-junit5/pom.xml
@@ -102,10 +102,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-ref</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index e4f4fad..dacdc8e 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -100,10 +100,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-ref</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 64af195..05175bc 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -44,10 +44,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
<!-- to send to zipkin server -->
<dependency>
diff --git a/components/readme.adoc b/components/readme.adoc
index 659a63a..bcd84da 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1090,8 +1090,6 @@ Number of Miscellaneous Components: 36 in 36 JAR artifacts (0 deprecated)
| link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing
-| link:camel-properties/src/main/docs/properties.adoc[Properties] (camel-properties) | 2.3 | Camel Properties component
-
| link:camel-reactive-executor-vertx/src/main/docs/reactive-executor-vertx.adoc[Reactive Executor Vertx] (camel-reactive-executor-vertx) | 3.0 | Reactive Executor for camel-core using Vert X
| link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component
diff --git a/core/camel-base/src/main/docs/properties-component.adoc b/core/camel-base/src/main/docs/properties-component.adoc
index 3580100..49c7ae4 100644
--- a/core/camel-base/src/main/docs/properties-component.adoc
+++ b/core/camel-base/src/main/docs/properties-component.adoc
@@ -71,22 +71,8 @@ with the following path and query parameters:
|===
// endpoint options: END
-// spring-boot-auto-configure options: START
== Spring Boot Auto-Configuration
-When using Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
The component supports 10 options, which are listed below.
@@ -105,7 +91,6 @@ The component supports 10 options, which are listed below.
| *camel.component.properties.properties-parser* | To use a custom PropertiesParser. The option is a org.apache.camel.component.properties.PropertiesParser type. | | String
| *camel.component.properties.system-properties-mode* | Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use system properties if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer
|===
-// spring-boot-auto-configure options: END
[TIP]
**Resolving property from Java code** +
diff --git a/parent/pom.xml b/parent/pom.xml
index a4d8ae9..e4cf7ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1884,11 +1884,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
@@ -3428,11 +3423,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf-starter</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index ce8ceef..f4daa49 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2440,16 +2440,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
[camel] 05/05: CAMEL-13947: PropertiesComponent should be a static
service and resolved like other similar features.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 367b534f56efbb26b88a45866c908fad0b38f0f1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Sep 26 12:00:28 2019 +0200
CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
---
components/camel-jasypt/pom.xml | 3 +-
.../apache/camel/zipkin/ServiceHostFunction.java | 67 ++++++++++++++++++++++
.../apache/camel/zipkin/ServicePortFunction.java | 67 ++++++++++++++++++++++
.../java/org/apache/camel/zipkin/ZipkinTracer.java | 10 ++--
components/readme.adoc | 2 +-
docs/components/modules/ROOT/nav.adoc | 1 -
.../components/modules/ROOT/pages/spring-boot.adoc | 12 +++-
.../modules/ROOT/pages/properties-component.adoc | 17 +-----
8 files changed, 153 insertions(+), 26 deletions(-)
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index 4eeab49..0ab2078 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -42,9 +42,10 @@
<dependencies>
+ <!-- extends properties component from camel-base -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
+ <artifactId>camel-base</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ServiceHostFunction.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ServiceHostFunction.java
new file mode 100644
index 0000000..ee71221
--- /dev/null
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ServiceHostFunction.java
@@ -0,0 +1,67 @@
+/*
+ * 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.zipkin;
+
+import java.util.Locale;
+
+import org.apache.camel.util.StringHelper;
+
+/**
+ * A function that lookup the property value from
+ * OS environment variables using the service idiom.
+ * <p/>
+ * A service is defined using two environment variables where name is name of the service:
+ * <ul>
+ * <li><tt>NAME_SERVICE_HOST</tt></li>
+ * <li><tt>NAME_SERVICE_PORT</tt></li>
+ * </ul>
+ * in other words the service uses <tt>_SERVICE_HOST</tt> and <tt>_SERVICE_PORT</tt> as prefix.
+ * <p/>
+ * This implementation is to return the host part only.
+ */
+public class ServiceHostFunction {
+
+ private static final String HOST_PREFIX = "_SERVICE_HOST";
+
+ public static String apply(String remainder) {
+ String key = remainder;
+ String defaultValue = null;
+
+ if (remainder.contains(":")) {
+ key = StringHelper.before(remainder, ":");
+ defaultValue = StringHelper.after(remainder, ":");
+ }
+
+ // make sure to use upper case
+ if (key != null) {
+ // make sure to use underscore as dash is not supported as ENV variables
+ key = key.toUpperCase(Locale.ENGLISH).replace('-', '_');
+
+ // a service should have both the host and port defined
+ String host = System.getenv(key + HOST_PREFIX);
+
+ if (host != null) {
+ return host;
+ } else {
+ return defaultValue;
+ }
+ }
+
+ return defaultValue;
+ }
+
+}
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ServicePortFunction.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ServicePortFunction.java
new file mode 100644
index 0000000..65ada3f
--- /dev/null
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ServicePortFunction.java
@@ -0,0 +1,67 @@
+/*
+ * 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.zipkin;
+
+import java.util.Locale;
+
+import org.apache.camel.util.StringHelper;
+
+/**
+ * A function that lookup the property value from
+ * OS environment variables using the service idiom.
+ * <p/>
+ * A service is defined using two environment variables where name is name of the service:
+ * <ul>
+ * <li><tt>NAME_SERVICE_HOST</tt></li>
+ * <li><tt>NAME_SERVICE_PORT</tt></li>
+ * </ul>
+ * in other words the service uses <tt>_SERVICE_HOST</tt> and <tt>_SERVICE_PORT</tt> as prefix.
+ * <p/>
+ * This implementation is to return the port part only.
+ */
+public class ServicePortFunction {
+
+ private static final String PORT_PREFIX = "_SERVICE_PORT";
+
+ public static String apply(String remainder) {
+ String key = remainder;
+ String defaultValue = null;
+
+ if (remainder.contains(":")) {
+ key = StringHelper.before(remainder, ":");
+ defaultValue = StringHelper.after(remainder, ":");
+ }
+
+ // make sure to use upper case
+ if (key != null) {
+ // make sure to use underscore as dash is not supported as ENV variables
+ key = key.toUpperCase(Locale.ENGLISH).replace('-', '_');
+
+ // a service should have both the host and port defined
+ String port = System.getenv(key + PORT_PREFIX);
+
+ if (port != null) {
+ return port;
+ } else {
+ return defaultValue;
+ }
+ }
+
+ return defaultValue;
+ }
+}
+
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
index eac9963..23495be 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java
@@ -47,8 +47,6 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.StaticService;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.component.properties.ServiceHostPropertiesFunction;
-import org.apache.camel.component.properties.ServicePortPropertiesFunction;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.ExchangeSendingEvent;
import org.apache.camel.spi.CamelEvent.ExchangeSentEvent;
@@ -400,16 +398,16 @@ public class ZipkinTracer extends ServiceSupport implements RoutePolicyFactory,
} else {
// is there a zipkin service setup as ENV variable to auto
// register a span reporter
- String host = new ServiceHostPropertiesFunction().apply(ZIPKIN_COLLECTOR_HTTP_SERVICE);
- String port = new ServicePortPropertiesFunction().apply(ZIPKIN_COLLECTOR_HTTP_SERVICE);
+ String host = ServiceHostFunction.apply(ZIPKIN_COLLECTOR_HTTP_SERVICE);
+ String port = ServicePortFunction.apply(ZIPKIN_COLLECTOR_HTTP_SERVICE);
if (ObjectHelper.isNotEmpty(host) && ObjectHelper.isNotEmpty(port)) {
LOG.info("Auto-configuring Zipkin URLConnectionSender using host: {} and port: {}", host, port);
int num = camelContext.getTypeConverter().mandatoryConvertTo(Integer.class, port);
String implicitEndpoint = "http://" + host + ":" + num + "/api/v2/spans";
spanReporter = AsyncReporter.create(URLConnectionSender.create(implicitEndpoint));
} else {
- host = new ServiceHostPropertiesFunction().apply(ZIPKIN_COLLECTOR_THRIFT_SERVICE);
- port = new ServicePortPropertiesFunction().apply(ZIPKIN_COLLECTOR_THRIFT_SERVICE);
+ host = ServiceHostFunction.apply(ZIPKIN_COLLECTOR_THRIFT_SERVICE);
+ port = ServicePortFunction.apply(ZIPKIN_COLLECTOR_THRIFT_SERVICE);
if (ObjectHelper.isNotEmpty(host) && ObjectHelper.isNotEmpty(port)) {
LOG.info("Auto-configuring Zipkin ScribeSpanCollector using host: {} and port: {}", host, port);
int num = camelContext.getTypeConverter().mandatoryConvertTo(Integer.class, port);
diff --git a/components/readme.adoc b/components/readme.adoc
index bcd84da..6afad73 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1062,7 +1062,7 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
== Miscellaneous Components
// others: START
-Number of Miscellaneous Components: 36 in 36 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 35 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 0a3ca76..63de0c6 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -273,7 +273,6 @@
* xref:pg-replication-slot-component.adoc[PostgresSQL Replication Slot Component]
* xref:pgevent-component.adoc[PostgresSQL Event Component]
* xref:lpr-component.adoc[Printer Component]
-* xref:properties-component.adoc[Properties Component]
* xref:protobuf-dataformat.adoc[Protobuf DataFormat]
* xref:pubnub-component.adoc[PubNub Component]
* xref:pulsar-component.adoc[Apache Pulsar Component]
diff --git a/docs/components/modules/ROOT/pages/spring-boot.adoc b/docs/components/modules/ROOT/pages/spring-boot.adoc
index 3ed2e85..e7660cf 100644
--- a/docs/components/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/components/modules/ROOT/pages/spring-boot.adoc
@@ -90,7 +90,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 129 options, which are listed below.
+The component supports 139 options, which are listed below.
@@ -124,6 +124,16 @@ The component supports 129 options, which are listed below.
| *camel.clustered.controller.namespace* | The default namespace. | | String
| *camel.clustered.controller.routes* | Routes configuration. | | Map
| *camel.component.enabled* | Global option to enable/disable component auto-configuration, default is true. | true | Boolean
+| *camel.component.properties.auto-discover-properties-sources* | Whether to automatically discovery instances of PropertiesSource from registry and service factory. | true | Boolean
+| *camel.component.properties.default-fallback-enabled* | If false, the component does not attempt to find a default for the key by looking after the colon separator. | true | Boolean
+| *camel.component.properties.encoding* | Encoding to use when loading properties file from the file system or classpath. If no encoding has been set, then the properties files is loaded using ISO-8859-1 encoding (latin-1) as documented by java.util.Properties#load(java.io.InputStream) | | String
+| *camel.component.properties.environment-variable-mode* | Sets the OS environment variables mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use OS environment variables if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer
+| *camel.component.properties.ignore-missing-location* | Whether to silently ignore if a location cannot be located, such as a properties file not found. | false | Boolean
+| *camel.component.properties.initial-properties* | Sets initial properties which will be used before any locations are resolved. 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.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. The option is a org.apache.camel.component.properties.PropertiesParser type. | | String
+| *camel.component.properties.system-properties-mode* | Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use system properties if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer
| *camel.dataformat.enabled* | Global option to enable/disable dataformat auto-configuration, default is true. | true | Boolean
| *camel.health.check.routes.enabled* | Global option to enable/disable Camel extended health check for routes, default is false. | false | Boolean
| *camel.health.check.routes.threshold* | General health check configurations. | | Map
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/user-manual/modules/ROOT/pages/properties-component.adoc
similarity index 98%
rename from docs/components/modules/ROOT/pages/properties-component.adoc
rename to docs/user-manual/modules/ROOT/pages/properties-component.adoc
index d160a2a..a8d1e68 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/user-manual/modules/ROOT/pages/properties-component.adoc
@@ -1,6 +1,6 @@
[[properties-component]]
= Properties Component
-:page-source: components/camel-properties/src/main/docs/properties-component.adoc
+:page-source: core/camel-base/src/main/docs/properties-component.adoc
*Available as of Camel version 2.3*
@@ -72,22 +72,8 @@ with the following path and query parameters:
|===
// endpoint options: END
-// spring-boot-auto-configure options: START
== Spring Boot Auto-Configuration
-When using Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
The component supports 10 options, which are listed below.
@@ -106,7 +92,6 @@ The component supports 10 options, which are listed below.
| *camel.component.properties.properties-parser* | To use a custom PropertiesParser. The option is a org.apache.camel.component.properties.PropertiesParser type. | | String
| *camel.component.properties.system-properties-mode* | Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use system properties if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer
|===
-// spring-boot-auto-configure options: END
[TIP]
**Resolving property from Java code** +
[camel] 02/05: CAMEL-13947: PropertiesComponent should be a static
service and resolved like other similar features.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6f4e30c703078c26a8a17005b455b98e6a7a6d2d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Sep 26 11:09:38 2019 +0200
CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.
---
.../src/main/docs/spring-boot.adoc | 12 +-
.../PropertiesComponentAutoConfiguration.java | 2 +-
.../PropertiesComponentConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 1 +
.../engine/PropertiesComponentFactoryResolver.java | 6 +-
core/camel-core-engine/pom.xml | 6 -
core/camel-core/pom.xml | 4 -
core/camel-main/pom.xml | 5 -
.../karaf/features/src/main/resources/features.xml | 1 -
.../camel-properties-starter/pom.xml | 53 ------
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
.../src/main/resources/META-INF/spring.factories | 19 --
.../src/main/resources/META-INF/spring.provides | 17 --
platforms/spring-boot/components-starter/pom.xml | 1 -
15 files changed, 17 insertions(+), 326 deletions(-)
diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
index 05fcc26..1f577e6 100644
--- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -89,7 +89,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 129 options, which are listed below.
+The component supports 139 options, which are listed below.
@@ -123,6 +123,16 @@ The component supports 129 options, which are listed below.
| *camel.clustered.controller.namespace* | The default namespace. | | String
| *camel.clustered.controller.routes* | Routes configuration. | | Map
| *camel.component.enabled* | Global option to enable/disable component auto-configuration, default is true. | true | Boolean
+| *camel.component.properties.auto-discover-properties-sources* | Whether to automatically discovery instances of PropertiesSource from registry and service factory. | true | Boolean
+| *camel.component.properties.default-fallback-enabled* | If false, the component does not attempt to find a default for the key by looking after the colon separator. | true | Boolean
+| *camel.component.properties.encoding* | Encoding to use when loading properties file from the file system or classpath. If no encoding has been set, then the properties files is loaded using ISO-8859-1 encoding (latin-1) as documented by java.util.Properties#load(java.io.InputStream) | | String
+| *camel.component.properties.environment-variable-mode* | Sets the OS environment variables mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use OS environment variables if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer
+| *camel.component.properties.ignore-missing-location* | Whether to silently ignore if a location cannot be located, such as a properties file not found. | false | Boolean
+| *camel.component.properties.initial-properties* | Sets initial properties which will be used before any locations are resolved. 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.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. The option is a org.apache.camel.component.properties.PropertiesParser type. | | String
+| *camel.component.properties.system-properties-mode* | Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use system properties if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | Integer
| *camel.dataformat.enabled* | Global option to enable/disable dataformat auto-configuration, default is true. | true | Boolean
| *camel.health.check.routes.enabled* | Global option to enable/disable Camel extended health check for routes, default is false. | false | Boolean
| *camel.health.check.routes.threshold* | General health check configurations. | | Map
diff --git a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
rename to components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
index c44f0cea..b547183 100644
--- a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.properties.springboot;
+package org.apache.camel.spring.boot.properties;
import java.util.Properties;
diff --git a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
rename to components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentConfiguration.java
index 905f716..0443fad 100644
--- a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.properties.springboot;
+package org.apache.camel.spring.boot.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/components/camel-spring-boot/src/main/resources/META-INF/spring.factories b/components/camel-spring-boot/src/main/resources/META-INF/spring.factories
index dff72b9..246e18f 100644
--- a/components/camel-spring-boot/src/main/resources/META-INF/spring.factories
+++ b/components/camel-spring-boot/src/main/resources/META-INF/spring.factories
@@ -44,5 +44,6 @@ org.apache.camel.spring.boot.cloud.CamelCloudServiceDiscoveryAutoConfiguration,\
org.apache.camel.spring.boot.cloud.CamelCloudServiceFilterAutoConfiguration,\
org.apache.camel.spring.boot.cloud.CamelCloudServiceChooserAutoConfiguration,\
org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration,\
+org.apache.camel.spring.boot.properties.PropertiesComponentAutoConfiguration,\
org.apache.camel.spring.boot.security.CamelSSLAutoConfiguration
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/PropertiesComponentFactoryResolver.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/PropertiesComponentFactoryResolver.java
index 1407e83..e9beb5b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/PropertiesComponentFactoryResolver.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/PropertiesComponentFactoryResolver.java
@@ -26,7 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Factory resolver to find the {@link org.apache.camel.spi.PropertiesComponent} from the classpath in camel-properties.
+ * Factory resolver to find the {@link org.apache.camel.spi.PropertiesComponent} from the classpath.
*/
public class PropertiesComponentFactoryResolver {
@@ -58,8 +58,8 @@ public class PropertiesComponentFactoryResolver {
}
}
- LOG.debug("Cannot find PropertiesComponent. Make sure camel-properties is on the classpath.");
- return null;
+ // use default component
+ return new org.apache.camel.component.properties.PropertiesComponent();
}
private Class<?> findFactory(String name, CamelContext context) throws IOException {
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index 0b07d17..6049201 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -89,12 +89,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
-
- <!-- uses the properties component -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
</dependencies>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 3fc9bcc..438feba 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -92,10 +92,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-ref</artifactId>
</dependency>
<dependency>
diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml
index 602cc81..9de0808 100644
--- a/core/camel-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -73,11 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-seda</artifactId>
<scope>test</scope>
</dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index df10f45..224b2da 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -71,7 +71,6 @@
<bundle>mvn:org.apache.camel/camel-language/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-log/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-mock/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-properties/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-ref/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-rest/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-saga/${project.version}</bundle>
diff --git a/platforms/spring-boot/components-starter/camel-properties-starter/pom.xml b/platforms/spring-boot/components-starter/camel-properties-starter/pom.xml
deleted file mode 100644
index ec4c640..0000000
--- a/platforms/spring-boot/components-starter/camel-properties-starter/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components-starter</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-properties-starter</artifactId>
- <packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: Properties</name>
- <description>Spring-Boot Starter for Camel Properties component</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-properties</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 454c1e3..0000000
--- a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,19 +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.
-## ---------------------------------------------------------------------------
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.properties.springboot.PropertiesComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index b85753c..0000000
--- a/platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1,17 +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.
-## ---------------------------------------------------------------------------
-provides: camel-properties
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 6e4ebb9..62f2002 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -298,7 +298,6 @@
<module>camel-pg-replication-slot-starter</module>
<module>camel-pgevent-starter</module>
<module>camel-printer-starter</module>
- <module>camel-properties-starter</module>
<module>camel-protobuf-starter</module>
<module>camel-pubnub-starter</module>
<module>camel-pulsar-starter</module>