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 ca18ed5..d22256f 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 23a12e1..c1f699e 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 59cf40d..1b530e5 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 @@
*/
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 09bd5d8..b046642 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.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;
/**