Skip to content

Commit 1e3719f

Browse files
Merge pull request #51 from SAP/dependabot/maven/cf-java-logging-support-servlet/com.fasterxml.jackson.core-jackson-databind-2.9.10.1
Bump jackson-databind from 2.9.9.2 to 2.9.10.1 in /cf-java-logging-support-servlet
2 parents e626102 + 8c216f7 commit 1e3719f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

cf-java-logging-support-servlet/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
<dependency>
6363
<groupId>com.auth0</groupId>
6464
<artifactId>java-jwt</artifactId>
65-
<version>3.8.1</version>
65+
<version>3.8.3</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.fasterxml.jackson.core</groupId>
6969
<artifactId>jackson-databind</artifactId>
70-
<version>2.9.9.2</version>
70+
<version>2.10.1</version>
7171
</dependency>
7272

7373
<!-- testing -->

cf-java-logging-support-servlet/src/test/java/com/sap/hcp/cf/logging/servlet/filter/RequestLogTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,19 +189,19 @@ private String getBaseUrl() {
189189
}
190190

191191
private String getCorrelationIdGenerated() throws IOException {
192-
Map<Object, Object> generationLog = systemOut.fineLineAsMapWith("logger", LogContext.class.getName());
192+
Map<String, Object> generationLog = systemOut.fineLineAsMapWith("logger", LogContext.class.getName());
193193
if (generationLog == null) {
194194
return null;
195195
}
196196
return generationLog.get(Fields.CORRELATION_ID) == null ? null
197197
: generationLog.get(Fields.CORRELATION_ID).toString();
198198
}
199199

200-
private Map<Object, Object> getRequestMessage() throws IOException {
200+
private Map<String, Object> getRequestMessage() throws IOException {
201201
return systemOut.fineLineAsMapWith("msg", REQUEST_RECEIVED);
202202
}
203203

204-
private Map<Object, Object> getRequestLog() throws IOException {
204+
private Map<String, Object> getRequestLog() throws IOException {
205205
return systemOut.fineLineAsMapWith("layer", "[SERVLET]");
206206
}
207207

cf-java-logging-support-servlet/src/test/java/com/sap/hcp/cf/logging/servlet/filter/SystemOutRule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ public String toString() {
3333
return output.toString();
3434
}
3535

36-
public Map<Object, Object> fineLineAsMapWith(String key, String expected) throws IOException {
36+
public Map<String, Object> fineLineAsMapWith(String key, String expected) throws IOException {
3737
for (String line : output.toString().split("\n")) {
38-
Map<Object, Object> map = JSON.std.mapFrom(line);
38+
Map<String, Object> map = JSON.std.mapFrom(line);
3939
if (expected.equals(getAsString(map, key))) {
4040
return map;
4141
}
4242
}
4343
return Collections.emptyMap();
4444
}
4545

46-
private String getAsString(Map<Object, Object> map, String key) {
46+
private String getAsString(Map<String, Object> map, String key) {
4747
Object value = map.get(key);
4848
return value != null ? value.toString() : null;
4949
}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124

125125
<properties>
126126
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
127-
<jackson-jr.version>2.9.9</jackson-jr.version>
127+
<jackson-jr.version>2.10.1</jackson-jr.version>
128128
<slf4j.version>1.7.25</slf4j.version>
129129
<logback.version>1.2.3</logback.version>
130130
<log4j2.version>2.8.2</log4j2.version>
@@ -135,7 +135,7 @@
135135
<junit.version>4.12</junit.version>
136136
<mockito.version>1.9.5</mockito.version>
137137
<surefire.plugin.version>2.18.1</surefire.plugin.version>
138-
<animal.sniffer.version>1.14</animal.sniffer.version>
138+
<animal.sniffer.version>1.18</animal.sniffer.version>
139139
<exec.plugin.version>1.4.0</exec.plugin.version>
140140
<javadoc.plugin.version>2.10.3</javadoc.plugin.version>
141141
<gpg.plugin.version>1.5</gpg.plugin.version>

0 commit comments

Comments
 (0)