From efff1b41f07e4d473de68c91706509c9ab104d58 Mon Sep 17 00:00:00 2001
From: Bryan Bende <bbende@apache.org>
Date: Mon, 18 Nov 2019 11:24:06 -0500
Subject: [PATCH] NIFI-6880 Fix ranger assembly to exclude Java 11 related JARs

This closes #3892
---
 nifi-assembly/src/main/assembly/ranger.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nifi-assembly/src/main/assembly/ranger.xml b/nifi-assembly/src/main/assembly/ranger.xml
index 04b8016b60..111d4d33e8 100644
--- a/nifi-assembly/src/main/assembly/ranger.xml
+++ b/nifi-assembly/src/main/assembly/ranger.xml
@@ -42,6 +42,14 @@
                 <exclude>nifi-docs</exclude>
                 <exclude>org.apache.ranger:credentialbuilder:jar</exclude>
                 <exclude>org.apache.nifi:nifi-ranger-resources:jar</exclude>
+
+                <!-- exclude jaxb/activation/annotation libs from lib, they'll be included in the java11 subdir -->
+                <!-- TODO: remove these once minimum Java version is 11 -->
+                <exclude>javax.xml.bind:jaxb-api</exclude>
+                <exclude>com.sun.xml.bind:jaxb-impl</exclude>
+                <exclude>com.sun.xml.bind:jaxb-core</exclude>
+                <exclude>javax.activation:javax.activation-api</exclude>
+                <exclude>javax.annotation:javax.annotation-api</exclude>
             </excludes>
         </dependencySet>
         <!-- Write out dependencies for Ranger's credentialbuilder to ext/ranger/install/lib -->