X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fdata-router.git;a=blobdiff_plain;f=pom.xml;h=d1b680a856dd6a8ff9d3bbf51bde51bb16daaf87;hp=e955c804bbbf52d90e144be75a734764d8bce6ad;hb=1161099a2c332ec9ac835ec97363fe918edbb66b;hpb=7ef885b28efb072407fc88fac593cde3e29da38d

diff --git a/pom.xml b/pom.xml
index e955c80..d1b680a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<!--
+<!--
 ============LICENSE_START=======================================================
 org.onap.aai
 ================================================================================
@@ -25,23 +25,23 @@ limitations under the License.
    <parent>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-parent</artifactId>
-      <version>1.5.12.RELEASE</version>
+      <version>1.5.18.RELEASE</version>
       <relativePath />
    </parent>
    <groupId>org.onap.aai.data-router</groupId>
    <artifactId>data-router</artifactId>
-   <version>1.3.0-SNAPSHOT</version>
+   <version>1.3.3-SNAPSHOT</version>
    <name>aai-data-router</name>
 
    <properties>
       <java.version>1.8</java.version>
-      <camel-spring-boot.version>2.20.0</camel-spring-boot.version>
+      <camel-spring-boot.version>2.21.1</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>
@@ -68,6 +68,7 @@ limitations under the License.
       <sonar.projectVersion>${project.version}</sonar.projectVersion>
       <logback.version>1.2.3</logback.version>
       <version.com.google.guava>16.0.1</version.com.google.guava>
+      <shemaUnpackVersion>onap</shemaUnpackVersion>
    </properties>
 
    <dependencies>
@@ -93,7 +94,7 @@ limitations under the License.
       <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-core</artifactId>
