Updated libraries to fix vulnerabilities
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
.settings/
|
||||
target/
|
||||
bin/
|
||||
.idea
|
||||
|
10
pom.xml
10
pom.xml
@ -20,8 +20,8 @@
|
||||
<main.basedir>${project.basedir}</main.basedir>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<log4j.version>2.14.1</log4j.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<log4j.version>2.19.0</log4j.version>
|
||||
<slf4j.version>2.0.1</slf4j.version>
|
||||
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
|
||||
</properties>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
<version>3.0.0-M7</version>
|
||||
<configuration>
|
||||
<forkMode>always</forkMode>
|
||||
</configuration>
|
||||
@ -51,7 +51,7 @@
|
||||
<plugin>
|
||||
<groupId>org.owasp</groupId>
|
||||
<artifactId>dependency-check-maven</artifactId>
|
||||
<version>6.3.1</version>
|
||||
<version>7.2.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
@ -63,7 +63,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<version>3.1.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>enforce</id>
|
||||
|
@ -17,7 +17,7 @@ public class ApplicationLogger implements org.slf4j.Logger {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(ApplicationLogger.class);
|
||||
|
||||
private String name;
|
||||
private final String name;
|
||||
|
||||
private LogLevel level;
|
||||
|
||||
@ -471,7 +471,7 @@ public class ApplicationLogger implements org.slf4j.Logger {
|
||||
public void error(Map<String, String> values, String valueFormat, StringBuilder sb, Throwable e) {
|
||||
msgHelper(LogLevel.ERROR, values, valueFormat, sb);
|
||||
if (e != null) {
|
||||
msgHelper(LogLevel.ERROR, "", e);
|
||||
msgHelper("", e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -588,7 +588,7 @@ public class ApplicationLogger implements org.slf4j.Logger {
|
||||
values.entrySet()
|
||||
.stream()
|
||||
.map(entry -> String.format(format, entry.getKey(), entry.getValue()))
|
||||
.forEach(s -> builder.append(s));
|
||||
.forEach(builder::append);
|
||||
|
||||
log(level, builder.toString());
|
||||
}
|
||||
@ -605,9 +605,9 @@ public class ApplicationLogger implements org.slf4j.Logger {
|
||||
|
||||
/**
|
||||
* helper method to format a message for logging
|
||||
* @param level log level to use
|
||||
* @param level level to use
|
||||
* @param message message to log
|
||||
* @param e any throwable to log
|
||||
* @param e any throwable to log
|
||||
*/
|
||||
private void msgHelper(LogLevel level, String message, Throwable e) {
|
||||
String msg = e == null ? String.format("%n%s", message) : String.format("%n%s%n%s%n%s", message, e.getMessage(), getStackTrace(e));
|
||||
|
@ -20,7 +20,7 @@ public class ApplicationLoggerFactory {
|
||||
* Need to get the log level from the properties file.
|
||||
* Would normally use the configuration service but would create a circular dependency as
|
||||
* the configuration service use the ApplicationLoggerFactory to create a logger
|
||||
* @param initializer The initializer
|
||||
* @param init The initializer
|
||||
*/
|
||||
public static void init(ApplicationLoggerInitializer init) {
|
||||
initializer = init;
|
||||
|
Reference in New Issue
Block a user