diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index e4eb234ad6..bcb41c90dc 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -38,7 +38,6 @@ com.h2database h2 ${h2.version} - file:${project.build.directory}/dependency/log4j.properties @@ -104,8 +103,9 @@ test - log4j - log4j + org.jboss.logmanager + jboss-logmanager + test org.slf4j @@ -135,7 +135,7 @@ ${keycloak.connectionsJpa.password} ${keycloak.connectionsJpa.url} org.jboss.logmanager.LogManager - log4j + jboss diff --git a/model/jpa/src/test/resources/log4j.properties b/model/jpa/src/test/resources/log4j.properties deleted file mode 100755 index 0032431e6f..0000000000 --- a/model/jpa/src/test/resources/log4j.properties +++ /dev/null @@ -1,5 +0,0 @@ -log4j.rootLogger=info, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %t [%c] %m%n \ No newline at end of file diff --git a/model/jpa/src/test/resources/logging.properties b/model/jpa/src/test/resources/logging.properties new file mode 100755 index 0000000000..59f016ffae --- /dev/null +++ b/model/jpa/src/test/resources/logging.properties @@ -0,0 +1,32 @@ +# +# Copyright 2023 Red Hat, Inc. and/or its affiliates +# and other contributors as indicated by the @author tags. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# https://github.com/jboss-logging/jboss-logmanager +logger.level=INFO + +logger.handlers=CONSOLE + +handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler +handler.CONSOLE.properties=autoFlush +handler.CONSOLE.level=INFO +handler.CONSOLE.autoFlush=true +handler.CONSOLE.formatter=PATTERN + +# The log format pattern for both logs +formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter +formatter.PATTERN.properties=pattern +formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p %t [%c] %m%n \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8595863342..425cbdab19 100644 --- a/pom.xml +++ b/pom.xml @@ -107,6 +107,7 @@ 2.0.0.Final 3.4.1.Final 2.2.1.Final + 2.1.19.Final 2.0.11.Final 2.0.1.Final 2.0.0.Final @@ -603,7 +604,11 @@ log4j log4j ${log4j.version} - test + + + org.jboss.logmanager + jboss-logmanager + ${jboss.logmanager} com.googlecode.owasp-java-html-sanitizer