From: root <frank.obrien@amdocs.com>
Date: Wed, 10 Oct 2018 19:51:01 +0000 (-0400)
Subject: logging spring-boot to 1.5.15 for tomcat/embed CLM
X-Git-Tag: 1.5.0~57
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F70196%2F1;p=logging-analytics.git

logging spring-boot to 1.5.15 for tomcat/embed CLM

Change-Id: I52d82f4b95fcaa52ab79e662489682678703363d
Issue-ID: LOG-604
Signed-off-by: root <frank.obrien@amdocs.com>
---

diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml
index 4f84b1e..88c353e 100644
--- a/reference/logging-slf4j-demo/pom.xml
+++ b/reference/logging-slf4j-demo/pom.xml
@@ -10,7 +10,12 @@
     <name>logging-slf4j-demo</name>
     <packaging>war</packaging>
     <properties>
-        <springframework.boot.version>1.5.10.RELEASE</springframework.boot.version>
+        <!-- from 1.5.10 to not pull in spring 4.3.14/5.0.5 override of 5.0.9
+             however 4.3.17 of spring-core over 4.3.14 is not enough - need 4.3.18+
+             tomcat-embed-core 8.5.31 needs 8.5.32+ - which spring-boot 1.5.15 brings in
+             spring-expression 4.3.14 goes to 4.3.17 under 1.5.15
+         -->
+        <springframework.boot.version>1.5.15.RELEASE</springframework.boot.version>
     </properties>
 
     <dependencies>
diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml
index 9005795..fef4d05 100644
--- a/reference/logging-slf4j/pom.xml
+++ b/reference/logging-slf4j/pom.xml
@@ -80,7 +80,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>
-                <version>5.0.5.RELEASE</version>
+                <version>5.0.9.RELEASE</version>
             </dependency>
         </dependencies>
     </dependencyManagement>