This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.21.x by this push:
new f20f3d9 CAMEL-12493:make type converters and its required
dependencies optional
f20f3d9 is described below
commit f20f3d97befb186e1dbef6c5b89bf6c38f534008
Author: Christian Ohr <christian....@gmail.com>
AuthorDate: Mon May 14 08:59:42 2018 +0200
CAMEL-12493:make type converters and its required dependencies optional
---
components/camel-hl7/pom.xml | 10 ++++++++--
.../java/org/apache/camel/component/hl7/HL721Converter.java | 2 +-
.../java/org/apache/camel/component/hl7/HL722Converter.java | 2 +-
.../java/org/apache/camel/component/hl7/HL7231Converter.java | 2 +-
.../java/org/apache/camel/component/hl7/HL723Converter.java | 2 +-
.../java/org/apache/camel/component/hl7/HL724Converter.java | 2 +-
.../java/org/apache/camel/component/hl7/HL7251Converter.java | 2 +-
.../java/org/apache/camel/component/hl7/HL725Converter.java | 2 +-
.../java/org/apache/camel/component/hl7/HL726Converter.java | 2 +-
9 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index c9507fc..fa5a264 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -57,42 +57,49 @@
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v21</artifactId>
<version>${hapi-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v22</artifactId>
<version>${hapi-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v23</artifactId>
<version>${hapi-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v231</artifactId>
<version>${hapi-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v24</artifactId>
<version>${hapi-version}</version>
-
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v25</artifactId>
<version>${hapi-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v251</artifactId>
<version>${hapi-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v26</artifactId>
<version>${hapi-version}</version>
+ <optional>true</optional>
</dependency>
<!-- for MLLP either use mina2 or camel-netty4 -->
@@ -101,7 +108,6 @@
<artifactId>mina-core</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty4</artifactId>
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
index 582543d..6f1dae8 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL721Converter.java
@@ -80,7 +80,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL721Converter {
private static final HapiContext DEFAULT_CONTEXT;
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java
index 926ac17..767d7eb 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL722Converter.java
@@ -111,7 +111,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL722Converter {
private static final HapiContext DEFAULT_CONTEXT;
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java
index fb01f47..a14b38b 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7231Converter.java
@@ -212,7 +212,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL7231Converter {
private static final HapiContext DEFAULT_CONTEXT;
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java
index 918065c..d7e31c5 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL723Converter.java
@@ -275,7 +275,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL723Converter {
private static final HapiContext DEFAULT_CONTEXT;
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java
index b914b67..5046635 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL724Converter.java
@@ -217,7 +217,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL724Converter {
private static final HapiContext DEFAULT_CONTEXT;
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java
index ce89a64..6150721 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7251Converter.java
@@ -239,7 +239,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL7251Converter {
private static final HapiContext DEFAULT_CONTEXT;
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java
index 8efb350..58648fd 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL725Converter.java
@@ -239,7 +239,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL725Converter {
private static final HapiContext DEFAULT_CONTEXT;
diff --git
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java
index 58fadc3..2b6b242 100644
---
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java
+++
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL726Converter.java
@@ -254,7 +254,7 @@ import org.apache.camel.converter.IOConverter;
/**
* HL7 converters.
*/
-@Converter
+@Converter(ignoreOnLoadError = true)
public final class HL726Converter {
private static final HapiContext DEFAULT_CONTEXT;
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
