This is an automated email from the ASF dual-hosted git repository.
kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new 5e48f9b OOZIE-3507 Upgrade to Dozer 6 (asalamon74 via kmarton)
5e48f9b is described below
commit 5e48f9b430f8d4d895d9c8a6a72a99bacc42142f
Author: kmarton <[email protected]>
AuthorDate: Tue Jun 11 12:32:25 2019 +0200
OOZIE-3507 Upgrade to Dozer 6 (asalamon74 via kmarton)
---
fluent-job/fluent-job-api/pom.xml | 4 ++--
.../oozie/fluentjob/api/mapping/BooleanToFLAGConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/BooleanToShellFLAGConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/BooleanToSshFLAGConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/CredentialsConverter.java | 2 +-
.../org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java | 6 +++---
.../oozie/fluentjob/api/mapping/DistcpConfigurationConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/DistcpPrepareConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/DozerBeanMapperSingleton.java | 8 +++-----
.../apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java | 6 +++---
.../org/apache/oozie/fluentjob/api/mapping/ForkConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/GitConfigurationConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/GitPrepareConverter.java | 2 +-
.../org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java | 6 +++---
.../fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java | 6 +++---
.../oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java | 6 +++---
.../oozie/fluentjob/api/mapping/Hive2ConfigurationConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/Hive2LauncherConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/Hive2PrepareConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/HiveConfigurationConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/HiveLauncherConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/HivePrepareConverter.java | 2 +-
.../api/mapping/InlineWorkflowConfigurationConverter.java | 2 +-
.../fluentjob/api/mapping/InlineWorkflowLauncherConverter.java | 2 +-
.../fluentjob/api/mapping/InlineWorkflowPrepareConverter.java | 2 +-
.../org/apache/oozie/fluentjob/api/mapping/JoinConverter.java | 2 +-
.../api/mapping/MapToConfigurationPropertyConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/ParametersConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/ShellConfigurationConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/ShellLauncherConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/ShellPrepareConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/SparkConfigurationConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/SparkLauncherConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/SparkPrepareConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/SqoopConfigurationConverter.java | 2 +-
.../oozie/fluentjob/api/mapping/SqoopLauncherConverter.java | 2 +-
.../apache/oozie/fluentjob/api/mapping/SqoopPrepareConverter.java | 2 +-
.../org/apache/oozie/fluentjob/api/mapping/StartConverter.java | 2 +-
fluent-job/fluent-job-api/src/main/resources/action_mappings.xml | 6 +++---
fluent-job/fluent-job-api/src/main/resources/dozer_config.xml | 6 +++---
.../src/main/resources/mappingGraphToWORKFLOWAPP.xml | 6 +++---
.../java/org/apache/oozie/fluentjob/api/mapping/TestMappings.java | 5 ++---
pom.xml | 6 +++---
release-log.txt | 1 +
44 files changed, 66 insertions(+), 68 deletions(-)
diff --git a/fluent-job/fluent-job-api/pom.xml
b/fluent-job/fluent-job-api/pom.xml
index 3912e03..97ccfbf 100644
--- a/fluent-job/fluent-job-api/pom.xml
+++ b/fluent-job/fluent-job-api/pom.xml
@@ -51,8 +51,8 @@
<artifactId>graphviz-java</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToFLAGConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToFLAGConverter.java
index 6431aa2..226b9f6 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToFLAGConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToFLAGConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.workflow.FLAG;
import org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Boolean} to JAXB {@link
FLAG}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToShellFLAGConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToShellFLAGConverter.java
index c6a6e8b..f83dc73 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToShellFLAGConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToShellFLAGConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.shell.FLAG;
import org.apache.oozie.fluentjob.api.generated.action.shell.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Boolean} to JAXB {@link
FLAG}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToSshFLAGConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToSshFLAGConverter.java
index 8ae417d..1eadb3d 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToSshFLAGConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/BooleanToSshFLAGConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.ssh.FLAG;
import org.apache.oozie.fluentjob.api.generated.action.ssh.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Boolean} to JAXB {@link
FLAG}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/CredentialsConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/CredentialsConverter.java
index df6a96b..86f9a3e 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/CredentialsConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/CredentialsConverter.java
@@ -24,7 +24,7 @@ import
org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
import org.apache.oozie.fluentjob.api.workflow.ConfigurationEntry;
import org.apache.oozie.fluentjob.api.workflow.Credential;
import org.apache.oozie.fluentjob.api.workflow.Credentials;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Credentials} to JAXB {@link
CREDENTIALS}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java
index c28f082..7523436 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DecisionConverter.java
@@ -28,9 +28,9 @@ import
org.apache.oozie.fluentjob.api.generated.workflow.SWITCH;
import org.apache.oozie.fluentjob.api.dag.DagNodeWithCondition;
import org.apache.oozie.fluentjob.api.dag.Decision;
import org.apache.oozie.fluentjob.api.dag.NodeBase;
-import org.dozer.DozerConverter;
-import org.dozer.Mapper;
-import org.dozer.MapperAware;
+import com.github.dozermapper.core.DozerConverter;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.MapperAware;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpConfigurationConverter.java
index 568c099..ea664c7 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.distcp.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.action.distcp.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpPrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpPrepareConverter.java
index 64a7b35..7949f41 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpPrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DistcpPrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.action.distcp.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DozerBeanMapperSingleton.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DozerBeanMapperSingleton.java
index a08bd0e..ba771b1 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DozerBeanMapperSingleton.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/DozerBeanMapperSingleton.java
@@ -18,7 +18,8 @@
package org.apache.oozie.fluentjob.api.mapping;
-import org.dozer.DozerBeanMapper;
+import com.github.dozermapper.core.DozerBeanMapper;
+import com.github.dozermapper.core.DozerBeanMapperBuilder;
import java.util.ArrayList;
import java.util.List;
@@ -30,14 +31,11 @@ public class DozerBeanMapperSingleton {
private static DozerBeanMapper mapper;
private static void init() {
- mapper = new DozerBeanMapper();
-
final List<String> mappingFiles = new ArrayList<>();
mappingFiles.add("dozer_config.xml");
mappingFiles.add("mappingGraphToWORKFLOWAPP.xml");
mappingFiles.add("action_mappings.xml");
-
- mapper.setMappingFiles(mappingFiles);
+ mapper =
(DozerBeanMapper)DozerBeanMapperBuilder.create().withMappingFiles(mappingFiles).build();
}
public static DozerBeanMapper instance() {
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java
index e5f8e07..a890def 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ExplicitNodeConverter.java
@@ -47,9 +47,9 @@ import org.apache.oozie.fluentjob.api.dag.DecisionJoin;
import org.apache.oozie.fluentjob.api.dag.ExplicitNode;
import org.apache.oozie.fluentjob.api.dag.NodeBase;
import org.apache.oozie.fluentjob.api.workflow.Credential;
-import org.dozer.DozerConverter;
-import org.dozer.Mapper;
-import org.dozer.MapperAware;
+import com.github.dozermapper.core.DozerConverter;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.MapperAware;
import com.google.common.base.Preconditions;
import javax.xml.bind.JAXBElement;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ForkConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ForkConverter.java
index 7ad6da9..13305d1 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ForkConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ForkConverter.java
@@ -23,7 +23,7 @@ import
org.apache.oozie.fluentjob.api.generated.workflow.FORKTRANSITION;
import org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
import org.apache.oozie.fluentjob.api.dag.Fork;
import org.apache.oozie.fluentjob.api.dag.NodeBase;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitConfigurationConverter.java
index a2f2f86..76f5bfd 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.git.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.action.git.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitPrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitPrepareConverter.java
index c6e270e..1842cb8 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitPrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GitPrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.action.git.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java
index 80e8e57..dae2655 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GlobalConverter.java
@@ -24,9 +24,9 @@ import
org.apache.oozie.fluentjob.api.generated.workflow.GLOBAL;
import org.apache.oozie.fluentjob.api.generated.workflow.LAUNCHER;
import org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
import org.apache.oozie.fluentjob.api.workflow.Global;
-import org.dozer.DozerConverter;
-import org.dozer.Mapper;
-import org.dozer.MapperAware;
+import com.github.dozermapper.core.DozerConverter;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.MapperAware;
/**
* A {@link DozerConverter} converting from {@link Global} to JAXB {@link
GLOBAL}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java
index 09b82cd..00f4c4f 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphNodesToWORKFLOWAPPConverter.java
@@ -42,9 +42,9 @@ import org.apache.oozie.fluentjob.api.dag.ExplicitNode;
import org.apache.oozie.fluentjob.api.dag.Fork;
import org.apache.oozie.fluentjob.api.dag.Join;
import org.apache.oozie.fluentjob.api.dag.NodeBase;
-import org.dozer.DozerConverter;
-import org.dozer.Mapper;
-import org.dozer.MapperAware;
+import com.github.dozermapper.core.DozerConverter;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.MapperAware;
import java.util.HashMap;
import java.util.Map;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java
index 5ed9412..b7d99df 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/GraphToWORKFLOWAPPConverter.java
@@ -21,9 +21,9 @@ package org.apache.oozie.fluentjob.api.mapping;
import com.google.common.base.Preconditions;
import org.apache.oozie.fluentjob.api.generated.workflow.WORKFLOWAPP;
import org.apache.oozie.fluentjob.api.dag.Graph;
-import org.dozer.DozerConverter;
-import org.dozer.Mapper;
-import org.dozer.MapperAware;
+import com.github.dozermapper.core.DozerConverter;
+import com.github.dozermapper.core.Mapper;
+import com.github.dozermapper.core.MapperAware;
/**
* A {@link DozerConverter} converting from {@link Graph} to JAXB {@link
WORKFLOWAPP}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2ConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2ConfigurationConverter.java
index 9ac343a..0ce0306 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2ConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2ConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.hive2.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.action.hive2.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2LauncherConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2LauncherConverter.java
index 34b11f8..809cb1a 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2LauncherConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2LauncherConverter.java
@@ -21,7 +21,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.hive2.LAUNCHER;
import org.apache.oozie.fluentjob.api.generated.action.hive2.ObjectFactory;
import org.apache.oozie.fluentjob.api.action.Launcher;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Launcher} to JAXB {@link
LAUNCHER}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2PrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2PrepareConverter.java
index 105f996..a9da6a3 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2PrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/Hive2PrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.action.hive2.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveConfigurationConverter.java
index 60f3654..05a768d 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.hive.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.action.hive.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveLauncherConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveLauncherConverter.java
index ad231f5..1aeaa59 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveLauncherConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HiveLauncherConverter.java
@@ -21,7 +21,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.hive.LAUNCHER;
import org.apache.oozie.fluentjob.api.generated.action.hive.ObjectFactory;
import org.apache.oozie.fluentjob.api.action.Launcher;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Launcher} to JAXB {@link
LAUNCHER}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HivePrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HivePrepareConverter.java
index 9b668d4..82ab438 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HivePrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/HivePrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.action.hive.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowConfigurationConverter.java
index 759dcdc..2d0aeeb 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.workflow.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowLauncherConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowLauncherConverter.java
index 8d32160..f4c0d7f 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowLauncherConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowLauncherConverter.java
@@ -21,7 +21,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.workflow.LAUNCHER;
import org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
import org.apache.oozie.fluentjob.api.action.Launcher;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Launcher} to JAXB {@link
LAUNCHER}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowPrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowPrepareConverter.java
index 5f2bf7b..8853dd3 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowPrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/InlineWorkflowPrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.workflow.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/JoinConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/JoinConverter.java
index e9495b6..6496ecb 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/JoinConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/JoinConverter.java
@@ -22,7 +22,7 @@ import org.apache.oozie.fluentjob.api.generated.workflow.JOIN;
import org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
import org.apache.oozie.fluentjob.api.dag.Join;
import org.apache.oozie.fluentjob.api.dag.NodeBase;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Join} to JAXB {@link JOIN}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/MapToConfigurationPropertyConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/MapToConfigurationPropertyConverter.java
index c86e066..26f5fca 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/MapToConfigurationPropertyConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/MapToConfigurationPropertyConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.workflow.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.Map;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ParametersConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ParametersConverter.java
index f3677e5..b93c367 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ParametersConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ParametersConverter.java
@@ -22,7 +22,7 @@ import
org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
import org.apache.oozie.fluentjob.api.generated.workflow.PARAMETERS;
import org.apache.oozie.fluentjob.api.workflow.Parameter;
import org.apache.oozie.fluentjob.api.workflow.Parameters;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Parameters} to JAXB {@link
PARAMETERS}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellConfigurationConverter.java
index 0d5eae3..16e861f 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.shell.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.action.shell.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellLauncherConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellLauncherConverter.java
index d933499..c5260d6 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellLauncherConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellLauncherConverter.java
@@ -21,7 +21,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.shell.LAUNCHER;
import org.apache.oozie.fluentjob.api.generated.action.shell.ObjectFactory;
import org.apache.oozie.fluentjob.api.action.Launcher;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Launcher} to JAXB {@link
LAUNCHER}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellPrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellPrepareConverter.java
index 30fcf7c..f00ac7a 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellPrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/ShellPrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.action.shell.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkConfigurationConverter.java
index 9976039..8424fe8 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.spark.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.action.spark.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkLauncherConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkLauncherConverter.java
index be7436a..51c7109 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkLauncherConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkLauncherConverter.java
@@ -21,7 +21,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.spark.LAUNCHER;
import org.apache.oozie.fluentjob.api.generated.action.spark.ObjectFactory;
import org.apache.oozie.fluentjob.api.action.Launcher;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Launcher} to JAXB {@link
LAUNCHER}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkPrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkPrepareConverter.java
index 812e53d..a02174e 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkPrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SparkPrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.action.spark.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopConfigurationConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopConfigurationConverter.java
index 05dcf12..d3741cc 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopConfigurationConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopConfigurationConverter.java
@@ -20,7 +20,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.sqoop.CONFIGURATION;
import org.apache.oozie.fluentjob.api.generated.action.sqoop.ObjectFactory;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopLauncherConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopLauncherConverter.java
index 556cb7b..ea6a65d 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopLauncherConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopLauncherConverter.java
@@ -21,7 +21,7 @@ package org.apache.oozie.fluentjob.api.mapping;
import org.apache.oozie.fluentjob.api.generated.action.sqoop.LAUNCHER;
import org.apache.oozie.fluentjob.api.generated.action.sqoop.ObjectFactory;
import org.apache.oozie.fluentjob.api.action.Launcher;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Launcher} to JAXB {@link
LAUNCHER}.
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopPrepareConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopPrepareConverter.java
index 5062c08..b3caa0b 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopPrepareConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/SqoopPrepareConverter.java
@@ -25,7 +25,7 @@ import
org.apache.oozie.fluentjob.api.generated.action.sqoop.PREPARE;
import org.apache.oozie.fluentjob.api.action.Delete;
import org.apache.oozie.fluentjob.api.action.Mkdir;
import org.apache.oozie.fluentjob.api.action.Prepare;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
import java.util.ArrayList;
import java.util.List;
diff --git
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/StartConverter.java
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/StartConverter.java
index fe4d55e..452dc52 100644
---
a/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/StartConverter.java
+++
b/fluent-job/fluent-job-api/src/main/java/org/apache/oozie/fluentjob/api/mapping/StartConverter.java
@@ -22,7 +22,7 @@ import
org.apache.oozie.fluentjob.api.generated.workflow.ObjectFactory;
import org.apache.oozie.fluentjob.api.generated.workflow.START;
import org.apache.oozie.fluentjob.api.dag.NodeBase;
import org.apache.oozie.fluentjob.api.dag.Start;
-import org.dozer.DozerConverter;
+import com.github.dozermapper.core.DozerConverter;
/**
* A {@link DozerConverter} converting from {@link Start} to JAXB {@link
START}.
diff --git a/fluent-job/fluent-job-api/src/main/resources/action_mappings.xml
b/fluent-job/fluent-job-api/src/main/resources/action_mappings.xml
index 8cf3a0f..3436dd9 100644
--- a/fluent-job/fluent-job-api/src/main/resources/action_mappings.xml
+++ b/fluent-job/fluent-job-api/src/main/resources/action_mappings.xml
@@ -18,10 +18,10 @@
limitations under the License.
-->
-<mappings xmlns="http://dozer.sourceforge.net";
+<mappings xmlns="http://dozermapper.github.io/schema/bean-mapping";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://dozer.sourceforge.net
- http://dozer.sourceforge.net/schema/beanmapping.xsd";>
+ xsi:schemaLocation="http://dozermapper.github.io/schema/bean-mapping
+ https://dozermapper.github.io/schema/bean-mapping.xsd";>
<mapping type="one-way">
<class-a>org.apache.oozie.fluentjob.api.action.Delete</class-a>
diff --git a/fluent-job/fluent-job-api/src/main/resources/dozer_config.xml
b/fluent-job/fluent-job-api/src/main/resources/dozer_config.xml
index 55714c9..673607a 100644
--- a/fluent-job/fluent-job-api/src/main/resources/dozer_config.xml
+++ b/fluent-job/fluent-job-api/src/main/resources/dozer_config.xml
@@ -18,10 +18,10 @@
limitations under the License.
-->
-<mappings xmlns="http://dozer.sourceforge.net";
+<mappings xmlns="http://dozermapper.github.io/schema/bean-mapping";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://dozer.sourceforge.net
- http://dozer.sourceforge.net/schema/beanmapping.xsd";>
+ xsi:schemaLocation="http://dozermapper.github.io/schema/bean-mapping
+ https://dozermapper.github.io/schema/bean-mapping.xsd";>
<configuration>
<stop-on-errors>true</stop-on-errors>
diff --git
a/fluent-job/fluent-job-api/src/main/resources/mappingGraphToWORKFLOWAPP.xml
b/fluent-job/fluent-job-api/src/main/resources/mappingGraphToWORKFLOWAPP.xml
index 780f963..bce7eca 100644
--- a/fluent-job/fluent-job-api/src/main/resources/mappingGraphToWORKFLOWAPP.xml
+++ b/fluent-job/fluent-job-api/src/main/resources/mappingGraphToWORKFLOWAPP.xml
@@ -18,10 +18,10 @@
limitations under the License.
-->
-<mappings xmlns="http://dozer.sourceforge.net";
+<mappings xmlns="http://dozermapper.github.io/schema/bean-mapping";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://dozer.sourceforge.net
- http://dozer.sourceforge.net/schema/beanmapping.xsd";>
+ xsi:schemaLocation="http://dozermapper.github.io/schema/bean-mapping
+ https://dozermapper.github.io/schema/bean-mapping.xsd";>
<mapping type="one-way">
<class-a>org.apache.oozie.fluentjob.api.dag.End</class-a>
diff --git
a/fluent-job/fluent-job-api/src/test/java/org/apache/oozie/fluentjob/api/mapping/TestMappings.java
b/fluent-job/fluent-job-api/src/test/java/org/apache/oozie/fluentjob/api/mapping/TestMappings.java
index dd844be..987b7cb 100644
---
a/fluent-job/fluent-job-api/src/test/java/org/apache/oozie/fluentjob/api/mapping/TestMappings.java
+++
b/fluent-job/fluent-job-api/src/test/java/org/apache/oozie/fluentjob/api/mapping/TestMappings.java
@@ -24,7 +24,7 @@ import
org.apache.oozie.fluentjob.api.action.MapReduceActionBuilder;
import org.apache.oozie.fluentjob.api.dag.Graph;
import org.apache.oozie.fluentjob.api.workflow.Workflow;
import org.apache.oozie.fluentjob.api.workflow.WorkflowBuilder;
-import org.dozer.DozerBeanMapper;
+import com.github.dozermapper.core.DozerBeanMapper;
import org.junit.Test;
import java.util.ArrayList;
@@ -49,8 +49,7 @@ public class TestMappings {
mappingFiles.add("mappingGraphToWORKFLOWAPP.xml");
mappingFiles.add("action_mappings.xml");
- final DozerBeanMapper mapper = new DozerBeanMapper();
- mapper.setMappingFiles(mappingFiles);
+ final DozerBeanMapper mapper = DozerBeanMapperSingleton.instance();
final WORKFLOWAPP workflowapp = mapper.map(graph, WORKFLOWAPP.class);
diff --git a/pom.xml b/pom.xml
index 557ef21..3c86a0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1582,9 +1582,9 @@
<!-- Fluent Job API conversion to XML -->
<dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>5.5.1</version>
+ <groupId>com.github.dozermapper</groupId>
+ <artifactId>dozer-core</artifactId>
+ <version>6.4.1</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
diff --git a/release-log.txt b/release-log.txt
index 9080826..c000fb1 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3507 Upgrade to Dozer 6 (asalamon74 via kmarton)
OOZIE-3492 [spark-action] Missing HADOOP_CONF_DIR property (asalamon74 via
kmarton)
OOZIE-3495 Upgrade hive version to 1.2.2 (nobigo via kmarton,asalamon74)
OOZIE-3505 [Java 11] Fix TestDBLoadDump (kmarton via asalamon74)
