Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ The following libraries are included in packaged versions of this project:
* NOTICE: licenses/NOTICE.log4j.txt
* HOMEPAGE: http://logging.apache.org/log4j/1.2/

* Apache Log4j
* COPYRIGHT: Copyright 1999-2024 Apache Software Foundation
* LICENSE: licenses/LICENSE.apache2.txt
* NOTICE: licenses/NOTICE.log4j2.txt
* HOMEPAGE: https://logging.apache.org/log4j/2.x/

* Apache ZooKeeper
* COPYRIGHT: Copyright 2009-2014 The Apache Software Foundation
* LICENSE: licenses/LICENSE.apache2.txt
Expand Down
12 changes: 0 additions & 12 deletions config/log4j.properties

This file was deleted.

32 changes: 32 additions & 0 deletions config/log4j2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Configuration:
name: "Log4j2"
Properties:
Property:
# Fallback if the system property is not set
- name: "kafka-rest.logs.dir"
value: "."
Appenders:
RollingFile:
name: "file"
fileName: "${sys:kafka-rest.log.dir}/kafka-rest.log"
filePattern: "/kafka-rest.log.%i"
PatternLayout:
pattern: "[%d] %v1Level %m (%c)%n"
Policies:
SizeBasedTriggeringPolicy:
size: "100MB"
DefaultRolloverStrategy:
max: "10"
# Using the min strategy, the newest log file will have index 1 and the oldest one will have index max.
fileIndex: "min"
Console:
name: "STDOUT"
target: "SYSTEM_OUT"
PatternLayout:
pattern: "[%d] %v1Level %m (%c:%L)%n"
Loggers:
Root:
level: "INFO"
AppenderRef:
- ref: "file"
- ref: "STDOUT"
15 changes: 13 additions & 2 deletions kafka-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,13 @@
<version>${io.confluent.schema-registry.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
Expand Down Expand Up @@ -147,6 +152,12 @@
<artifactId>kafka-schema-registry</artifactId>
<version>${io.confluent.schema-registry.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand Down
4 changes: 2 additions & 2 deletions kafka-rest/src/assembly/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
<excludes>
<exclude>io.confluent:rest-utils</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.slf4j:slf4j-reload4j</exclude>
<exclude>org.apache.logging.log4j:log4j-slf4j-impl</exclude>
</excludes>
</dependencySet>
<dependencySet>
<outputDirectory>share/java/kafka-rest-bin</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>org.slf4j:slf4j-reload4j</include>
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
</includes>
</dependencySet>
</dependencySets>
Expand Down
15 changes: 0 additions & 15 deletions kafka-rest/src/test/resources/log4j.properties

This file was deleted.

22 changes: 22 additions & 0 deletions kafka-rest/src/test/resources/log4j2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Configuration:
name: "Log4j2"
Appenders:
Console:
name: "STDOUT"
target: "SYSTEM_OUT"
PatternLayout:
pattern: "[%d] %v1Level %m (%c:%L)%n"
Loggers:
Root:
level: "TRACE"
AppenderRef:
ref: "STDOUT"
Logger:
- name: "kafka"
level: "ERROR"
- name: "org.apache.kafka"
level: "ERROR"
- name: "org.eclipse"
level: "ERROR"
- name: "org.hibernate.validator"
level: "ERROR"
6 changes: 6 additions & 0 deletions licenses/NOTICE.confluent-common.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The following libraries are included in packaged versions of this project:
* NOTICE: licenses/NOTICE.log4j.txt
* HOMEPAGE: http://logging.apache.org/log4j/1.2/

* Apache Log4j
* COPYRIGHT: Copyright 1999-2024 Apache Software Foundation
* LICENSE: licenses/LICENSE.apache2.txt
* NOTICE: licenses/NOTICE.log4j2.txt
* HOMEPAGE: https://logging.apache.org/log4j/2.x/

* Apache ZooKeeper
* COPYRIGHT: Copyright 2009-2014 The Apache Software Foundation
* LICENSE: licenses/LICENSE.apache2.txt
Expand Down
6 changes: 6 additions & 0 deletions licenses/NOTICE.confluent-schema-registry.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ The following libraries are included in packaged versions of this project:
* NOTICE: licenses/NOTICE.log4j.txt
* HOMEPAGE: http://logging.apache.org/log4j/1.2/

* Apache Log4j
* COPYRIGHT: Copyright 1999-2024 Apache Software Foundation
* LICENSE: licenses/LICENSE.apache2.txt
* NOTICE: licenses/NOTICE.log4j2.txt
* HOMEPAGE: https://logging.apache.org/log4j/2.x/

* Apache ZooKeeper
* COPYRIGHT: Copyright 2009-2014 The Apache Software Foundation
* LICENSE: licenses/LICENSE.apache2.txt
Expand Down
20 changes: 20 additions & 0 deletions licenses/NOTICE.log4j2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Apache Log4j
Copyright 1999-2024 Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

ResolverUtil.java
Copyright 2005-2006 Tim Fennell

Dumbster SMTP test server
Copyright 2004 Jason Paul Kitchen

TypeUtil.java
Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams

picocli (http://picocli.info)
Copyright 2017 Remko Popma

TimeoutBlockingWaitStrategy.java and parts of Util.java
Copyright 2011 LMAX Ltd.