Added test scope to powermock dependency

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

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 60fbe98..dec4c4b 100644 (file)
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -3,15 +3,16 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>logging-demo</artifactId>
   <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>
-       <logback.version>1.2.3</logback.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>
       <plugins>
@@ -20,7 +21,6 @@
               <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-site-plugin</artifactId>
-                  <version>3.6</version>
               </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -69,18 +69,13 @@
       </pluginManagement>
   </build>
     <dependencies>
-        <dependency>
-            <groupId>org.onap.logging-analytics</groupId>
-            <artifactId>logging-library</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-mock-service</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
-        
-        
+
+
             <!-- https://jersey.java.net/documentation/latest/modules-and-dependencies.html -->
     <dependency>
         <groupId>javax.ws.rs</groupId>
@@ -112,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>
@@ -136,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>
 
@@ -156,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>
@@ -173,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>
@@ -197,7 +214,7 @@
         <version>3.0.1</version>
         <scope>provided</scope>
     </dependency>
-   
+
        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
@@ -229,15 +246,15 @@
             <version>${spring.version}</version>
             <!--scope>test</scope-->
         </dependency>
-        <dependency> 
-     <groupId>org.springframework</groupId> 
-     <artifactId>spring-aspects</artifactId> 
-     <version>${spring.version}</version> 
+        <dependency>
+     <groupId>org.springframework</groupId>
+     <artifactId>spring-aspects</artifactId>
+     <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.8.1</version>
+            <version>1.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -254,15 +271,28 @@
             <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>  
+        <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>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>