Issued security fixes

Issue-ID: DCAEGEN2-765
Change-Id: I19eaf86af61af5f177a06fea9bcf27bc57e41143
Signed-off-by: Singla, Rajiv (rs153v) <rs153v@att.com>

6 files changed, 33 insertions, 13 deletions

diff --git a/dcae-analytics/dcae-analytics-tca-web/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
index 83136ad..19afab7 100644
--- a/dcae-analytics/dcae-analytics-tca-web/Dockerfile
+++ b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
@@ -1,15 +1,20 @@
 # NOTE: This Dockerfile is auto generated and filtered via maven resources plugin.
 # Edits to generated Dockerfile will NOT be saved.
 # Only changes made in docker/Dockerfile template file will be persistent
+# ==========================================================================
+
 FROM openjdk:8-jre-alpine
+
 MAINTAINER Rajiv Singla <rs153v@att.com>
+
+VOLUME /tmp
+ADD docker/logback.xml logback.xml
+ADD target/dcae-analytics-tca-web-3.0.0-SNAPSHOT.jar dcae-analytics-tca-web.jar
+EXPOSE 9091
+
 ENTRYPOINT ["java", \
             "-Djava.security.egd=file:/dev/./urandom", \
             "-Dlogging.config=logback.xml", \
             "-Dlogging.file=logs/dcae-analytics-tca-web.log", \
             "-Dspring.profiles.active=dev", \
             "-jar", "dcae-analytics-tca-web.jar"]
-EXPOSE 9091
-VOLUME /tmp
-ADD docker/logback.xml logback.xml
-ADD target/dcae-analytics-tca-web-3.0.0-SNAPSHOT.jar dcae-analytics-tca-web.jar
diff --git a/dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile
index fcbc5ac..eccef3b 100644
--- a/dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile
+++ b/dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile
@@ -1,15 +1,20 @@
 # NOTE: This Dockerfile is auto generated and filtered via maven resources plugin.
 # Edits to generated Dockerfile will NOT be saved.
 # Only changes made in docker/Dockerfile template file will be persistent
+# ==========================================================================
+
 FROM openjdk:8-jre-alpine
+
 MAINTAINER Rajiv Singla <rs153v@att.com>
+
+VOLUME /tmp
+ADD docker/logback.xml logback.xml
+ADD target/${project.build.finalName}.jar ${project.artifactId}.jar
+EXPOSE 9091
+
 ENTRYPOINT ["java", \
             "-Djava.security.egd=file:/dev/./urandom", \
             "-Dlogging.config=logback.xml", \
             "-Dlogging.file=logs/${project.artifactId}.log", \
             "-Dspring.profiles.active=dev", \
             "-jar", "${project.artifactId}.jar"]
-EXPOSE 9091
-VOLUME /tmp
-ADD docker/logback.xml logback.xml
-ADD target/${project.build.finalName}.jar ${project.artifactId}.jar
diff --git a/dcae-analytics/dcae-analytics-tca-web/docker/logback.xml b/dcae-analytics/dcae-analytics-tca-web/docker/logback.xml
index cba7e63..57348d3 100644
--- a/dcae-analytics/dcae-analytics-tca-web/docker/logback.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/docker/logback.xml
@@ -23,7 +23,7 @@
     <property scope="context" name="componentName" value="dcae-analytics-tca"/>
     <contextName>${componentName}</contextName>
 
-    <include resource="ecomp-logback.xml"/>
+    <include resource="eelf-logback.xml"/>
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
 
     <logger name="org.springframework" level="INFO"/>
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 689668e..4cc7e5b 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -135,6 +135,20 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <!-- DOCKER PLUGIN -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>docker-push</id>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/mongo/MongoAbatementEntity.java b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/mongo/MongoAbatementEntity.java
index 562c918..0cc1fcf 100644
--- a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/mongo/MongoAbatementEntity.java
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/mongo/MongoAbatementEntity.java
@@ -20,7 +20,6 @@
 package org.onap.dcae.analytics.tca.web.abatement.mongo;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
@@ -35,7 +34,6 @@ import org.springframework.data.mongodb.core.mapping.Document;
  * @author Rajiv Singla
  */
 @Data
-@NoArgsConstructor
 @Document(collection = "tca_abatement")
 public class MongoAbatementEntity implements TcaAbatementEntity, TcaModel {
 
diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/simple/SimpleAbatementEntity.java b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/simple/SimpleAbatementEntity.java
index c12306f..42e3759 100644
--- a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/simple/SimpleAbatementEntity.java
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/abatement/simple/SimpleAbatementEntity.java
@@ -20,7 +20,6 @@
 package org.onap.dcae.analytics.tca.web.abatement.simple;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
@@ -31,7 +30,6 @@ import org.onap.dcae.analytics.tca.model.TcaModel;
  * @author Rajiv Singla
  */
 @Data
-@NoArgsConstructor
 public class SimpleAbatementEntity implements TcaAbatementEntity, TcaModel {
 
     private static final long serialVersionUID = 1L;