From: Guobiao Mo <guobiaomo@chinamobile.com>
Date: Thu, 9 Jan 2020 21:39:05 +0000 (-0800)
Subject: Docker build for Docker Hub
X-Git-Tag: 2.0.0~26^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=194d514cb233ca4c5e3be60cecdb8205cd6476c8;p=dcaegen2%2Fservices.git

Docker build for Docker Hub

Downgrade com.spotify:dockerfile-maven-plugin version so that it works
with Docker Hub and JDK 9.0+.

Issue-ID: DCAEGEN2-2009

Change-Id: Icf30b33edea3f5f147326c09ff746fba94b5a945
Signed-off-by: Guobiao Mo <guobiaomo@chinamobile.com>
---

diff --git a/components/datalake-handler/feeder/pom.xml b/components/datalake-handler/feeder/pom.xml
index 67f62a0f..f0be2a87 100644
--- a/components/datalake-handler/feeder/pom.xml
+++ b/components/datalake-handler/feeder/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<swagger.version>2.9.2</swagger.version>
-		<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
+		<dockerfile-maven.version>1.4.5</dockerfile-maven.version>
 		<docker.image.path>onap/org.onap.dcaegen2.services.datalakefeeder</docker.image.path>
 	</properties>
 
@@ -210,16 +210,28 @@
 				<groupId>com.spotify</groupId>
 				<artifactId>dockerfile-maven-plugin</artifactId>
 				<version>${dockerfile-maven.version}</version>
-				<configuration>
-					<!-- repository>docker.io/moguobiao/datalake-feeder-maven</repository-->
+				<configuration> 
+				<!-- 
+					<username>docker</username>
+					<password>docker</password>  -->
+					<!-- repository>repo.treescale.com/moguobiao/datalake-feeder-maven</repository -->
+					<!-- repository>moguobiao/datalake-feeder-maven-spotify</repository -->
 					<repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
 					<tag>${project.version}</tag>
 					<dockerfile>Dockerfile</dockerfile>
-					<!-- useMavenSettingsForAuth>true</useMavenSettingsForAuth-->
+					<!-- useMavenSettingsForAuth>true</useMavenSettingsForAuth -->
 					<buildArgs>
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>
 				</configuration>
+				<dependencies>
+					<!-- To make this work on JDK 9+ -->
+					<dependency>
+						<groupId>javax.activation</groupId>
+						<artifactId>javax.activation-api</artifactId>
+						<version>1.2.0</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 		</plugins>
 	</build>