X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Frouter-core.git;a=blobdiff_plain;f=pom.xml;h=8c5901a942171ab1dc70705325e008a3a15230c4;hp=a23f25bddbe79385a8d5dd6f0f677e225a2f3c1a;hb=refs%2Fheads%2Fmaster;hpb=cbd5b9b82dddb4ae467571ef86dcdccc2268175f

diff --git a/pom.xml b/pom.xml
index a23f25b..8c5901a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 ============LICENSE_START=======================================================
 org.onap.aai
@@ -18,48 +19,40 @@ 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/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.1.0</version>
+      <groupId>org.onap.aai.aai-common</groupId>
+      <artifactId>aai-parent</artifactId>
+      <version>1.6.8</version>
    </parent>
 
    <groupId>org.onap.aai.router-core</groupId>
    <artifactId>router-core</artifactId>
    <packaging>bundle</packaging>
-   <version>1.3.0-SNAPSHOT</version>
+   <version>1.8.0-SNAPSHOT</version>
    <name>aai-router-core</name>
    <properties>
       <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-      <event.client.version>1.3.0-SNAPSHOT</event.client.version>
+      <aai.common.version>1.6.8</aai.common.version>
+      <event.client.version>1.6.4</event.client.version>
       <!-- Sonar Properties -->
-      <sonar.language>java</sonar.language>
-      <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-      <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-      <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-      <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
-      <sonar.projectVersion>${project.version}</sonar.projectVersion>
+      <jacoco.line.coverage.limit>0.70</jacoco.line.coverage.limit>
+      <camel-spring-boot.version>3.4.0</camel-spring-boot.version>
    </properties>
+
    <dependencies>
       <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-core</artifactId>
-         <version>2.20.1</version>
+         <version>${camel-spring-boot.version}</version>
       </dependency>
       <!-- support camel documentation -->
-      <dependency>
-         <groupId>org.apache.camel</groupId>
-         <artifactId>apt</artifactId>
-         <version>2.20.1</version>
-      </dependency>
       <!-- logging -->
       <dependency>
          <groupId>org.onap.aai.logging-service</groupId>
          <artifactId>common-logging</artifactId>
-         <version>1.2.2</version>
+         <version>1.5.0</version>
       </dependency>
 
       <dependency>
@@ -78,21 +71,26 @@ limitations under the License.
           <version>${event.client.version}</version>
       </dependency>
 
+      <dependency>
+           <groupId>org.onap.aai.event-client</groupId>
+           <artifactId>event-client-rabbitmq</artifactId>
+           <version>${event.client.version}</version>
+      </dependency>
+
       <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.5</version>
       </dependency>
 
       <dependency>
-         <groupId>org.onap.aai.aai-common</groupId>
+         <groupId>org.onap.aai.schema-service</groupId>
          <artifactId>aai-schema</artifactId>
-         <version>1.3.0-SNAPSHOT</version>
+         <version>1.6.6</version>
       </dependency>
       <dependency>
          <groupId>org.onap.aai.aai-common</groupId>
          <artifactId>aai-schema-ingest</artifactId>
-         <version>1.2.2</version>
+         <version>1.4.1</version>
          <!--<exclusions>-->
             <!--<exclusion>-->
                <!--<groupId>com.google.guava</groupId>-->
@@ -106,36 +104,89 @@ limitations under the License.
       <dependency>
          <groupId>org.eclipse.jetty</groupId>
          <artifactId>jetty-security</artifactId>
-         <version>9.3.8.RC0</version>
       </dependency>
       <!-- ECOMP REST Client Library. -->
       <dependency>
          <groupId>org.onap.aai</groupId>
          <artifactId>rest-client</artifactId>
-         <version>1.1.0</version>
+         <version>1.2.1</version>
       </dependency>
       <!-- End REST Client specific dependencies. -->
       <!-- testing -->
       <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-test</artifactId>
-         <version>2.20.1</version>
+         <version>${camel-spring-boot.version}</version>
          <scope>test</scope>
       </dependency>
     <dependency>
        <groupId>org.mockito</groupId>
        <artifactId>mockito-all</artifactId>
-       <version>1.10.19</version>
        <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
    </dependencies>
    <build>
       <defaultGoal>install</defaultGoal>
       <plugins>
+         <plugin>
+         <groupId>org.jacoco</groupId>
+         <artifactId>jacoco-maven-plugin</artifactId>
+         <configuration combine.self="append">
+            <excludes>
+               <exclude>**/*Configurer.class</exclude>
+            </excludes>
+         </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-package-maven-plugin</artifactId>
+            <version>${camel-spring-boot.version}</version>
+            <executions>
+               <execution>
+                  <id>generate</id>
+                  <goals>
+                     <goal>generate-component</goal>
+                  </goals>
+                  <phase>process-classes</phase>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>initialize</phase>
+                  <goals>
+                     <goal>add-source</goal>
+                     <goal>add-resource</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>src/generated/java</source>
+                     </sources>
+                     <resources>
+                        <resource>
+                           <directory>src/generated/resources</directory>
+                        </resource>
+                     </resources>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.5.1</version>
+            <version>3.8.1</version>
             <configuration>
                <source>1.8</source>
                <target>1.8</target>
@@ -193,41 +244,14 @@ limitations under the License.
             <version>3.6</version>
          </plugin>
          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.7</version>
-            <extensions>true</extensions>
-            <configuration>
-               <nexusUrl>${onap.nexus.url}</nexusUrl>
-               <stagingProfileId>176c31dfe190a</stagingProfileId>
-               <serverId>ecomp-staging</serverId>
-            </configuration>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-deploy-plugin</artifactId>
          </plugin>
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>sonar-maven-plugin</artifactId>
             <version>3.2</version>
          </plugin>
-         <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.7.7.201606060606</version>
-            <configuration>
-               <dumpOnExit>true</dumpOnExit>
-            </configuration>
-            <executions>
-               <execution>
-                  <id>jacoco-initialize-unit-tests</id>
-                  <goals>
-                     <goal>prepare-agent</goal>
-                  </goals>
-                  <configuration>
-                     <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                     <!-- <append>true</append> -->
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
       </plugins>
    </build>