[
https://issues.apache.org/jira/browse/CAMEL-12693?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16560377#comment-16560377
]
ASF GitHub Bot commented on CAMEL-12693:
----------------------------------------
onderson closed pull request #2441: [CAMEL-12693] Upgraded camel-dozer to dozer
v6.3.0
URL: https://github.com/apache/camel/pull/2441
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java
index 0bdd51fb48b..73b9bb25807 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.dozer;
-import org.dozer.ConfigurableCustomConverter;
+import com.github.dozermapper.core.ConfigurableCustomConverter;
/**
* Configurable converters in Dozer are not thread-safe if a single converter
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerConfiguration.java
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerConfiguration.java
index 4f13be54ea1..e00eff5006f 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerConfiguration.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerConfiguration.java
@@ -22,7 +22,7 @@
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-import static org.dozer.util.DozerConstants.DEFAULT_MAPPING_FILE;
+import static
com.github.dozermapper.core.util.DozerConstants.DEFAULT_MAPPING_FILE;
/**
* Configuration used for a Dozer endpoint.
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
index b3ac42b5a51..0ca6dcb5f21 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
@@ -31,8 +31,8 @@
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ResourceHelper;
-import org.dozer.CustomConverter;
-import org.dozer.Mapper;
+import com.github.dozermapper.core.CustomConverter;
+import com.github.dozermapper.core.Mapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerBeanMapperConfiguration.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerBeanMapperConfiguration.java
index e20fa4f12c6..81dac5dd6c3 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerBeanMapperConfiguration.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerBeanMapperConfiguration.java
@@ -19,16 +19,16 @@
import java.util.List;
import java.util.Map;
-import org.dozer.CustomConverter;
-import org.dozer.CustomFieldMapper;
-import org.dozer.DozerEventListener;
-import org.dozer.loader.api.BeanMappingBuilder;
+import com.github.dozermapper.core.CustomConverter;
+import com.github.dozermapper.core.CustomFieldMapper;
+import com.github.dozermapper.core.events.EventListener;
+import com.github.dozermapper.core.loader.api.BeanMappingBuilder;
public class DozerBeanMapperConfiguration {
private List<String> mappingFiles;
private List<CustomConverter> customConverters;
- private List<DozerEventListener> eventListeners;
+ private List<EventListener> eventListeners;
private Map<String, CustomConverter> customConvertersWithId;
private CustomFieldMapper customFieldMapper;
private List<BeanMappingBuilder> beanMappingBuilders;
@@ -49,11 +49,11 @@ public void setCustomConverters(List<CustomConverter>
customConverters) {
this.customConverters = customConverters;
}
- public List<DozerEventListener> getEventListeners() {
+ public List<EventListener> getEventListeners() {
return eventListeners;
}
- public void setEventListeners(List<DozerEventListener> eventListeners) {
+ public void setEventListeners(List<EventListener> eventListeners) {
this.eventListeners = eventListeners;
}
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
index 8d1d4829afe..5c95911a154 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerThreadContextClassLoader.java
@@ -21,8 +21,8 @@
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
-import org.dozer.util.DozerClassLoader;
-import org.dozer.util.MappingUtils;
+import com.github.dozermapper.core.util.DozerClassLoader;
+import com.github.dozermapper.core.util.MappingUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
index 19e5e20c998..63a50bbbf83 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverter.java
@@ -21,8 +21,8 @@
import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverter;
import org.apache.camel.support.TypeConverterSupport;
-import org.dozer.Mapper;
-import org.dozer.metadata.ClassMappingMetadata;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.metadata.ClassMappingMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
index 11920168a4b..0a8fa130c0c 100644
---
a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
+++
b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
@@ -30,14 +30,14 @@
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
-import org.dozer.Mapper;
-import org.dozer.metadata.ClassMappingMetadata;
-import org.dozer.metadata.MappingMetadata;
-import org.dozer.util.DozerClassLoader;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.metadata.ClassMappingMetadata;
+import com.github.dozermapper.core.metadata.MappingMetadata;
+import com.github.dozermapper.core.util.DozerClassLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.dozer.classmap.MappingDirection.ONE_WAY;
+import static com.github.dozermapper.core.classmap.MappingDirection.ONE_WAY;
/**
* <code>DozerTypeConverterLoader</code> provides the mechanism for registering
@@ -239,7 +239,7 @@ public CamelContext getCamelContext() {
/**
* Sets the {@link CamelContext} <b>and also</b> initializes this loader.
* <p/>
- * The reason why {@link #init(org.apache.camel.CamelContext,
org.dozer.Mapper)} is also called
+ * The reason why {@link #init(org.apache.camel.CamelContext,
com.github.dozermapper.core.Mapper)} is also called
* is because making using Dozer in Spring XML files easier, as no need to
use the init-method attribute.
*
* @param camelContext the CamelContext
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 4886b3ca822..3149654fea0 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
@@ -18,15 +18,15 @@
import org.apache.camel.CamelContext;
import org.apache.camel.component.dozer.DozerEndpoint;
-import org.dozer.DozerBeanMapperBuilder;
-import org.dozer.Mapper;
-import org.dozer.config.SettingsKeys;
-import org.dozer.el.DefaultELEngine;
-import org.dozer.el.ELEngine;
-import org.dozer.el.ELExpressionFactory;
-import org.dozer.el.NoopELEngine;
-import org.dozer.el.TcclELEngine;
-import org.dozer.util.RuntimeUtils;
+import com.github.dozermapper.core.DozerBeanMapperBuilder;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.config.SettingsKeys;
+import com.github.dozermapper.core.el.DefaultELEngine;
+import com.github.dozermapper.core.el.ELEngine;
+import com.github.dozermapper.core.el.ELExpressionFactory;
+import com.github.dozermapper.core.el.NoopELEngine;
+import com.github.dozermapper.core.el.TcclELEngine;
+import com.github.dozermapper.core.util.RuntimeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,6 +75,10 @@ private Mapper
parseConfiguration(DozerBeanMapperConfiguration configuration) {
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/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java
index 1147bbb95ab..93925b39d35 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTestArtifactsFactory.java
@@ -23,7 +23,7 @@
import org.apache.camel.converter.dozer.dto.CustomerDTO;
import org.apache.camel.converter.dozer.model.Address;
import org.apache.camel.converter.dozer.service.Customer;
-import org.dozer.Mapper;
+import com.github.dozermapper.core.Mapper;
public final class DozerTestArtifactsFactory {
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
index 6ec7a49fe2d..db4550dd61e 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
@@ -23,7 +23,7 @@
import org.apache.camel.converter.dozer.dto.CustomerDTO;
import org.apache.camel.converter.dozer.model.Customer;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.dozer.loader.api.BeanMappingBuilder;
+import com.github.dozermapper.core.loader.api.BeanMappingBuilder;
import org.junit.Test;
import static
org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createDtoCustomer;
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
index 89d14601480..2f0b05aef1b 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
@@ -22,7 +22,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.dozer.service.Customer;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.dozer.Mapper;
+import com.github.dozermapper.core.Mapper;
import org.junit.Test;
import static
org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createServiceCustomer;
diff --git
a/components/camel-dozer/src/test/resources/application-context-map-id.xml
b/components/camel-dozer/src/test/resources/application-context-map-id.xml
index bee16ffc670..53461d34310 100644
--- a/components/camel-dozer/src/test/resources/application-context-map-id.xml
+++ b/components/camel-dozer/src/test/resources/application-context-map-id.xml
@@ -46,6 +46,6 @@
<constructor-arg index="1" ref="mapConfig"/>
</bean>
- <bean id="mapper" class="org.dozer.Mapper" factory-bean="mapperFactory"
factory-method="create"/>
+ <bean id="mapper" class="com.github.dozermapper.core.Mapper"
factory-bean="mapperFactory" factory-method="create"/>
</beans>
diff --git a/components/camel-dozer/src/test/resources/application-context.xml
b/components/camel-dozer/src/test/resources/application-context.xml
index 51366fc7d0d..2d2eb299849 100644
--- a/components/camel-dozer/src/test/resources/application-context.xml
+++ b/components/camel-dozer/src/test/resources/application-context.xml
@@ -46,6 +46,6 @@
<constructor-arg index="1" ref="mapConfig"/>
</bean>
- <bean id="mapper" class="org.dozer.Mapper" factory-bean="mapperFactory"
factory-method="create"/>
+ <bean id="mapper" class="com.github.dozermapper.core.Mapper"
factory-bean="mapperFactory" factory-method="create"/>
</beans>
diff --git a/parent/pom.xml b/parent/pom.xml
index 811617f49b7..41ba696625b 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.2.0</dozer-version>
+ <dozer-version>6.3.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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Upgrade camel-dozer to dozer v6.3.0
> -----------------------------------
>
> Key: CAMEL-12693
> URL: https://issues.apache.org/jira/browse/CAMEL-12693
> Project: Camel
> Issue Type: Improvement
> Components: camel-dozer
> Affects Versions: 2.22.0
> Reporter: Gareth Healy
> Priority: Minor
> Fix For: 2.23.0
>
>
> Upgrade camel-dozer to dozer v6.3.0
> * [https://github.com/DozerMapper/dozer/releases/tag/6.3.0]
> Main change is package change to com.github.dozermapper.core
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
