From: wasala <przemyslaw.wasala@nokia.com>
Date: Fri, 13 Apr 2018 07:44:51 +0000 (+0200)
Subject: Added pushing image docker in deploy phase
X-Git-Tag: 2.0.0-ONAP~47
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F42675%2F5;p=dcaegen2%2Fservices%2Fprh.git

Added pushing image docker in deploy phase

Change-Id: I3984bd60264027a47434784001de653b847e67d2
Issue-ID: DCAEGEN2-407
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
---

diff --git a/pom.xml b/pom.xml
index ca18ed5b..d22256f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,6 @@
     <junit.platform.version>1.1.0</junit.platform.version>
 
     <!--PLUGIN SETTINGS -->
-    <dependency.locations.enabled>false</dependency.locations.enabled>
     <nexusproxy>https://nexus.onap.org</nexusproxy>
     <snapshots.path>content/repositories/snapshots/</snapshots.path>
     <releases.path>content/repositories/releases/</releases.path>
diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
index 23a12e1d..c1f699ef 100644
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -34,6 +34,9 @@
   <properties>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
     <project.fatJar.finalName>prh-app-server</project.fatJar.finalName>
+    <nexusproxy>https://nexus.onap.org</nexusproxy>
+    <snapshots.path>content/repositories/snapshots/</snapshots.path>
+    <releases.path>content/repositories/releases/</releases.path>
   </properties>
   <build>
     <plugins>
@@ -60,15 +63,6 @@
       <plugin>
         <groupId>com.spotify</groupId>
         <artifactId>docker-maven-plugin</artifactId>
-        <version>1.0.0</version>
-        <executions>
-        <execution>
-        <goals>
-        <goal>build</goal>
-        </goals>
-        <phase>package</phase>
-        </execution>
-        </executions>
         <configuration>
           <skipDockerBuild>false</skipDockerBuild>
           <imageName>
@@ -204,7 +198,7 @@
         <!-- IMPORT DEPENDENCY MANAGEMENT FROM SPRING BOOT -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.0.0.RELEASE</version>
+        <version>2.0.1.RELEASE</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
index 59cf40da..1b530e5a 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
@@ -28,10 +28,10 @@ import org.onap.dcaegen2.services.config.DmaapProducerConfiguration;
  */
 public interface AppConfig {
 
-    DmaapConsumerConfiguration getDmaapConsumerConfiguration() throws Exception;
+    DmaapConsumerConfiguration getDmaapConsumerConfiguration();
 
-    AAIHttpClientConfiguration getAAIHttpClientConfiguration() throws Exception;
+    AAIHttpClientConfiguration getAAIHttpClientConfiguration();
 
-    DmaapProducerConfiguration getDmaapProducerConfiguration() throws Exception;
+    DmaapProducerConfiguration getDmaapProducerConfiguration();
 
 }
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
index 09bd5d8e..b0466421 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
@@ -25,8 +25,6 @@ import org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.TaskScheduler;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**