Upversion router-core after release

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

diff --git a/pom.xml b/pom.xml
index 57a0873..56dad75 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 Amdocs
+================================================================================
+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/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>1.1.0</version>
    </parent>
 
    <groupId>org.onap.aai.router-core</groupId>
    <artifactId>router-core</artifactId>
    <packaging>bundle</packaging>
-   <version>1.1.0-SNAPSHOT</version>
+   <version>1.2.2-SNAPSHOT</version>
    <name>aai-router-core</name>
    <properties>
       <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
@@ -18,7 +38,7 @@
       <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}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+      <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>
    </properties>
@@ -26,25 +46,42 @@
       <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-core</artifactId>
-         <version>2.15.5</version>
+         <version>2.20.1</version>
       </dependency>
       <!-- support camel documentation -->
       <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>apt</artifactId>
-         <version>2.15.5</version>
+         <version>2.20.1</version>
       </dependency>
       <!-- logging -->
       <dependency>
-         <groupId>org.openecomp.aai.logging-service</groupId>
+         <groupId>org.onap.aai.logging-service</groupId>
          <artifactId>common-logging</artifactId>
-         <version>1.0.0</version>
+         <version>1.2.2</version>
       </dependency>
       <dependency>
          <groupId>com.att.nsa</groupId>
          <artifactId>cambriaClient</artifactId>
          <version>0.0.1</version>
+        <exclusions>
+                <exclusion>
+                  <groupId>org.apache.httpcomponents</groupId>
+                 <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>org.apache.httpcomponents</groupId>
+                 <artifactId>httpclient-cache</artifactId>
+                </exclusion>
+            </exclusions>
       </dependency>
+
+      <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+      </dependency>
+
       <!-- Dependencies for the REST Client component -->
       <!-- Library to obfuscate encrypted passwords -->
       <dependency>
@@ -54,16 +91,16 @@
       </dependency>
       <!-- ECOMP REST Client Library. -->
       <dependency>
-         <groupId>org.openecomp.aai</groupId>
+         <groupId>org.onap.aai</groupId>
          <artifactId>rest-client</artifactId>
-         <version>1.1.0-SNAPSHOT</version>
+         <version>1.1.0</version>
       </dependency>
       <!-- End REST Client specific dependencies. -->
       <!-- testing -->
       <dependency>
          <groupId>org.apache.camel</groupId>
          <artifactId>camel-test</artifactId>
-         <version>2.15.5</version>
+         <version>2.20.1</version>
          <scope>test</scope>
       </dependency>
    </dependencies>
@@ -95,12 +132,13 @@
             <extensions>true</extensions>
             <configuration>
                <instructions>
-                  <Bundle-SymbolicName>org.openecomp.router-core</Bundle-SymbolicName>
+                  <Bundle-SymbolicName>org.onap.aai.router-core</Bundle-SymbolicName>
                   <Export-Service>org.apache.camel.spi.ComponentResolver;component=event-bus</Export-Service>
                </instructions>
             </configuration>
          </plugin>
-         <!-- license plugin -->
+        <!-- license plugin -->
+        <!-- Uncomment this to add a license header to every source file
          <plugin>
             <groupId>com.mycila</groupId>
             <artifactId>license-maven-plugin</artifactId>
@@ -119,7 +157,9 @@
                   <phase>process-sources</phase>
                </execution>
             </executions>
-         </plugin>
+        </plugin>
+        -->
+
          <!-- Checkstyle plugin - used to report on compliance with -->
          <!-- the Google style guide. -->
          <plugin>