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

[aai/data-router.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6294bbd..317cd3d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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 @@ limitations under the License.
       <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 @@ limitations under the License.
       <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 @@ limitations under the License.
          <!--<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 @@ limitations under the License.
          <version>1.1.0</version>
       </dependency>
 
-         <dependency>
+    <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <version>${version.com.google.guava}</version>
@@ -353,27 +353,27 @@ limitations under the License.
             </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>