summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <frank.obrien@amdocs.com>2018-09-27 17:03:53 -0400
committerroot <frank.obrien@amdocs.com>2018-09-27 17:04:39 -0400
commit466e0870ba1938450faf4085d6372b8cdebdb07f (patch)
tree3108fd526b53a150f89782edf37f91afd9cdf4fe
parentc3bf800394e6a89de35eaa39b9e45b57abb71033 (diff)
fix logback 1.2.3 override by eelf 113 dep
Change-Id: I29af65e00d6c75e0c95cd62f3798ea80886db955 Issue-ID: LOG-692 Signed-off-by: root <frank.obrien@amdocs.com>
-rw-r--r--pom.xml2
-rw-r--r--reference/pom.xml16
2 files changed, 16 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index ccfa423..f6de19e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-analytics</artifactId>
diff --git a/reference/pom.xml b/reference/pom.xml
index 0844c9a..79daec0 100644
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -103,10 +103,24 @@
</plugins>
</reporting>
<dependencies>
- <dependency>
+ <!-- pulls in banned logback-core 1.1.3 -->
+ <!-- dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
<version>1.0.0</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>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>