X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fbuscontroller.git;a=blobdiff_plain;f=pom.xml;h=c3e2587a7500b04c25072ee3e5178e442c263448;hp=82df7de62f33215f8de8b82995e5ba9d4a1c0c1e;hb=ce06845e9df9cdfa92db2b75c7f44bf3b96a4812;hpb=233bc1907cc52c26f67b69c3234ba42931c14a2f

diff --git a/pom.xml b/pom.xml
index 82df7de..c3e2587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,350 +1,60 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--* ============LICENSE_START==================================================== 
+   * =========================================================================== 
+   * org.onap.aaf 
+   * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. 
+   * =========================================================================== 
+   * Licensed under the Apache License, Version 2.0 (the "License"); 
+   * you may not use this file except in compliance with the License. 
+   * You may obtain a copy of the License at 
+   * 
+  * http://www.apache.org/licenses/LICENSE-2.0 
+  * 
+  * Unless required by applicable law or agreed to in writing, software 
+  * distributed under the License is distributed on an "AS IS" BASIS, 
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+  * See the License for the specific language governing permissions and 
+  * limitations under the License. 
+  * ============LICENSE_END==================================================== 
+  * -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.dmaap.buscontroller</groupId>
-  <artifactId>buscontroller</artifactId>
-  <version>1.0.1</version>
+  <artifactId>parent</artifactId>
+  <version>1.1.1-SNAPSHOT</version>
   <name>dmaap-buscontroller</name>
+  <packaging>pom</packaging>
+  
   <parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>oparent</artifactId>
-    <version>0.1.1</version>
-    <relativePath/>
+  <groupId>org.onap.oparent</groupId>
+  <artifactId>oparent</artifactId>
+  <version>1.2.2</version>
   </parent>
-  <build>
-    <finalName>buscontroller</finalName>
 
+  <properties>
+    <multiproject.basedir>${basedir}</multiproject.basedir>
+        <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
+        <skip.docker.build>true</skip.docker.build>
+        <skip.docker.tag>true</skip.docker.tag>
+        <skip.docker.push>true</skip.docker.push>
+  </properties>
+
+  <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M1</version>
-        <executions>
-          <execution>
-            <id>enforce-no-snapshots</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
+        <plugin>
+            <groupId>io.fabric8</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <version>0.28.0</version>  
             <configuration>
-              <rules>
-                <requireReleaseDeps>
-                  <message>No Snapshots Allowed!</message>
-                  <excludes>
-                    <exclude>org.onap.dmaap.dbcapi:dbcapi</exclude>
-                  </excludes>
-                </requireReleaseDeps>
-              </rules>
-              <fail>true</fail>
+                <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
             </configuration>
-          </execution>
-            </executions>
-      </plugin>
-	  <plugin>
-        <!--Special goal to populate target/libs with dependencies to place in docker image -->
-	    <groupId>org.apache.maven.plugins</groupId>
-	    <artifactId>maven-dependency-plugin</artifactId>
-	    <executions>
-	      <execution>
-		    <phase>install</phase>
-		    <goals>
-		      <goal>copy-dependencies</goal>
-		    </goals>
-		    <configuration>
-		      <outputDirectory>${project.build.directory}/dependency</outputDirectory>
-		    </configuration>
-	      </execution>
-       </executions>
-      </plugin>
-
-	<!-- for Distribution management -->
-		<plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-site-plugin</artifactId>
-		  <version>3.6</version>
-		  <dependencies>
-			<dependency>
-			  <groupId>org.apache.maven.wagon</groupId>
-			  <artifactId>wagon-webdav-jackrabbit</artifactId>
-			  <version>2.10</version>
-			</dependency>
-		  </dependencies>
-		</plugin>
-
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <versionRange>[2.10,)</versionRange>
-					    <phase>install</phase>
-                        <goals>
-                          <goal>copy-dependencies</goal>
-                        </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
         </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <profiles>
