X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=ed245ce87277eb61c91aa8856701a008efbc23a9;hb=fceaf3ddac03afb759fc18c41f284216f370aa0b;hp=85ac29975bfa8b71043d3dfebccaac650715ca6f;hpb=93f11cfd5154e754ffe5a766bfa153ba7adc13c0;p=dmaap%2Fkafka11aaf.git

diff --git a/pom.xml b/pom.xml
index 85ac299..ed245ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
 
 	<groupId>org.onap.dmaap.kafka</groupId>
 	<artifactId>kafka11aaf</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
-	<name>dmaap-kafka11aaf</name>
+	<version>0.0.6-SNAPSHOT</version>
+	<name>dmaap-kafka</name>
 	<licenses>
 		<license>
 			<name>Apache License Version 2.0</name>
@@ -39,16 +39,6 @@
 	</developers>
 
 	<build>
-        <!-- Copy files to docker-stage to be included in image -->        
-        <resources>
-            <resource>
-                <targetPath>${basedir}/target/docker-stage</targetPath>
-                <directory>${basedir}/src/main/docker</directory>
-                    <includes>
-                        <include>*</include>
-                    </includes>
-            </resource>
-        </resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -162,7 +152,7 @@
 								<artifactItem>
 									<groupId>org.onap.dmaap.messagerouter.mirroragent</groupId>
 									<artifactId>dmaapMMAgent</artifactId>
-									<version>1.1.1-SNAPSHOT</version>
+									<version>1.1.1</version>
 									<destFileName>dmaapMMAgent.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
