Skip to content

Commit d9e9df8

Browse files
zhicwuzhicwu
committed
Bump slf4j and remove log4j dependency
1 parent b8a2e1c commit d9e9df8

File tree

19 files changed

+41
-34
lines changed

19 files changed

+41
-34
lines changed

‎.github/workflows/analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6464
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6565
run: |
66-
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
66+
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
6767
mvn -q --batch-mode --global-toolchains .github/toolchains.xml -Drelease \
6868
-Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
6969
continue-on-error: true

‎.github/workflows/benchmark.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ steps.version.outputs.value }}|g' \
5757
-e 's|^\( <version>\).*\(</version>\)$|\1${{ steps.version.outputs.value }}\2|' \
5858
-e 's|${parent.groupId}|com.clickhouse|g' '{}' \;
59-
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
59+
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
6060
- name: Build project
6161
run: |
6262
mvn --batch-mode --update-snapshots -q -DskipTests install
@@ -100,7 +100,7 @@ jobs:
100100
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.driver }}|g' \
101101
-e 's|^\( <version>\).*\(</version>\)$|\1${{ github.event.inputs.driver }}\2|' \
102102
-e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
103-
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
103+
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
104104
continue-on-error: true
105105
- name: Install driver as needed
106106
run: mvn --batch-mode --update-snapshots -q -DskipTests install

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.version }}|g' \
5050
-e 's|^\( <version>\).*\(</version>\)$|\1${{ github.event.inputs.version }}\2|' \
5151
-e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
52-
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
52+
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
5353
- name: Release Maven package
5454
uses: samuelmeuli/action-maven-publish@v1
5555
with:

‎.github/workflows/third_party_libs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.version }}|g' \
2626
-e 's|^\( <version>\).*\(</version>\)$|\1${{ github.event.inputs.version }}\2|' \
2727
-e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
28-
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
28+
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
2929
- name: Release Maven package
3030
uses: samuelmeuli/action-maven-publish@v1
3131
with:

‎clickhouse-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
<dependency>
5858
<groupId>org.slf4j</groupId>
59-
<artifactId>slf4j-log4j12</artifactId>
59+
<artifactId>slf4j-simple</artifactId>
6060
<scope>test</scope>
6161
</dependency>
6262
<dependency>

‎clickhouse-client/src/test/resources/log4j.properties

-5
This file was deleted.

‎clickhouse-client/src/test/resources/simplelogger.properties

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
org.slf4j.simpleLogger.defaultLogLevel=info
2+
org.slf4j.simpleLogger.log.com.clickhouse.client=info
3+
org.slf4j.simpleLogger.showDateTime=true
4+
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
5+
org.slf4j.simpleLogger.showThreadName=true
6+
org.slf4j.simpleLogger.showLogName=true
7+
org.slf4j.simpleLogger.showShortLogName=true

‎clickhouse-grpc-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</dependency>
6262
<dependency>
6363
<groupId>org.slf4j</groupId>
64-
<artifactId>slf4j-log4j12</artifactId>
64+
<artifactId>slf4j-simple</artifactId>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>

‎clickhouse-grpc-client/src/test/resources/log4j.properties

-5
This file was deleted.

‎clickhouse-grpc-client/src/test/resources/simplelogger.properties

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
org.slf4j.simpleLogger.defaultLogLevel=info
2+
org.slf4j.simpleLogger.log.com.clickhouse.client=debug
3+
org.slf4j.simpleLogger.showDateTime=true
4+
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
5+
org.slf4j.simpleLogger.showThreadName=true
6+
org.slf4j.simpleLogger.showLogName=true
7+
org.slf4j.simpleLogger.showShortLogName=true

‎clickhouse-http-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</dependency>
6262
<dependency>
6363
<groupId>org.slf4j</groupId>
64-
<artifactId>slf4j-log4j12</artifactId>
64+
<artifactId>slf4j-simple</artifactId>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>

‎clickhouse-http-client/src/test/resources/log4j.properties

-5
This file was deleted.

‎clickhouse-http-client/src/test/resources/simplelogger.properties

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
org.slf4j.simpleLogger.defaultLogLevel=info
2+
org.slf4j.simpleLogger.log.com.clickhouse.client=debug
3+
org.slf4j.simpleLogger.showDateTime=true
4+
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
5+
org.slf4j.simpleLogger.showThreadName=true
6+
org.slf4j.simpleLogger.showLogName=true
7+
org.slf4j.simpleLogger.showShortLogName=true

‎clickhouse-jdbc/legacy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
</dependency>
9999
<dependency>
100100
<groupId>org.slf4j</groupId>
101-
<artifactId>slf4j-log4j12</artifactId>
101+
<artifactId>slf4j-simple</artifactId>
102102
<scope>test</scope>
103103
</dependency>
104104
<dependency>

‎clickhouse-jdbc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</dependency>
9595
<dependency>
9696
<groupId>org.slf4j</groupId>
97-
<artifactId>slf4j-log4j12</artifactId>
97+
<artifactId>slf4j-simple</artifactId>
9898
<scope>test</scope>
9999
</dependency>
100100
<dependency>

‎clickhouse-jdbc/src/test/resources/log4j.properties

-6
This file was deleted.

‎clickhouse-jdbc/src/test/resources/simplelogger.properties

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
org.slf4j.simpleLogger.defaultLogLevel=info
2+
org.slf4j.simpleLogger.log.com.clickhouse.client=debug
3+
org.slf4j.simpleLogger.showDateTime=true
4+
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
5+
org.slf4j.simpleLogger.showThreadName=true
6+
org.slf4j.simpleLogger.showLogName=true
7+
org.slf4j.simpleLogger.showShortLogName=true

‎clickhouse-tcp-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dependency>
3737
<dependency>
3838
<groupId>org.slf4j</groupId>
39-
<artifactId>slf4j-log4j12</artifactId>
39+
<artifactId>slf4j-simple</artifactId>
4040
<scope>test</scope>
4141
</dependency>
4242
<dependency>

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<protobuf.version>3.17.3</protobuf.version>
9090
<lz4.version>1.8.0</lz4.version>
9191
<roaring-bitmap.version>0.9.21</roaring-bitmap.version>
92-
<slf4j.version>1.8.0-beta4</slf4j.version>
92+
<slf4j.version>2.0.0-alpha5</slf4j.version>
9393
<mockito.version>3.12.4</mockito.version>
9494
<wiremock.version>2.31.0</wiremock.version>
9595
<testcontainers.version>1.16.0</testcontainers.version>
@@ -236,7 +236,7 @@
236236
</dependency>
237237
<dependency>
238238
<groupId>org.slf4j</groupId>
239-
<artifactId>slf4j-log4j12</artifactId>
239+
<artifactId>slf4j-simple</artifactId>
240240
<version>${slf4j.version}</version>
241241
</dependency>
242242
<dependency>

0 commit comments

Comments
 (0)