diff options
| author |   Instrumental <jgonap@stl.gathman.org> | 2020-01-28 15:54:01 -0600 |
|---|---|---|
| committer | Instrumental <jgonap@stl.gathman.org> | 2020-01-28 16:13:50 -0600 |
| commit | 0a15ed81fdde99920359f209341114119c1aa11a (patch) | |
| tree | 588d100a24153951eec02dae398cfb84f05902a0 /auth | |
| parent | 82755753f41112e1cdd91b2994620ad074dfbf20 (diff) | |
Modify for use of JDK 11
Issue-ID: AAF-1066
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: I31484958c48b0d9b930921bec2581144e0675970
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java | 4 | ||||
| -rw-r--r-- | auth/docker/Dockerfile.base | 9 | ||||
| -rw-r--r-- | auth/docker/dclean.sh | 1 |
3 files changed, 9 insertions, 5 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 |