From 0a15ed81fdde99920359f209341114119c1aa11a Mon Sep 17 00:00:00 2001
From: Instrumental <jgonap@stl.gathman.org>
Date: Tue, 28 Jan 2020 15:54:01 -0600
Subject: [PATCH] Modify for use of JDK 11

Issue-ID: AAF-1066
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: I31484958c48b0d9b930921bec2581144e0675970
---
 .../java/org/onap/aaf/auth/server/AbsService.java  |  4 +-
 auth/docker/Dockerfile.base                        |  9 ++-
 auth/docker/dclean.sh                              |  1 +
 cadi/aaf/src/assemble/cadi-aaf.xml                 |  2 +
 misc/rosetta/pom.xml                               |  8 ---
 pom.xml                                            | 68 +++++++++++++++++-----
 6 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
index 678fb28e..0e770e5f 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
@@ -25,7 +25,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Properties;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.SSLServerSocketFactory;
 import javax.servlet.Filter;
 
 import org.onap.aaf.auth.common.Define;
@@ -86,7 +86,7 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
             } catch (NoSuchAlgorithmException e) {
                 throw new CadiException("SSLContext issue",e);
             }
-            SSLSocketFactory sf = context.getSocketFactory();
+            SSLServerSocketFactory sf = context.getServerSocketFactory();
             StringBuilder sb = new StringBuilder("Available Cipher Suites: ");
             boolean first = true;
             int count=0;
diff --git a/auth/docker/Dockerfile.base b/auth/docker/Dockerfile.base
index 4ba4dfab..523d63f0 100644
--- a/auth/docker/Dockerfile.base
+++ b/auth/docker/Dockerfile.base
@@ -18,15 +18,18 @@
 #  ============LICENSE_END====================================================
 #
 # Use dbuild.sh input parameter to set registry
-#FROM ${REGISTRY}/openjdk:11.0.5-jre-slim
-FROM ${REGISTRY}/openjdk:8-jdk-alpine
+#FROM ${REGISTRY}/openjdk:11-jre-slim
+#FROM ${REGISTRY}/openjdk:8-jdk-alpine
+FROM ${REGISTRY}/alpine
 #FROM openjdk:12-jdk-alpine
 #FROM openjdk:13-jdk-alpine
 
 MAINTAINER AAF Team, AT&T 2018
 
 LABEL description="aaf_base"
-RUN apk add --no-cache bash &&\
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
+RUN apk --no-cache add openjdk11 &&\
+    apk add --no-cache bash &&\
     apk add --no-cache openssl &&\
     apk add --no-cache curl &&\
     if [ -n "${DUSER}" ]; then addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash; fi
diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh
index 0e974aa6..f27cc4ec 100644
--- a/auth/docker/dclean.sh
+++ b/auth/docker/dclean.sh
@@ -36,4 +36,5 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
       $DOCKER image rm $DOCKER_REPOSITORY/$ORG/$PROJECT/aaf_$AAF_COMPONENT:latest
     fi
 done
+
 echo "Y" | $DOCKER image prune
diff --git a/cadi/aaf/src/assemble/cadi-aaf.xml b/cadi/aaf/src/assemble/cadi-aaf.xml
index 0a485b83..63741ffa 100644
--- a/cadi/aaf/src/assemble/cadi-aaf.xml
+++ b/cadi/aaf/src/assemble/cadi-aaf.xml
@@ -19,6 +19,8 @@
       	<include>org.onap.aaf.authz:aaf-cadi-client</include>
       	<include>org.onap.aaf.authz:aaf-misc-env</include>
       	<include>org.onap.aaf.authz:aaf-misc-rosetta</include>
+      	<include>javax.xml.bind:jaxb-api</include>
+      	<include>org.glassfish.jaxb:jaxb-runtime</include>
       </includes>
     </dependencySet>
 
diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index 73d388dd..2f3ea41d 100644
--- a/misc/rosetta/pom.xml
+++ b/misc/rosetta/pom.xml
@@ -85,15 +85,7 @@
         <dependency>
           <groupId>org.glassfish.jaxb</groupId>
           <artifactId>jaxb-runtime</artifactId>
-          <scope>runtime</scope>
         </dependency>
-        <dependency>
-          <groupId>com.sun.istack</groupId>
-          <artifactId>istack-commons-runtime</artifactId>
-          <version>2.2</version>
-          <scope>runtime</scope>
-        </dependency>
-        
     </dependencies>
 
             
diff --git a/pom.xml b/pom.xml
index f1846665..cdeac0cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.1.0</version>
         <!-- Official Released Version
+        <version>2.1.0</version>
 
         Frankfurt working Version
-        <version>3.0.0-SNAPSHOT</version>
     -->
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -55,6 +55,10 @@
         <mockito.version>1.9.5</mockito.version>
         <project.interfaceVersion>${project.version}</project.interfaceVersion>
         <project.jettyVersion>9.4.12.v20180830</project.jettyVersion>
+        <!--
+            This version requires changes in how to start Jetty  
+        	<project.jettyVersion>9.4.26.v20200117</project.jettyVersion>
+        -->
         <project.cassVersion>3.6.0</project.cassVersion>
         <project.jaxbVersion>2.3.1</project.jaxbVersion>
         <project.glassfishJaxbVersion>3.0-b71</project.glassfishJaxbVersion>
@@ -243,16 +247,37 @@
                 <version>3.0.1</version>
             </dependency>
 
-            <!-- JettyVersion is partly covered in "OParent" dependency> <groupId>org.eclipse.jetty</groupId> 
-                <artifactId>jetty-servlet</artifactId> <version>${project.jettyVersion}</version> 
-                </dependency><dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> 
-                <version>${project.jettyVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> 
-                <artifactId>jetty-http</artifactId> <version>${project.jettyVersion}</version> 
-                </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> 
-                <version>${project.jettyVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> 
-                <artifactId>jetty-security</artifactId> <version>${project.jettyVersion}</version> 
-                </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> 
-                <version>${project.jettyVersion}</version> </dependency> -->
+			            <!-- JettyVersion is partly covered in "OParent" dependency> -->
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlet</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-http</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-io</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-security</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-util</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency> 
 
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -349,6 +374,12 @@
             </dependency>
 
           <!-- Javax removed as of JDK 9 -->
+          <!--  Annotation MAY not be needed -->
+          <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+          </dependency>
           <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -364,7 +395,18 @@
             <artifactId>jaxb-runtime</artifactId>
             <version>${project.jaxbVersion}</version>
           </dependency>
-          
+          <!-- 
+          <dependency>
+		    <groupId>com.sun.xml.bind</groupId>
+		    <artifactId>jaxb-impl</artifactId>
+		    <version>2.2.11</version>
+		  </dependency>
+		  <dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>2.2.11</version>
+		   </dependency>
+		    -->
         </dependencies>
     </dependencyManagement>
 
-- 
2.16.6