-         <version>2.20.1</version>
+         <version>${camel-spring-boot.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.camel</groupId>
@@ -102,13 +103,12 @@ limitations under the License.
       <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-cxf</artifactId>
-         <version>2.20.1</version>
+         <version>${camel-spring-boot.version}</version>
       </dependency>
       <!-- Spring dependencies -->
       <dependency>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter-web</artifactId>
-
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
@@ -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>
@@ -157,40 +157,46 @@ limitations under the License.
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>dom4j</groupId>
-         <artifactId>dom4j</artifactId>
-         <version>1.6.1</version>
-         <scope>provided</scope>
-      </dependency>
+		  <groupId>org.dom4j</groupId>
+		  <artifactId>dom4j</artifactId>
+		  <scope>provided</scope>
+		  <version>2.1.1</version>
+	  </dependency>
 
       <dependency>
          <groupId>com.att.aft</groupId>
          <artifactId>dme2</artifactId>
-         <version>3.1.200</version>
+         <version>3.1.200-oss</version>
          <scope>provided</scope>
       </dependency>
-      <dependency>
-         <groupId>org.onap.aai.aai-common</groupId>
-         <artifactId>aai-schema</artifactId>
-         <version>1.3.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-     	 <groupId>org.onap.aai.aai-common</groupId>
-         <artifactId>aai-schema-ingest</artifactId>
-         <version>1.2.2</version>
-         <exclusions>
-             <exclusion>
-                 <groupId>com.google.guava</groupId>
-                 <artifactId>guava</artifactId>
-             </exclusion>
-         </exclusions>
-      </dependency>
+      <!--<dependency>-->
+         <!--<groupId>org.onap.aai.aai-common</groupId>-->
+         <!--<artifactId>aai-schema</artifactId>-->
+         <!--<version>1.3.0-SNAPSHOT</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.onap.aai.aai-common</groupId>-->
+         <!--<artifactId>aai-schema-ingest</artifactId>-->
+         <!--<version>1.2.2</version>-->
+         <!--<exclusions>-->
+             <!--<exclusion>-->
+                 <!--<groupId>com.google.guava</groupId>-->
+                 <!--<artifactId>guava</artifactId>-->
+             <!--</exclusion>-->
+         <!--</exclusions>-->
+      <!--</dependency>-->
       <dependency>
          <groupId>org.onap.aai.router-core</groupId>
          <artifactId>router-core</artifactId>
-         <version>1.3.0-SNAPSHOT</version>
+         <version>1.3.1</version>
       </dependency>
 
+      <dependency>
+         <groupId>org.onap.aai.aai-common</groupId>
+         <artifactId>aai-schema-ingest</artifactId>
+         <version>1.3.0</version>
+      </dependency>
+      
       <dependency>
          <groupId>org.json</groupId>
          <artifactId>json</artifactId>
@@ -226,7 +232,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>
@@ -237,6 +243,72 @@ limitations under the License.
    <build>
       <finalName>${project.artifactId}</finalName>
       <plugins>
+        <!-- jacoco-maven-plugin provides the basic report creation during unit testing, such as code-coverage, sonar, etc. -->
+         <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <executions>
+               <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                    is passed as VM argument when Maven the Surefire plugin is executed. -->
+               <execution>
+                  <id>pre-unit-test</id>
+                  <goals>
+                     <goal>prepare-agent</goal>
+                  </goals>
+                  <configuration>
+                     <!-- Sets the path to the file which contains the execution data. -->
+                     <destFile>${sonar.jacoco.reportPath}</destFile>
+                     <propertyName>surefireArgLine</propertyName>
+                  </configuration>
+               </execution>
+               <!-- Ensures that the code coverage report for unit tests is created
+                    after unit tests have been run. -->
+               <execution>
+                  <id>post-unit-test</id>
+                  <phase>test</phase>
+                  <goals>
+                     <goal>report</goal>
+                  </goals>
+                  <configuration>
+                     <!-- Sets the path to the file which contains the execution data. -->
+                     <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                     <!-- Sets the output directory for the code coverage report. -->
+                     <outputDirectory>${jacoco.path}</outputDirectory>
+                  </configuration>
+               </execution>
+               <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                    is passed as VM argument when Maven the Failsafe plugin is executed. -->
+               <execution>
+                  <id>pre-integration-test</id>
+                  <phase>pre-integration-test</phase>
+                  <goals>
+                     <goal>prepare-agent</goal>
+                  </goals>
+                  <configuration>
+                     <!-- Sets the path to the file which contains the execution data. -->
+                     <destFile>${sonar.jacoco.itReportPath}</destFile>
+                     <!-- Sets the name of the property containing the settings for JaCoCo
+                          runtime agent. -->
+                     <propertyName>failsafeArgLine</propertyName>
+                  </configuration>
+               </execution>
+               <!-- Ensures that the code coverage report for integration tests after
+                    integration tests have been run. -->
+               <execution>
+                  <id>post-integration-test</id>
+                  <phase>post-integration-test</phase>
+                  <goals>
+                     <goal>report</goal>
+                  </goals>
+                  <configuration>
+                     <!-- Sets the path to the file which contains the execution data. -->
+                     <dataFile>${sonar.jacoco.itReportPath}/</dataFile>
+                     <!-- Sets the output directory for the code coverage report. -->
+                     <outputDirectory>${jacoco.itPath}</outputDirectory>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <!-- Checkstyle plugin - used to report on compliance with -->
          <!-- the Google style guide. -->
          <plugin>
@@ -327,10 +399,10 @@ limitations under the License.
                     <artifactItem>
                       <groupId>org.onap.aai.aai-common</groupId>
                       <artifactId>aai-schema</artifactId>
-                      <version>1.2.2</version>
+                      <version>1.3.0</version>
                       <type>jar</type>
-                      <includes>oxm/</includes>
-                      <outputDirectory>${project.build.directory}/bundleconfig-local/etc</outputDirectory>
+                      <includes>/${shemaUnpackVersion}/oxm/</includes>
+                      <outputDirectory>${project.build.directory}/oxm</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                   </configuration>
@@ -341,13 +413,6 @@ limitations under the License.
             <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>
@@ -360,27 +425,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>