diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-01-14 17:52:12 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-01-14 17:52:12 -0500 |
| commit | 6e50bcdfe9e75ac750310499c21e80bf8eaf276f (patch) | |
| tree | 612ac69e608216f68fc7054d26cc82c741d28f20 | |
| parent | 3e87a45998d81b3f858bb170a7f1998d73cc6f79 (diff) | |
Update policy-api for java11 docker
Issue-ID: POLICY-1586
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Ifeb693b4849dfd07057d2139b9f5b58e2ce3f0e5
4 files changed, 6 insertions, 7 deletions
diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index c9e36d02..6c653e33 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-docker/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/policy-common-alpine:1.4.0 +FROM onap/policy-jre-alpine LABEL maintainer="Policy Team" diff --git a/packages/policy-api-docker/src/main/docker/policy-api.sh b/packages/policy-api-docker/src/main/docker/policy-api.sh index dbd8cc03..4963391c 100644 --- a/packages/policy-api-docker/src/main/docker/policy-api.sh +++ b/packages/policy-api-docker/src/main/docker/policy-api.sh @@ -1,7 +1,7 @@ #!/bin/bash # # ============LICENSE_START======================================================= -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2019-2020 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,7 +20,7 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ +JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore" @@ -3,7 +3,7 @@ ONAP Policy API ================================================================================ Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved. - Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -75,7 +75,6 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh b/testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh index 9a3c34e0..1005d573 100644 --- a/testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh +++ b/testsuites/stability/src/main/resources/apisetup/config/api/bin/policy-api.sh @@ -1,7 +1,7 @@ #!/bin/bash # # ============LICENSE_START======================================================= -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2020 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,7 +20,7 @@ # ============LICENSE_END========================================================= # -JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ +JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ POLICY_API_HOME=/opt/app/policy/api KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore" KEYSTORE_PASSWD="Pol1cy_0nap" |