@@ -171,54 +161,96 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<configuration>
+					<imageName>onap/dmaap/kafka111</imageName>
+					<dockerDirectory>src/main/docker</dockerDirectory>
+					<serverId>docker-hub</serverId>
+					<imageTags>
+						<imageTag>${dockertag1}</imageTag>
+						<imageTag>${dockertag2}</imageTag>
+					</imageTags>
+					<resources>
+						<!-- <resource> <targetPath>/</targetPath> <directory>${dockerLocation}</directory> 
+							<include>${project.build.finalName}.jar</include> </resource> -->
+						<resource>
+							<targetPath>/</targetPath>
+							<directory>${project.build.directory}</directory>
+							<include>**/**</include>
+						</resource>
+						<resource>
+							<targetPath>/</targetPath>
+							<directory>${project.build.directory}</directory>
+							<include>dmaapMMAgent.jar</include>
+						</resource>
+					</resources>
+				</configuration>
 				<executions>
 					<execution>
-						<id>enforce-no-snapshots</id>
+						<id>build-image</id>
+						<phase>install</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+						<configuration>
+							<skipDockerBuild>${skip.docker.build}</skipDockerBuild>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>tag-image-project-version</id>
+						<phase>install</phase>
+						<goals>
+							<goal>tag</goal>
+						</goals>
+						<configuration>
+							<image>onap/dmaap/kafka111</image>
+							<newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</newName>
+							<skipDockerTag>${skip.docker.push}</skipDockerTag>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>tag-image-latest</id>
+						<phase>install</phase>
+						<goals>
+							<goal>tag</goal>
+						</goals>
+						<configuration>
+							<image>onap/dmaap/kafka111</image>
+							<newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</newName>
+							<skipDockerTag>${skip.docker.push}</skipDockerTag>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>push-image</id>
+						<phase>deploy</phase>
 						<goals>
-							<goal>enforce</goal>
+							<goal>push</goal>
 						</goals>
 						<configuration>
-							<rules>
-								<requireReleaseDeps>
-									<message>No Snapshots Allowed!</message>
-									<excludes>
-										<exclude>org.onap.dmaap.messagerouter.mirroragent:dmaapMMAgent</exclude>
-									</excludes>
-								</requireReleaseDeps>
-							</rules>
-							<fail>true</fail>
+							<imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</imageName>
+							<skipDockerPush>${skip.docker.push}</skipDockerPush>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>push-image-latest</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>push</goal>
+						</goals>
+						<configuration>
+							<imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</imageName>
+							<skipDockerPush>${skip.docker.push}</skipDockerPush>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-              <!-- Copy jar to docker-stage to be included in image -->
-              <plugin>
-                  <artifactId>maven-resources-plugin</artifactId>
-                  <version>2.7</version>
-                  <executions>
-                     <execution>
-                          <id>copy-jar</id>
-                          <phase>install</phase>
-                          <goals>
-                              <goal>copy-resources</goal>
-                          </goals>
-                          <configuration>
-                              <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                              <resources>
-                                  <resource>
-                                      <directory>${basedir}/target</directory>
-                                      <includes>
-                                          <include>dmaapMMAgent.jar</include>
-                                          <include>kafka11aaf-jar-with-dependencies.jar</include>
-                                      </includes>
-                                  </resource>
-                              </resources>
-                          </configuration>
-                      </execution>
-                  </executions>
-              </plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -249,7 +281,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<sitePath>/content/sites/site/org/onap/dmaap/kafka0111/${project.artifactId}/${project.version}</sitePath>
 		<skip.docker.build>true</skip.docker.build>
 		<skip.docker.push>true</skip.docker.push>
@@ -285,8 +317,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.11</artifactId>
-			<version>0.11.0.3</version>
+			<artifactId>kafka_2.12</artifactId>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.powermock</groupId>
@@ -325,81 +357,43 @@
 				<skip.docker.push>false</skip.docker.push>
 			</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>
-                                    <properties>
-                                        <ver>${project.version}</ver>
-                                        <timestamp>${maven.build.timestamp}</timestamp>
-                                    </properties>
-                                    <source>
-                                        println project.properties['ver'];
-                                        if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
-                                        project.properties['dockertag1']=project.properties['ver'] + "-latest";
-                                        project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
-                                        } else {
-                                        project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
-                                        project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
-                                        }
-                                        println 'docker tag 1: ' + project.properties['dockertag1'];
-                                        println 'docker tag 2: ' + project.properties['dockertag2'];
-                                    </source>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- build docker image -->
-                    <plugin>
-                      <groupId>io.fabric8</groupId>
-                      <artifactId>docker-maven-plugin</artifactId>
-                      <version>0.28.0</version>  
-                      <configuration>
-                          <verbose>${docker.verbose}</verbose>
-                          <apiVersion>${docker.apiVersion}</apiVersion>
-                          <pullRegistry>${docker.pull.registry}</pullRegistry>
-                          <pushRegistry>${docker.push.registry}</pushRegistry>
-                          <images>
-                              <image>                            
-                                  <name>onap/dmaap/kafka01101</name>
-                                  <build>
-                                      <cleanup>try</cleanup>
-                                     <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                     <dockerFile>Dockerfile</dockerFile>
-                                      <tags>
-                                          <tag>${dockertag1}</tag>
-                                          <tag>${dockertag2}</tag>
-                                      </tags>
-                                  </build>
-                              </image>
-                          </images>
-                      </configuration>
-                      <executions>
-                          <execution>
-                              <id>generate-images</id>
-                              <phase>install</phase>
-                              <goals>
-                                  <goal>build</goal>
-                              </goals>
-                          </execution>
-                          <execution>
-                              <id>push-images</id>
-                              <phase>deploy</phase>
-                              <goals>
-                                  <goal>push</goal>
-                              </goals>
-                          </execution>
-                      </executions>
-                   </plugin>
-                </plugins>
-            </build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.groovy.maven</groupId>
+						<artifactId>gmaven-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>validate</phase>
+								<goals>
+									<goal>execute</goal>
+								</goals>
+								<configuration>
+									<properties>
+										<ver>${project.version}</ver>
+										<timestamp>${maven.build.timestamp}</timestamp>
+									</properties>
+									<source>
+										println project.properties['ver'];
+										if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+										project.properties['dockertag1']=project.properties['ver'] +
+										"-latest";
+										project.properties['dockertag2']=project.properties['ver'] +
+										"-" + project.properties['timestamp'];
+										} else {
+										project.properties['dockertag1']=project.properties['ver'] +
+										"-STAGING-latest";
+										project.properties['dockertag2']=project.properties['ver'] +
+										"-STAGING-" + project.properties['timestamp'];
+										}
+										println 'docker tag 1: ' + project.properties['dockertag1'];
+										println 'docker tag 2: ' + project.properties['dockertag2'];
+									</source>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 
 	</profiles>