Upversion rest-client in master

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

diff --git a/pom.xml b/pom.xml
index 5577015..84dcd3c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,17 +24,17 @@ limitations under the License.
    <parent>
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
-      <version>1.2.0</version>
+      <version>2.0.0</version>
    </parent>
 
    <groupId>org.onap.aai.router-core</groupId>
    <artifactId>router-core</artifactId>
    <packaging>bundle</packaging>
-   <version>1.4.0-SNAPSHOT</version>
+   <version>1.6.0-SNAPSHOT</version>
    <name>aai-router-core</name>
    <properties>
       <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-      <event.client.version>1.3.0</event.client.version>
+      <event.client.version>1.5.0</event.client.version>
       <!-- Sonar Properties -->
       <sonar.language>java</sonar.language>
       <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -43,7 +43,51 @@ limitations under the License.
       <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
       <sonar.projectVersion>${project.version}</sonar.projectVersion>
       <camel-spring-boot.version>2.22.1</camel-spring-boot.version>
+      <jacoco.line.coverage.limit>0.70</jacoco.line.coverage.limit>
+      <springframework.version>4.3.18.RELEASE</springframework.version>
    </properties>
+
+   <dependencyManagement>
+     <dependencies>
+       <dependency>
+         <groupId>ch.qos.logback</groupId>
+         <artifactId>logback-classic</artifactId>
+         <version>1.1.3</version>
+       </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+     </dependencies>
+   </dependencyManagement>
+
    <dependencies>
       <dependency>
          <groupId>org.apache.camel</groupId>
@@ -60,7 +104,7 @@ limitations under the License.
       <dependency>
          <groupId>org.onap.aai.logging-service</groupId>
          <artifactId>common-logging</artifactId>
-         <version>1.2.2</version>
+         <version>1.5.0</version>
       </dependency>
 
       <dependency>
@@ -79,6 +123,12 @@ 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>
@@ -86,14 +136,14 @@ limitations under the License.
       </dependency>
 
       <dependency>
-         <groupId>org.onap.aai.aai-common</groupId>
+         <groupId>org.onap.aai.schema-service</groupId>
          <artifactId>aai-schema</artifactId>
-         <version>1.3.0</version>
+         <version>1.0.5</version>
       </dependency>
       <dependency>
          <groupId>org.onap.aai.aai-common</groupId>
          <artifactId>aai-schema-ingest</artifactId>
-         <version>1.3.0</version>
+         <version>1.4.1</version>
          <!--<exclusions>-->
             <!--<exclusion>-->
                <!--<groupId>com.google.guava</groupId>-->
@@ -107,13 +157,13 @@ limitations under the License.
       <dependency>
          <groupId>org.eclipse.jetty</groupId>
          <artifactId>jetty-security</artifactId>
-         <version>9.3.8.RC0</version>
+         <version>9.3.24.v20180605</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 -->
@@ -205,15 +255,8 @@ 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>
@@ -228,16 +271,30 @@ limitations under the License.
                <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>
+                    <id>default-check</id>
+                    <goals>
+                        <goal>check</goal>
+                    </goals>
+                    <configuration>
+                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                        <rules>
+                            <!--  implementation is needed only for Maven 2  -->
+                           <rule implementation="org.jacoco.maven.RuleConfiguration">
+                               <element>BUNDLE</element>
+                                <limits>
+                                  <limit implementation="org.jacoco.report.check.Limit">
+                                        <counter>LINE</counter>
+                                       <value>COVEREDRATIO</value>
+                                       <minimum>${jacoco.line.coverage.limit}</minimum>
+                                   </limit>
+                                </limits>
+                            </rule>
+                        </rules>
+                    </configuration>
+                  </execution>                        
+               
             </executions>
          </plugin>
       </plugins>