From 8e3c45f80631938013e67863a167df00c57cd4f0 Mon Sep 17 00:00:00 2001
From: TamasBakai <tamas.bakai@est.tech>
Date: Sun, 5 May 2019 08:32:53 +0000
Subject: Ownership fix in config directory

Change-Id: Iec3ca75c42642da27c52bccd6d60811c434f778a
Issue-ID: DCAEGEN2-1466
Signed-off-by: TamasBakai <tamas.bakai@est.tech>
---
 datafile-app-server/dpo/blueprints/k8s-datafile.yaml | 2 +-
 datafile-app-server/pom.xml                          | 2 +-
 datafile-app-server/src/main/docker/Dockerfile       | 2 +-
 pom.xml                                              | 2 +-
 version.properties                                   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
index 75c75d78..d1a2d4ea 100644
--- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
+++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
@@ -70,7 +70,7 @@ inputs:
     default: "dradmin"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0-SNAPSHOT"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2-SNAPSHOT"
   replicas:
     type: integer
     description: number of instances
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml
index 122989fa..ae6c3091 100644
--- a/datafile-app-server/pom.xml
+++ b/datafile-app-server/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.collectors</groupId>
     <artifactId>datafile</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.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 f39f1cb5..6f62e65f 100644
--- a/datafile-app-server/src/main/docker/Dockerfile
+++ b/datafile-app-server/src/main/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN addgroup -S onap && adduser -S datafile -G onap
 RUN chown -R datafile:onap /opt/app/datafile
 RUN chown -R datafile:onap /var/log/ONAP
 RUN base64 -d /opt/app/datafile/config/dfc.jks.b64 > /opt/app/datafile/config/dfc.jks && base64 -d /opt/app/datafile/config/ftp.jks.b64 > /opt/app/datafile/config/ftp.jks 
-RUN chown -R root:root /opt/app/datafile/config/*
+RUN chown -R datafile:onap /opt/app/datafile/config/*
 RUN chmod -R 755 /opt/app/datafile/config/
 
 USER datafile
diff --git a/pom.xml b/pom.xml
index 2528378a..0336ae7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   <groupId>org.onap.dcaegen2.collectors</groupId>
   <artifactId>datafile</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
 
   <name>dcaegen2-collectors.datafile</name>
   <description>datafile collector</description>
diff --git a/version.properties b/version.properties
index 11ad59d0..07578e54 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
-minor=1
-patch=1
+minor=2
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg