diff options
| -rw-r--r-- | datafile-app-server/pom.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | datafile-app-server/src/main/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml index 5f9474a0..fdec5992 100644 --- a/datafile-app-server/pom.xml +++ b/datafile-app-server/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ ============LICENSE_START======================================================= - ~ Copyright (C) 2018 NOKIA Intellectual Property, 2018-2019 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2018 NOKIA Intellectual Property, 2018-2020 Nordix Foundation. All rights reserved. ~ Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.dcaegen2.collectors</groupId> <artifactId>datafile</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.collectors.datafile</groupId> diff --git a/datafile-app-server/src/main/docker/Dockerfile b/datafile-app-server/src/main/docker/Dockerfile index c3e5f07f..0763e2bf 100644..100755 --- a/datafile-app-server/src/main/docker/Dockerfile +++ b/datafile-app-server/src/main/docker/Dockerfile @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= # -FROM openjdk:8-jre-alpine +FROM openjdk:11.0.6-jre-slim WORKDIR /opt/app/datafile RUN mkdir -p /var/log/ONAP @@ -28,10 +28,10 @@ ADD /config/application.yaml /opt/app/datafile/config/ EXPOSE 8100 8433 -RUN addgroup -S onap && adduser -S datafile -G onap +RUN groupadd -r onap && useradd -ms /bin/bash datafile -g onap RUN chown -R datafile:onap /var/log/ONAP RUN chmod -R 777 /opt/app/datafile/config/ USER datafile -ENTRYPOINT ["/usr/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"] +ENTRYPOINT ["/usr/local/openjdk-11/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"] @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ ============LICENSE_START===================================================================== - ~ Copyright (C) 2018 NOKIA Intellectual Property, 2018-2019 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2018 NOKIA Intellectual Property, 2018-2020 Nordix Foundation. All rights reserved. ~ ============================================================================================== ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ <groupId>org.onap.dcaegen2.collectors</groupId> <artifactId>datafile</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <name>dcaegen2-collectors.datafile</name> <description>datafile collector</description> @@ -44,7 +44,7 @@ </licenses> <properties> - <java.version>8</java.version> + <java.version>11</java.version> <sdk.version>1.1.6</sdk.version> <apache.httpcomponents.version>4.1.4</apache.httpcomponents.version> <apache.commons.version>3.6</apache.commons.version> diff --git a/version.properties b/version.properties index f520c971..3db741f5 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=1
-minor=3
+minor=4
patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
|