From 1ce897f43ab55718820cfed72db2a94583741667 Mon Sep 17 00:00:00 2001
From: exceptionfactory <exceptionfactory@apache.org>
Date: Wed, 18 Aug 2021 14:54:57 -0500
Subject: [PATCH] NIFI-9059 Added Java 11 dependencies to Stateless Assembly
 (#5314)

- Updated nifi-stateless-system-test-suite with directory for Java 11 dependencies
---
 .../src/main/assembly/common.xml              | 18 +++++++++++
 .../nifi-stateless-system-test-suite/pom.xml  | 32 ++++++++++++++++++-
 .../src/test/assembly/dependencies.xml        | 24 ++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml
index 741fb8ce99..d769728427 100644
--- a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml
+++ b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml
@@ -30,6 +30,24 @@
             </includes>
         </dependencySet>
 
+        <!-- Write out the libs for java11 to its own directory -->
+        <!-- TODO: remove this dependency set once minimum Java version is 11 -->
+        <dependencySet>
+            <scope>runtime</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib/java11</outputDirectory>
+            <directoryMode>0770</directoryMode>
+            <fileMode>0664</fileMode>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <includes>
+                <include>javax.xml.bind:jaxb-api</include>
+                <include>com.sun.xml.bind:jaxb-impl</include>
+                <include>com.sun.xml.bind:jaxb-core</include>
+                <include>javax.activation:javax.activation-api</include>
+                <include>javax.annotation:javax.annotation-api</include>
+            </includes>
+        </dependencySet>
+
         <!-- Write out the conf directory contents -->
         <dependencySet>
             <scope>runtime</scope>
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
index e05ee34bda..d9d060c006 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
@@ -22,7 +22,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>nifi-stateless-system-test-suite</artifactId>
-
+    <properties>
+        <jaxb.version>2.3.0</jaxb.version>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -50,6 +52,34 @@
             <version>1.15.0-SNAPSHOT</version>
         </dependency>
 
+        <!-- Java 11 Dependencies -->
+        <!-- TODO: remove these once minimum Java version is 11 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
         <!-- Optional Dependencies -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml
index 8c32a5b488..4253eeaa6a 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/assembly/dependencies.xml
@@ -34,8 +34,32 @@
                 <exclude>nifi-stateless-bootstrap</exclude>
                 <exclude>jackson-core</exclude>
                 <exclude>jackson-databind</exclude>
+                <!-- 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 the libs for java11 to its own directory -->
+        <!-- TODO: remove this dependency set once minimum Java version is 11 -->
+        <dependencySet>
+            <scope>runtime</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>nars/java11</outputDirectory>
+            <directoryMode>0770</directoryMode>
+            <fileMode>0664</fileMode>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <includes>
+                <include>javax.xml.bind:jaxb-api</include>
+                <include>com.sun.xml.bind:jaxb-impl</include>
+                <include>com.sun.xml.bind:jaxb-core</include>
+                <include>javax.activation:javax.activation-api</include>
+                <include>javax.annotation:javax.annotation-api</include>
+            </includes>
+        </dependencySet>
     </dependencySets>
 
 </assembly>