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 <claus.ib...@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>
