[camel] branch master updated: CAMEL-12717: Updated camel-dozer to 6.4.0 for dozer

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: CAMEL-12717: Updated camel-dozer to 6.4.0 for dozer

aldettinger
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new e7b4805  CAMEL-12717: Updated camel-dozer to 6.4.0 for dozer
e7b4805 is described below

commit e7b480534b92159ae75736d121252ff7d7f6eb52
Author: Gareth Healy <[hidden email]>
AuthorDate: Tue Aug 7 18:39:31 2018 +0100

    CAMEL-12717: Updated camel-dozer to 6.4.0 for dozer
---
 .../src/main/java/org/apache/camel/converter/dozer/MapperFactory.java | 4 ----
 parent/pom.xml                                                        | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
index f9f90f4..49b5424 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
@@ -77,10 +77,6 @@ public class MapperFactory {
 
     private void configureSettings() {
         System.setProperty(SettingsKeys.CLASS_LOADER_BEAN, DozerThreadContextClassLoader.class.getName());
-
-        // TODO: Remove next version, see:
-        // https://github.com/DozerMapper/dozer/issues/680
-        System.setProperty(SettingsKeys.USE_JAXB_MAPPING_ENGINE, Boolean.FALSE.toString());
     }
 
     private ELEngine createELEngine() {
diff --git a/parent/pom.xml b/parent/pom.xml
index b2567fc..702ed70 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,7 +185,7 @@
     <docker-java-version>3.0.14</docker-java-version>
     <docker-java-bundle-version>3.0.14_1</docker-java-bundle-version>
     <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
-    <dozer-version>6.3.0</dozer-version>
+    <dozer-version>6.4.0</dozer-version>
     <drools-version>7.3.0.Final</drools-version>
     <dropbox-version>3.0.8</dropbox-version>
     <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>