From 5882fd585bc317c1647ff6033e71beedd5d42241 Mon Sep 17 00:00:00 2001
From: Gareth Healy <garethahealy@gmail.com>
Date: Sun, 1 Apr 2018 10:45:51 +0100
Subject: [PATCH] Replaced jaxb xsd generation with cxf (#571)

---
 core/pom.xml           | 40 +++++++++++++++++++++++++---------------
 plugins-parent/pom.xml | 10 ++++++++++
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 615a8acfe..c80f4ba03 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -246,13 +246,37 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>target/jaxb-sources</source>
                                 <source>target/xmlbeans-sources</source>
                             </sources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-xjc-plugin</artifactId>
+                <configuration>
+                    <extensions>
+                        <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf-xjc-plugin.version}</extension>
+                    </extensions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>xsdtojava-tests</goal>
+                        </goals>
+                        <configuration>
+                            <xsdOptions>
+                                <xsdOption>
+                                    <xsd>src/test/xsd/jaxb/Employee.xsd</xsd>
+                                </xsdOption>
+                            </xsdOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
@@ -276,20 +300,6 @@
                             </transformSchemas>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>xjc</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>xjc</goal>
-                        </goals>
-                        <configuration>
-                            <schemaDirectory>
-                                ${project.basedir}/src/test/xsd/jaxb
-                            </schemaDirectory>
-                            <packageName>org.dozer.vo.jaxb.employee</packageName>
-                            <outputDirectory>target/jaxb-sources</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/plugins-parent/pom.xml b/plugins-parent/pom.xml
index 265a7162c..99e63adf4 100644
--- a/plugins-parent/pom.xml
+++ b/plugins-parent/pom.xml
@@ -46,6 +46,9 @@
         <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
         <maven-surefire-report-plugin.version>2.20</maven-surefire-report-plugin.version>
 
+        <!-- Apache Plugins; alphabetical order -->
+        <cxf-xjc-plugin.version>3.2.1</cxf-xjc-plugin.version>
+
         <!-- Codehaus Plugins versions; alphabetical order -->
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
@@ -183,6 +186,13 @@
                     <version>${maven-surefire-report-plugin.version}</version>
                 </plugin>
 
+                <!-- Apache Plugins; alphabetical order -->
+                <plugin>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-xjc-plugin</artifactId>
+                    <version>${cxf-xjc-plugin.version}</version>
+                </plugin>
+
                 <!-- Codehaus Plugins; alphabetical order -->
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>