single image for Kafka and mmagent

[dmaap/kafka11aaf.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c1d645b..e47c8c0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,12 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1</version>
        </parent>
 
        <groupId>org.onap.dmaap.kafka</groupId>
        <artifactId>kafka11aaf</artifactId>
-       <version>0.0.2-SNAPSHOT</version>
+       <version>0.0.3-SNAPSHOT</version>
        <name>dmaap-kafka11aaf</name>
        <licenses>
                <license>
@@ -136,6 +136,53 @@
                                        <skip />
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>copy</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>target</outputDirectory>
+                                                       <encoding>UTF-8</encoding>
+                                                       <artifactItems>
+                                                               <artifactItem>
+                                                                       <groupId>org.onap.dmaap.messagerouter.mirroragent</groupId>
+                                                                       <artifactId>dmaapMMAgent</artifactId>
+                                                                       <version>1.1.1-SNAPSHOT</version>
+                                                                       <destFileName>dmaapMMAgent.jar</destFileName>
+                                                               </artifactItem>
+                                                       </artifactItems>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-enforcer-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>enforce-no-snapshots</id>
+                                               <goals>
+                                                       <goal>enforce</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>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <groupId>com.spotify</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
@@ -157,6 +204,11 @@
                                                        <directory>${project.build.directory}</directory>
                                                        <include>**/**</include>
                                                </resource>
+                                               <resource>
+                                                       <targetPath>/</targetPath>
+                                                       <directory>${project.build.directory}</directory>
+                                                       <include>dmaapMMAgent.jar</include>
+                                               </resource>
                                        </resources>
                                </configuration>
                                <executions>
@@ -233,7 +285,7 @@
                                                <descriptorRef>jar-with-dependencies</descriptorRef>
                                        </descriptorRefs>
                                        <!-- MainClass in mainfest make a executable jar -->
-                 <finalName>kafka11aaf</finalName>
+                                       <finalName>kafka11aaf</finalName>
                                </configuration>
                                <executions>
                                        <execution>
@@ -246,47 +298,19 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       
-               <plugin>
-                       <groupId>org.apache.maven.plugins</groupId>
-                       <artifactId>maven-enforcer-plugin</artifactId>
-                       <executions>
-                               <execution>
-                                       <id>enforce-no-snapshots</id>
-                                       <goals>
-                                               <goal>enforce</goal>
-                                       </goals>
-                                       <configuration>
-                                               <rules>
-                                                       <requireReleaseDeps>
-                                                               <message>No Snapshots Allowed!</message>
-                                                               <excludes>
-                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
-                                                                       <exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
-                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude>
-                                                                       <exclude>org.onap.aaf.authz:aaf-auth-client</exclude>
-                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
-                                                                       <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
-                                                               </excludes>
-                                                       </requireReleaseDeps>
-                                               </rules>
-                                               <fail>true</fail>
-                                       </configuration>
-                               </execution>
-                       </executions>
-               </plugin>
 
                </plugins>
        </build>
 
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <KafkaImg>0.0.2</KafkaImg>
+               <KafkaImg>0.0.3</KafkaImg>
                <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>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+               <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
        </properties>
 
        <!-- Distribution management -->
@@ -301,7 +325,7 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>2.1.2-SNAPSHOT</version>
+                       <version>2.1.2</version>
                </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>