Release logging-analytics

[logging-analytics.git] / reference / logging-demo / pom.xml

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 6b18179..d18dab0 100644 (file)
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -1,23 +1,17 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <!-- parent>
+  <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.2</version>
-  </parent-->
-  <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.2.1</version>
+      <version>1.5.1</version>
   </parent>
-  
   <artifactId>logging-demo</artifactId>
-  <version>1.2.2</version>
   <packaging>war</packaging>
   <name>logging-demo</name>
   <properties>
-       <jackson-2-version>2.5.1</jackson-2-version>
-       <spring.version>4.3.6.RELEASE</spring.version>
+       <jackson-2-version>2.8.6</jackson-2-version>
+       <!-- https://mvnrepository.com/artifact/org.springframework/spring-aop/5.0.5.RELEASE -->
+       <spring.version>5.1.2.RELEASE</spring.version>
        <logback.version>1.2.3</logback.version>                
   </properties>
   <build>
@@ -78,7 +72,7 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-mock-service</artifactId>
-            <version>1.2.2</version>
+            <version>1.5.1</version>
         </dependency>
        
         
@@ -113,6 +107,12 @@
         <groupId>org.glassfish.jersey.media</groupId>
         <artifactId>jersey-media-json-jackson</artifactId>
         <version>2.23</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- for spring injection in rest -->
     <dependency>
@@ -137,6 +137,10 @@
                     <artifactId>spring-beans</artifactId>
                     <groupId>org.springframework</groupId>
                 </exclusion>
+                <exclusion>
+                  <groupId>org.glassfish.hk2.external</groupId>
+                  <artifactId>bean-validator</artifactId>
+                </exclusion>
             </exclusions>
     </dependency>
 
@@ -157,11 +161,11 @@
 </dependency>
 
 <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
-<dependency>
+<!--<dependency>
   <groupId>com.fasterxml.jackson.core</groupId>
   <artifactId>jackson-databind</artifactId>
   <version>${jackson-2-version}</version>
-</dependency>
+</dependency>-->
 
 <!-- smile (binary JSON). Other artifacts in this group do other formats. -->
 <dependency>
@@ -174,12 +178,24 @@
    <groupId>com.fasterxml.jackson.jaxrs</groupId>
    <artifactId>jackson-jaxrs-json-provider</artifactId>
    <version>${jackson-2-version}</version>
+  <exclusions>
+    <exclusion>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </exclusion>
+  </exclusions>
 </dependency>
 <!-- Support for JAX-B annotations as additional configuration -->
 <dependency>
   <groupId>com.fasterxml.jackson.module</groupId>
   <artifactId>jackson-module-jaxb-annotations</artifactId>
   <version>${jackson-2-version}</version>
+  <exclusions>
+    <exclusion>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </exclusion>
+  </exclusions>
 </dependency>
     <dependency>
         <groupId>com.owlike</groupId>
@@ -238,7 +254,7 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.8.1</version>
+            <version>1.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -255,17 +271,17 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
-                <dependency>
-                        <groupId>ch.qos.logback</groupId>
-                        <artifactId>logback-core</artifactId>
-                        <version>${logback.version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>ch.qos.logback</groupId>
-                        <artifactId>logback-classic</artifactId>
-                        <version>${logback.version}</version>
-                </dependency>
-                <!-- JUnit 4.12 used to come with EELF -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <!-- JUnit 4.12 used to come with EELF -->
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>