Merge pull request #80 from zalando/bugfix/cve-2018-1196

Bumped spring and spring boot versions
zalando · Apr 21, 2018 · 160740d · 160740d
2 parents 7818248 + 102f817
commit 160740d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -58,8 +58,8 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <slf4j.version>1.7.21</slf4j.version>
-        <spring.version>4.3.2.RELEASE</spring.version>
-        <spring-boot.version>1.4.0.RELEASE</spring-boot.version>
+        <spring.version>4.3.16.RELEASE</spring.version>
+        <spring-boot.version>1.5.12.RELEASE</spring-boot.version>
 
         <junit-platform.version>1.1.0</junit-platform.version>
         <junit-jupiter.version>5.1.0</junit-jupiter.version>

diff --git a/tracer-spring-boot-starter/src/test/resources/application-flow-id.yml b/tracer-spring-boot-starter/src/test/resources/application-flow-id.yml
@@ -1,4 +1,4 @@
-spring.main.banner_mode: OFF
+spring.main.banner_mode: 'OFF'
 
 tracer.traces:
-  X-Flow-ID: flow-id
+  X-Flow-ID: flow-id
diff --git a/tracer-spring-boot-starter/src/test/resources/application-uuid.yml b/tracer-spring-boot-starter/src/test/resources/application-uuid.yml
@@ -1,6 +1,6 @@
-spring.main.banner_mode: OFF
+spring.main.banner_mode: 'OFF'
 
 tracer:
   scheduling.pool-size: 16
   traces:
-    X-Trace-ID: uuid
+    X-Trace-ID: uuid
diff --git a/tracer-spring-boot-starter/src/test/resources/application.yml b/tracer-spring-boot-starter/src/test/resources/application.yml
@@ -1 +1 @@
-spring.main.banner_mode: OFF
+spring.main.banner_mode: 'OFF'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		spring.main.banner_mode: OFF
		spring.main.banner_mode: 'OFF'