diff --git a/pom.xml b/pom.xml index 3cca0319c..bccfbdfa0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.mediathekview MServer - ${release} + ${revision} jar ${project.groupId}:${project.artifactId} @@ -55,43 +55,39 @@ UTF-8 - 4.0.1-SNAPSHOT - 21 - 21 + 4.0.1-SNAPSHOT + 21 - 3.27.4 - 1.17.7 + 3.27.7 + 1.18.11 1.28.0 - 3.12.0 - 3.19.0 - 1.14.0 + 3.20.0 + 1.15.0 3.5.1 3.0 - 33.4.8-jre - 2.13.1 - 1.21.1 - 3.1.11 - 4.0.2 - 2.25.1 - 22.0.0 - 5.13.4 + 33.6.0-jre + 2.14.0 + 1.22.2 + 3.1.12 + 4.0.5 + 2.26.1 + 26.1.0 + 5.14.4 2.0.0 3.4.2 - 3.3.0 + 3.11.0 3.2.0 3.10.1 - 3.0.1 3.0.1 3.3.0 3.4.1 3.3.0 3.2.1 3.1.2 - 5.19.0 - 1.6.13 - 4.10.0 - 2.35.2 - 1.10 + 5.23.0 + 4.12.0 + 3.13.2 + 1.12 0.9.2 0.48.0 3.2.0 @@ -130,7 +126,7 @@ org.postgresql postgresql - 42.7.4 + 42.7.13 @@ -251,22 +247,10 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock ${wiremock.version} test - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.fasterxml.jackson.core - jackson-databind - 2.13.4.2 - test @@ -301,18 +285,6 @@ - - - - false - - - true - - oss.sonatype.org-snapshot - https://oss.sonatype.org/content/repositories/snapshots - - @@ -370,6 +342,7 @@ prepare-package + runtime ${project.build.directory}/libs false false @@ -397,9 +370,6 @@ org.apache.maven.plugins maven-javadoc-plugin ${maven-javadoc-plugin.version} - - --source ${maven.compiler.target} - attach-javadocs @@ -436,6 +406,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar classes true true @@ -482,7 +453,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.15 @@ -516,7 +487,7 @@ mediathekview/mserver:${project.version} - eclipse-temurin:${maven.compiler.target} + eclipse-temurin:${maven.compiler.release} Nicklas Wiegandt <nicklas@wiegandt.eu> docker-assembly.xml diff --git a/src/main/java/de/mediathekview/mserver/base/config/Log4JConfigurationFactory.java b/src/main/java/de/mediathekview/mserver/base/config/Log4JConfigurationFactory.java index e63e9bb81..7c8f80b59 100644 --- a/src/main/java/de/mediathekview/mserver/base/config/Log4JConfigurationFactory.java +++ b/src/main/java/de/mediathekview/mserver/base/config/Log4JConfigurationFactory.java @@ -157,7 +157,7 @@ private static void addPattern( @Override public Configuration getConfiguration( final LoggerContext loggerContext, final ConfigurationSource source) { - return getConfiguration(loggerContext, source.toString(), null); + return getConfiguration(loggerContext, source.toString(), (URI) null); } @Override