diff options
Diffstat (limited to 'redback-integrations/redback-struts2/redback-struts2-integration')
| -rw-r--r-- | redback-integrations/redback-struts2/redback-struts2-integration/pom.xml | 31 | ||||
| -rwxr-xr-x | redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml | 33 |
2 files changed, 12 insertions, 52 deletions
diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml b/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml index 99a133abe..b90857071 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml +++ b/redback-integrations/redback-struts2/redback-struts2-integration/pom.xml @@ -237,37 +237,30 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4jVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4jVersion}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>slf4j-impl</artifactId> + <version>${log4jVersion}</version> <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${logbackVersion}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>${log4jVersion}</version> <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logbackVersion}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4jVersion}</version> <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-access</artifactId> - <version>${logbackVersion}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j12-api</artifactId> + <version>${log4jVersion}</version> <scope>test</scope> </dependency> diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml deleted file mode 100755 index 5af77507f..000000000 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/logback-test.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you 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. - --> -<configuration debug="false"> - - <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%-5p %c{2} : %m%n</pattern> - </encoder> - </appender> - - <logger name="org.springframework" level="ERROR"/> - <logger name="com.opensymphony.xwork2" level="debug"/> - <root level="INFO"> - <appender-ref ref="CONSOLE"/> - </root> -</configuration>
\ No newline at end of file |