Skip to content

Commit

Permalink
Merge pull request #47 from xacml4j-opensource/log4j-fix
Browse files Browse the repository at this point in the history 
Fix Log4j Dependencies
  • Loading branch information
@valdas-s
valdas-s authored Dec 15, 2021
2 parents b59f351 + c171f1b commit aed430d
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 110 deletions.
10 changes: 0 additions & 10 deletions .travis.yml
View file

This file was deleted.

37 changes: 10 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

<properties>
<junit.version>4.13.1</junit.version>
<slf4j.version>1.7.30</slf4j.version>
<log4j.version>2.14.0</log4j.version>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.8</logback.version>
<easymock.version>3.1</easymock.version>
<guava.version>24.1.1-jre</guava.version>
<xml.resolver.version>1.2</xml.resolver.version>
Expand Down Expand Up @@ -80,16 +80,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand Down Expand Up @@ -130,27 +122,18 @@
<version>${guava.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
Expand Down
21 changes: 7 additions & 14 deletions ...rmance-tests/src/test/resources/log4j.xml → ...tests/src/test/resources/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,15 @@
#L%
-->

<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<configuration>

<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
debug="false">

<appender name="Console" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d%d{Z} [%X{requestId}][%t] %-5p [%c{1}] %m%n" />
</layout>
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d [%X{requestId}][%t] %-5level [%logger{1}] %msg%n</pattern>
</encoder>
</appender>

<root>
<priority value="INFO" />
<root level="info">
<appender-ref ref="Console" />
</root>

</log4j:configuration>

</configuration>
24 changes: 7 additions & 17 deletions xacml-core/src/test/resources/log4j.xml → ...-core/src/test/resources/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,15 @@
<http://www.gnu.org/licenses/lgpl-3.0.html>.
#L%
-->
<configuration>

<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">

<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
debug="false">

<appender name="Console" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern"
value="%d{ABSOLUTE} %-5p [%c{1}] PDP[%X{pdpId}] %m%n" />
</layout>
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %-5level [%logger{1}] PDP[%X{pdpId}] %msg%n</pattern>
</encoder>
</appender>

<root>
<priority value="DEBUG" />
<root level="debug">
<appender-ref ref="Console" />
</root>

</log4j:configuration>

</configuration>
23 changes: 7 additions & 16 deletions xacml-json/src/test/resources/log4j.xml → ...-json/src/test/resources/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,15 @@
#L%
-->

<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<configuration>

<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
debug="false">

<appender name="Console" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern"
value="%d{ABSOLUTE} %-5p [%c{1}] PDP[%X{pdpId}] %m%n" />
</layout>
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %-5level [%logger{1}] PDP[%X{pdpId}] %msg%n</pattern>
</encoder>
</appender>

<root>
<priority value="DEBUG" />
<root level="debug">
<appender-ref ref="Console" />
</root>

</log4j:configuration>

</configuration>
34 changes: 8 additions & 26 deletions xacml-test/src/test/resources/log4j.xml → ...-test/src/test/resources/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,17 @@
#L%
-->

<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<configuration>

<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
debug="false">

<appender name="ConsoleRoot" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d%d{Z} [%t] %-5p [%c}] %m%n" />
</layout>
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{ISO8601} [%t] %-5level [%logger{1}] %msg%n</pattern>
</encoder>
</appender>

<appender name="Console" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d%d{Z} [%X{requestId}][%t] %-5p [%c{2}] %m%n" />
</layout>
</appender>
<logger name="org.xacml4j.v30" level="debug"/>

<category name="org.xacml4j.v30" additivity="false">
<priority value="DEBUG" />
<root level="info">
<appender-ref ref="Console" />
</category>


<root>
<priority value="INFO" />
<appender-ref ref="ConsoleRoot" />
</root>

</log4j:configuration>

</configuration>

0 comments on commit aed430d

Please sign in to comment.