This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-13870 by this push:
new 8c9bbee CAMEL-13870: Fast property configuration of Camel endpoints.
Work in progress.
8c9bbee is described below
commit 8c9bbee5acc0612682437e6be2f1be7fd4a9058e
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Aug 21 14:13:46 2019 +0200
CAMEL-13870: Fast property configuration of Camel endpoints. Work in
progress.
---
core/camel-core/pom.xml | 11 +++++------
.../apache/camel/builder/endpoint/FileConsumeCharsetTest.java | 2 +-
core/camel-endpointdsl/src/test/resources/log4j2.properties | 2 +-
core/camel-headersmap/pom.xml | 10 ----------
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index e686b7b..5472d82 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -46,12 +46,7 @@
<dependencies>
- <!-- camel annotations -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <optional>true</optional>
- </dependency>
+ <!-- camel optional annotations -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>meta-annotations</artifactId>
@@ -61,6 +56,10 @@
<!-- required dependencies by camel-core -->
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>spi-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-api</artifactId>
</dependency>
<dependency>
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
index ee65386..a33cdd5 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
@@ -55,7 +55,7 @@ public class FileConsumeCharsetTest extends
ContextTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new EndpointRouteBuilder() {
public void configure() throws Exception {
-
from(file("target/data/files/").initialDelay(0).delay(10).fileName(constant("report.txt")).delete(true).charset("UTF-8"))
+
from(file("target/data/files/").initialDelay(0).delay(10).fileName("report.txt").delete(true).charset("UTF-8"))
.convertBodyTo(String.class)
.to(mock("result"));
}
diff --git a/core/camel-endpointdsl/src/test/resources/log4j2.properties
b/core/camel-endpointdsl/src/test/resources/log4j2.properties
index a5b53e0..f7311bf 100644
--- a/core/camel-endpointdsl/src/test/resources/log4j2.properties
+++ b/core/camel-endpointdsl/src/test/resources/log4j2.properties
@@ -21,7 +21,7 @@ appender.console.layout.pattern = %d [%-15.15t] %-5p
%-30.30c{1} - %m%n
appender.file.type = File
appender.file.name = file
-appender.file.fileName = target/camel-core-test.log
+appender.file.fileName = target/camel-endpointdsl-test.log
appender.file.append = true
appender.file.layout.type = PatternLayout
appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
diff --git a/core/camel-headersmap/pom.xml b/core/camel-headersmap/pom.xml
index 3c0b821..3852bbd 100644
--- a/core/camel-headersmap/pom.xml
+++ b/core/camel-headersmap/pom.xml
@@ -64,16 +64,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>meta-annotations</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
<scope>test</scope>
</dependency>
