OOZIE-3483 [Java 11] Fluent job API build fails due to Jaxb2 maven plugin (kmarton via asalamon74)
diff --git a/docs/src/site/markdown/DG_FluentJobAPI.md b/docs/src/site/markdown/DG_FluentJobAPI.md
index 7319970..a9ce203 100644
--- a/docs/src/site/markdown/DG_FluentJobAPI.md
+++ b/docs/src/site/markdown/DG_FluentJobAPI.md
@@ -470,7 +470,7 @@
Here are the steps needed:
- * in `fluent-job-api/pom.xml` extend or modify `jaxb2-maven-plugin` section `sources` by a new `source`
+ * in `fluent-job-api/pom.xml` extend or modify `jax-maven-plugin` section `arguments` by a new `argument`
* in `fluent-job-api/src/main/xjb/bindings.xml` extend by a new or modify an existing `jaxb:bindings`
* in `fluent-job-api`, `org.apache.oozie.fluentjob.api.mapping` package, introduce a new or modify an existing `DozerConverter`
* in `dozer_config.xml`, introduce a new or modify an existing `converter` inside `custom-converters`
diff --git a/fluent-job/fluent-job-api/pom.xml b/fluent-job/fluent-job-api/pom.xml
index f9c2e5d..3912e03 100644
--- a/fluent-job/fluent-job-api/pom.xml
+++ b/fluent-job/fluent-job-api/pom.xml
@@ -31,7 +31,6 @@
<description>Apache Oozie Fluent Job API</description>
<name>Apache Oozie Fluent Job API</name>
<packaging>jar</packaging>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -68,6 +67,11 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
</dependencies>
<build>
@@ -112,52 +116,53 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>xjc</id>
- <goals>
- <goal>xjc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <arguments>
- <argument>-XhashCode</argument>
- <argument>-Xequals</argument>
- <argument>-Xnamespace-prefix</argument>
- <argument>-Xsetters</argument>
- </arguments>
-
- <sources>
- <source>../../client/src/main/resources/distcp-action-1.0.xsd</source>
- <source>../../client/src/main/resources/email-action-0.2.xsd</source>
- <source>../../client/src/main/resources/hive2-action-1.0.xsd</source>
- <source>../../client/src/main/resources/hive-action-1.0.xsd</source>
- <source>../../client/src/main/resources/oozie-sla-0.2.xsd</source>
- <source>../../client/src/main/resources/oozie-workflow-1.0.xsd</source>
- <source>../../client/src/main/resources/shell-action-1.0.xsd</source>
- <source>../../client/src/main/resources/spark-action-1.0.xsd</source>
- <source>../../client/src/main/resources/sqoop-action-1.0.xsd</source>
- <source>../../client/src/main/resources/ssh-action-0.2.xsd</source>
- <source>../../client/src/main/resources/git-action-1.0.xsd</source>
- </sources>
- </configuration>
-
+ <groupId>com.github.davidmoten</groupId>
+ <artifactId>jax-maven-plugin</artifactId>
+ <version>0.1.6</version>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>1.11.1</version>
</dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-namespace-prefix</artifactId>
- <version>1.3</version>
- </dependency>
</dependencies>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ <configuration>
+ <systemProperties>
+ <enableExternalEntityProcessing>true</enableExternalEntityProcessing>
+ </systemProperties>
+ <arguments>
+ <argument>-verbose</argument>
+ <argument>-XhashCode</argument>
+ <argument>-Xequals</argument>
+ <argument>-Xsetters</argument>
+ <argument>-d</argument>
+ <argument>${project.basedir}/target/generate-sources/jaxb</argument>
+ <argument>-b</argument>
+ <argument>${project.basedir}/src/main/xjb/bindings.xml</argument>
+ <argument>../../client/src/main/resources/distcp-action-1.0.xsd</argument>
+ <arhument>../../client/src/main/resources/email-action-0.2.xsd</arhument>
+ <argument>../../client/src/main/resources/hive2-action-1.0.xsd</argument>
+ <argument>../../client/src/main/resources/hive-action-1.0.xsd</argument>
+ <argument>../../client/src/main/resources/oozie-sla-0.2.xsd</argument>
+ <argument>../../client/src/main/resources/oozie-workflow-1.0.xsd</argument>
+ <argument>../../client/src/main/resources/shell-action-1.0.xsd</argument>
+ <argument>../../client/src/main/resources/spark-action-1.0.xsd</argument>
+ <argument>../../client/src/main/resources/sqoop-action-1.0.xsd</argument>
+ <argument>../../client/src/main/resources/ssh-action-0.2.xsd</argument>
+ <argument>../../client/src/main/resources/git-action-1.0.xsd</argument>
+
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/fluent-job/fluent-job-api/src/main/xjb/bindings.xml b/fluent-job/fluent-job-api/src/main/xjb/bindings.xml
index ca6fd13..86decdb 100644
--- a/fluent-job/fluent-job-api/src/main/xjb/bindings.xml
+++ b/fluent-job/fluent-job-api/src/main/xjb/bindings.xml
@@ -21,10 +21,7 @@
<jaxb:bindings xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" version="2.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_1.xsd
- http://jaxb2-commons.dev.java.net/namespace-prefix
- https://raw.githubusercontent.com/Siggen/jaxb2-namespace-prefix/master/src/main/resources/prefix-namespace-schema.xsd">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_1.xsd">
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/distcp-action-1.0.xsd">
@@ -32,10 +29,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.distcp"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="distcp" />
- </jaxb:bindings>
-
</jaxb:bindings>
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/email-action-0.2.xsd">
@@ -44,10 +37,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.email"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="email" />
- </jaxb:bindings>
-
</jaxb:bindings>
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/hive2-action-1.0.xsd">
@@ -56,9 +45,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.hive2"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="hive2" />
- </jaxb:bindings>
</jaxb:bindings>
@@ -68,23 +54,8 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.hive"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="hive" />
- </jaxb:bindings>
-
</jaxb:bindings>
- <!--<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/oozie-sla-0.2.xsd">-->
-
- <!--<jaxb:schemaBindings>-->
- <!--<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.sla"/>-->
- <!--</jaxb:schemaBindings>-->
-
- <!--<jaxb:bindings>-->
- <!--<namespace:prefix name="sla" />-->
- <!--</jaxb:bindings>-->
-
- <!--</jaxb:bindings>-->
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/oozie-workflow-1.0.xsd">
@@ -92,10 +63,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.workflow"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="workflow" />
- </jaxb:bindings>
-
<jaxb:bindings node="//xs:complexType[@name='ACTION']/xs:sequence/xs:choice/xs:any">
<jaxb:property name="other" generateElementProperty="true"/>
</jaxb:bindings>
@@ -107,7 +74,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.sla"/>
</jaxb:schemaBindings>
- <namespace:prefix name="sla" />
</jaxb:bindings>
<jaxb:property name="sla" generateElementProperty="true"/>
@@ -121,10 +87,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.shell"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="shell" />
- </jaxb:bindings>
-
</jaxb:bindings>
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/spark-action-1.0.xsd">
@@ -133,10 +95,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.spark"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="spark" />
- </jaxb:bindings>
-
</jaxb:bindings>
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/sqoop-action-1.0.xsd">
@@ -145,10 +103,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.sqoop"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="sqoop" />
- </jaxb:bindings>
-
</jaxb:bindings>
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/ssh-action-0.2.xsd">
@@ -157,10 +111,6 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.ssh"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="ssh" />
- </jaxb:bindings>
-
</jaxb:bindings>
<jaxb:bindings schemaLocation = "../../../../../client/src/main/resources/git-action-1.0.xsd">
@@ -169,9 +119,5 @@
<jaxb:package name = "org.apache.oozie.fluentjob.api.generated.action.git"/>
</jaxb:schemaBindings>
- <jaxb:bindings>
- <namespace:prefix name="git" />
- </jaxb:bindings>
-
</jaxb:bindings>
</jaxb:bindings>
diff --git a/pom.xml b/pom.xml
index f9e03f1..a3a024d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1597,11 +1597,6 @@
<artifactId>jaxb2-namespace-prefix</artifactId>
<version>1.3</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.2</version>
- </dependency>
<dependency>
<groupId>org.xmlunit</groupId>
@@ -1838,11 +1833,6 @@
</filesets>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
</plugins>
</pluginManagement>
diff --git a/release-log.txt b/release-log.txt
index a642d03..496267a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3483 [Java 11] Fluent job API build fails due to Jaxb2 maven plugin (kmarton via asalamon74)
OOZIE-3494 Incorrect hadoop-yarn-registry version(asalamon74 via kmarton)
OOZIE-3455 Inconsistent CoordMaterializeTransitionXCommand logging(asalamon74 via kmarton)
OOZIE-3485 [Java 11] Update Maven Surefire Plugin to 2.22.2 (kmarton via asalamon74)
