From: Steven Blimkie <Steven.Blimkie@amdocs.com>
Date: Tue, 14 Aug 2018 21:03:49 +0000 (+0000)
Subject: Merge "Merge the POMBA code to ONAP AAI data router"
X-Git-Tag: 1.3.0~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fdata-router.git;a=commitdiff_plain;h=ee1dbd32cba7c254ff7d7780fdd2d622bf5500f3;hp=-c

Merge "Merge the POMBA code to ONAP AAI data router"
---

ee1dbd32cba7c254ff7d7780fdd2d622bf5500f3
diff --combined pom.xml
index 6294bbd,28de9b2..317cd3d
--- a/pom.xml
+++ b/pom.xml
@@@ -38,10 -38,10 +38,10 @@@ limitations under the License
        <camel-spring-boot.version>2.20.0</camel-spring-boot.version>
        <docker.location>${basedir}/target</docker.location>
        <absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
-       <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot> 
-          property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT" 
-          version, THIS will be used as your directory structure. If you do NOT want 
-          this, simply remove the "-SNAPSHOT" from your <version> declaration at the 
+       <!-- For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot>
+          property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT"
+          version, THIS will be used as your directory structure. If you do NOT want
+          this, simply remove the "-SNAPSHOT" from your <version> declaration at the
           top of pom.xml -->
        <distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>
        <!-- For SOA Cloud Installation -->
@@@ -49,8 -49,8 +49,8 @@@
        <installOwnerGroup>aaiadmin</installOwnerGroup>
        <ownerManagementGroup>com.att.csid.lab</ownerManagementGroup>
  
-       <!-- Port Selection. A value of 0 will allow for dynamic port selection. 
-          For local testing, you may choose to hardcode this value to something like 
+       <!-- Port Selection. A value of 0 will allow for dynamic port selection.
+          For local testing, you may choose to hardcode this value to something like
           8080 -->
        <serverPort>0</serverPort>
        <sslport>9502</sslport>
@@@ -121,7 -121,7 +121,7 @@@
        <dependency>
           <groupId>javax.ws.rs</groupId>
           <artifactId>javax.ws.rs-api</artifactId>
-          <version>2.0.1</version>
+          <version>2.1</version>
        </dependency>
        <dependency>
           <groupId>org.powermock</groupId>
@@@ -175,7 -175,7 +175,7 @@@
           <!--<version>1.3.0-SNAPSHOT</version>-->
        <!--</dependency>-->
        <!--<dependency>-->
-      	 <!--<groupId>org.onap.aai.aai-common</groupId>-->
+         <!--<groupId>org.onap.aai.aai-common</groupId>-->
           <!--<artifactId>aai-schema-ingest</artifactId>-->
           <!--<version>1.2.2</version>-->
           <!--<exclusions>-->
@@@ -226,7 -226,7 +226,7 @@@
           <version>1.1.0</version>
        </dependency>
  
- 	  <dependency>
+     <dependency>
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>
          <version>${version.com.google.guava}</version>
@@@ -341,6 -341,13 +341,6 @@@
              <groupId>com.spotify</groupId>
              <artifactId>docker-maven-plugin</artifactId>
              <version>0.4.11</version>
 -            <dependencies>
 -                <dependency>
 -                    <groupId>com.github.jnr</groupId>
 -                    <artifactId>jnr-unixsocket</artifactId>
 -                    <version>0.13</version>
 -                </dependency>
 -            </dependencies>
              <configuration>
                 <verbose>true</verbose>
                 <serverId>docker-hub</serverId>
@@@ -353,27 -360,27 +353,27 @@@
              </configuration>
           </plugin>
           <!-- license plugin -->
-          <!-- Uncomment this to add a license header to every source file 
- 	<plugin>
- 		<groupId>com.mycila</groupId>
- 		<artifactId>license-maven-plugin</artifactId>
- 		<version>3.0</version>
- 		<configuration>
- 			<header>License.txt</header>
- 			<includes>
- 				<include>src/main/java/**</include>
- 				<include>src/test/java/**</include>
- 			</includes>
- 		</configuration>
- 		<executions>
- 			<execution>
- 				<goals>
- 					<goal>format</goal>
- 				</goals>
- 				<phase>process-sources</phase>
- 			</execution>
- 		</executions>
- 	</plugin> -->
+          <!-- Uncomment this to add a license header to every source file
+   <plugin>
+     <groupId>com.mycila</groupId>
+     <artifactId>license-maven-plugin</artifactId>
+     <version>3.0</version>
+     <configuration>
+       <header>License.txt</header>
+       <includes>
+         <include>src/main/java/**</include>
+         <include>src/test/java/**</include>
+       </includes>
+     </configuration>
+     <executions>
+       <execution>
+         <goals>
+           <goal>format</goal>
+         </goals>
+         <phase>process-sources</phase>
+       </execution>
+     </executions>
+   </plugin> -->
           <plugin>
              <groupId>org.sonatype.plugins</groupId>
              <artifactId>nexus-staging-maven-plugin</artifactId>