X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=dgbuilder-docker%2Fpom.xml;h=5af9d886fe9ebc3c877dad310409cfbd85437bf7;hp=703420d391f4d465ecf017b23448b9367001903a;hb=b11d58dcac29a29aeb639a8be2f55408e3f06587;hpb=52cecb1b738257bc7e32f86cb03213467e1c83e2

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 703420d3..5af9d886 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.distribution</groupId>
 		<artifactId>distribution-root</artifactId>
-		<version>0.2.4-SNAPSHOT</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.distribution</groupId>
 	<artifactId>distribution-dgbuilder-docker</artifactId>
-	<version>0.2.4-SNAPSHOT</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-distribution :: dgbuilder-docker</name>
@@ -22,43 +22,28 @@
 	<properties>
 		<image.name>onap/ccsdk-dgbuilder-image</image.name>
 		<ccsdk.project.version>${project.version}</ccsdk.project.version>
+		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
 	</properties>
 
 	<build>
 		<plugins>
 
 
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                println project.properties['ccsdk.project.version'];
-                                def versionArray;
-                                if ( project.properties['ccsdk.project.version'] != null ) {
-                                    versionArray = project.properties['ccsdk.project.version'].split('\\.');
-                                }
-
-                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
-                                {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0]  + '.' + versionArray[1] + "-STAGING-latest";
-                                } else {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-                                }
-
-                                println 'New Tag for docker:' +
-                                project.properties['project.docker.latesttag.version'];
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+			<plugin>
+				<groupId>org.codehaus.groovy.maven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<source>${basedir}/../src/main/scripts/TagVersion.groovy</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.6</version>
@@ -90,35 +75,35 @@
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.5.0</version>
 				<executions>
-                    			<execution>
-                        			<id>Make-stage-dir</id>
-                        			<phase>generate-sources</phase>
-                        			<goals>
-                            				<goal>exec</goal>
-                        			</goals>
-                        			<configuration>
-                            				<executable>/bin/mkdir</executable>
-                            				<arguments>
-                                			<argument>-p</argument>
-                                			<argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                            				</arguments>
-                        			</configuration>
-                    			</execution>
-                    			<execution>
-                        			<id>Unzip dgbuilder</id>
-                        			<phase>generate-sources</phase>
-                        			<goals>
-                            				<goal>exec</goal>
-                        			</goals>
-                        			<configuration>
-                            				<executable>/usr/bin/unzip</executable>
-                            				<arguments>
-                                			<argument>-d</argument>
-                                			<argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                			<argument>../dgbuilder/target/*.zip</argument>
-                            				</arguments>
-                        			</configuration>
-                    			</execution>
+					<execution>
+						<id>Make-stage-dir</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<executable>/bin/mkdir</executable>
+							<arguments>
+								<argument>-p</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>Unzip dgbuilder</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<executable>/usr/bin/unzip</executable>
+							<arguments>
+								<argument>-d</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
+								<argument>../dgbuilder/target/*.zip</argument>
+							</arguments>
+						</configuration>
+					</execution>
 					<execution>
 						<id>Copy dgbuilder</id>
 						<phase>generate-sources</phase>
@@ -154,7 +139,7 @@
 
 					<execution>
 						<id>change shell permissions</id>
-                        			<phase>process-sources</phase>
+						<phase>process-sources</phase>
 						<goals>
 							<goal>exec</goal>
 						</goals>
@@ -175,57 +160,57 @@
 				</executions>
 			</plugin>
 		</plugins>
-    </build>
+	</build>
 
 	<profiles>
-        <profile>
-            <id>docker</id>
-            <build>
-                <plugins>
-			<plugin>
-				<groupId>io.fabric8</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.16.5</version>
-				<inherited>false</inherited>
-				<configuration>
+		<profile>
+			<id>docker</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>io.fabric8</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
+						<version>0.28.0</version>
+						<inherited>false</inherited>
+						<configuration>
 
-					<images>
-                                		<image>
-                                    			<name>${image.name}</name>
-                                    			<build>
-                                        			<cleanup>try</cleanup>
-                                        			<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        			<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
-                                        			<tags>
-                                            				<tag>${project.version}</tag>
-                                            				<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                            				<tag>${project.docker.latesttag.version}</tag>
-                                        			</tags>
-                                    			</build>
-						</image>
-					</images>
-				</configuration>
-				<executions>
-					<execution>
-						<id>generate-images</id>
-						<phase>package</phase>
-						<goals>
-							<goal>build</goal>
-						</goals>
-					</execution>
+							<images>
+								<image>
+									<name>${image.name}</name>
+									<build>
+										<cleanup>try</cleanup>
+										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+										<dockerFile>Dockerfile</dockerFile>
+										<tags>
+											<tag>${project.docker.latestminortag.version}</tag>
+											<tag>${project.docker.latestfulltag.version}</tag>
+											<tag>${project.docker.latesttagtimestamp.version}</tag>
+										</tags>
+									</build>
+								</image>
+							</images>
+						</configuration>
+						<executions>
+							<execution>
+								<id>generate-images</id>
+								<phase>package</phase>
+								<goals>
+									<goal>build</goal>
+								</goals>
+							</execution>
 
-					<execution>
-						<id>push-images</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>build</goal>
-							<goal>push</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-        </profile>
-    </profiles>
+							<execution>
+								<id>push-images</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>build</goal>
+									<goal>push</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>