-   <profile>
-    <id>docker</id>
-	<build>
-	 <plugins>
-      <plugin>
-		<groupId>com.spotify</groupId>
-		 <artifactId>docker-maven-plugin</artifactId>
-		 <version>1.0.0</version>
-		 <configuration>
-				 <imageName>${docker.image}</imageName>
-			     <dockerDirectory>${project.basedir}</dockerDirectory>
-				 <!--   <serverId>docker-hub</serverId>   -->
-				 <imageTags>
-						 <imageTag>${artifact.version}</imageTag>
-						 <imageTag>latest</imageTag>
-				 </imageTags>
-				 <forceTags>true</forceTags>
-				 <resources>
-						 <resource>
-								 <targetPath>/</targetPath>
-								 <directory>${project.basedir}</directory>
-								 <excludes>
-									<exclude>target/**/*</exclude>
-									<exclude>pom.xml</exclude>
-								</excludes>
-						 </resource>
-<!-- what is this?
-						 <resource>
-								 <targetPath>/</targetPath>
-								 <directory>${project.build.directory}</directory>
-								 <include>**/**</include>
-						 </resource>
- -->
-				 </resources>
-		 </configuration>
-		 <executions>
-				 <execution>
-						 <id>build-image</id>
-						 <phase>package</phase>
-						 <goals>
-								 <goal>build</goal>
-						 </goals>
-						 <configuration>
-								 <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-						 </configuration>
-				 </execution>
-
-				 <execution>
-						 <id>tag-image-project-version</id>
-						 <phase>package</phase>
-						 <goals>
-								 <goal>tag</goal>
-						 </goals>
-						 <configuration>
-								 <image>${docker.image}</image>
-								 <newName>${docker.push.registry}/${docker.image}:${artifact.version}</newName>
-								 <skipDockerTag>${skip.docker.push}</skipDockerTag>
-						 </configuration>
-				 </execution>
-
-				 <execution>
-						 <id>tag-image-latest</id>
-						 <phase>package</phase>
-						 <goals>
-								 <goal>tag</goal>
-						 </goals>
-						 <configuration>
-								 <image>${docker.image}</image>
-								 <newName>${docker.push.registry}/${docker.image}:latest</newName>
-								 <skipDockerTag>${skip.docker.push}</skipDockerTag>
-						 </configuration>
-				 </execution>
-
-				 <execution>
-						 <id>push-image-latest</id>
-						 <phase>deploy</phase>
-						 <goals>
-								 <goal>push</goal>
-						 </goals>
-						 <configuration>
-								 <imageName>${docker.push.registry}/${docker.image}:${artifact.version}</imageName>
-								 <skipDockerPush>${skip.docker.push}</skipDockerPush>
-						 </configuration>
-				 </execution>
-
-				 <execution>
-						 <id>push-image</id>
-						 <phase>deploy</phase>
-						 <goals>
-								 <goal>push</goal>
-						 </goals>
-						 <configuration>
-								 <imageName>${docker.push.registry}/${docker.image}:latest</imageName>
-								 <skipDockerPush>${skip.docker.push}</skipDockerPush>
-						 </configuration>
-				 </execution>
-		 </executions>
-      </plugin>
-	 </plugins>
-	</build>
-   </profile>
-  </profiles>
-  <dependencyManagement>
-    <dependencies>
- 
-      <dependency>
-        <groupId>org.glassfish.jersey</groupId>
-        <artifactId>jersey-bom</artifactId>
-        <version>${jersey.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-        <dependency>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-core</artifactId>
-        <version>1.5.13</version>
-      </dependency>
-      <dependency>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-jersey2-jaxrs</artifactId>
-        <version>1.5.13</version>
-      </dependency>
-       <dependency>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-annotations</artifactId>
-        <version>1.5.13</version>
-      </dependency>   
-    <dependency>
-      <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet-core</artifactId>
-      <!-- use the following artifactId if you don't need servlet 2.x compatibility -->
-      <!-- artifactId>jersey-container-servlet</artifactId -->
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-moxy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jettyVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jettyVersion}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-      <version>${jettyVersion}</version>
-      <scope>compile</scope>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.6</version>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>9.4.1208.jre7</version>
-    </dependency>
-  	<dependency>
-		<groupId>com.att.eelf</groupId> 
-		<artifactId>eelf-core</artifactId> 
-		<version>${eelf.version}</version> 
-	</dependency>
-	<dependency>
-		<groupId>org.onap.dmaap.dbcapi</groupId>
-		<artifactId>dbcapi</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
-	</dependency>
-  </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.4</version>
-        <configuration>
-          <failOnError>false</failOnError>
-          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-          <docletArtifact>
-            <groupId>org.umlgraph</groupId>
-            <artifactId>umlgraph</artifactId>
-            <version>5.6</version>
-          </docletArtifact>
-          <additionalparam>-views</additionalparam>
-          <useStandardDocletOptions>true</useStandardDocletOptions>
-        </configuration>
-      </plugin>
     </plugins>
-  </reporting>
-
-  <distributionManagement>
-	<site>
-		<id>ecomp-site</id>
-		<url>dav:${nexusproxy}${sitePath}</url>
-	</site>
-  </distributionManagement>
-  <properties>
-    <jersey.version>2.16</jersey.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jettyVersion>9.3.7.v20160115</jettyVersion>
-    <eelf.version>0.0.1</eelf.version>
-    <artifact.version>1.0.1</artifact.version>
-		<!--  SONAR  -->
-		 <jacoco.version>0.7.7.201606060606</jacoco.version>
-	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-	    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-	    <!-- Default Sonar configuration -->
-	    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-	    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-	    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-	    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-
-	<!-- docker image -->
-		 <docker.image>onap/dmaap/buscontroller</docker.image>
-		 <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>
+  </build>
 
-	<!-- for Distribution Management -->
-		<sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}</sitePath>
-  </properties>
-  <description>Packaging Platform (DMaaP) Bus Controller API as a Docker container. </description>
+  <modules>
+     <module>dmaap-bc</module>
+     <module>dbc-client</module>
+  </modules>
 </project>