Skip to content

Commit

Permalink
chore: remove unused slf4j simpleLogger property
Browse files Browse the repository at this point in the history
Signed-off-by: ZhangJian He <[email protected]>
  • Loading branch information
shoothzj committed Apr 28, 2024
1 parent 459d440 commit 3de8f6f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 18 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/bk-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ jobs:
- name: Validate pull request
if: steps.check_changes.outputs.docs_only != 'true'
run: |
mvn -T 1C -B -nsu clean install -Ddistributedlog -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
mvn -T 1C -B -nsu apache-rat:check checkstyle:check spotbugs:check package -Ddistributedlog -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
mvn -T 1C -B -nsu clean install -Ddistributedlog -DskipTests
mvn -T 1C -B -nsu apache-rat:check checkstyle:check spotbugs:check package -Ddistributedlog -DskipTests
- name: Check license files
if: steps.check_changes.outputs.docs_only != 'true'
Expand Down Expand Up @@ -234,14 +234,14 @@ jobs:
$GITHUB_WORKSPACE/dev/ci-tool pick_ubuntu_mirror
- name: Build with Maven
run: mvn -B -nsu clean install -Pdocker -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
run: mvn -B -nsu clean install -Pdocker -DskipTests

- name: Run metadata driver tests
run: mvn -B -nsu -f metadata-drivers/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
run: mvn -B -nsu -f metadata-drivers/pom.xml test -DintegrationTests

- name: Run all integration tests (except backward compatibility tests)
run: |
mvn -B -nsu -f tests/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0
mvn -B -nsu -f tests/pom.xml test -DintegrationTests -DredirectTestOutputToFile=false -DtestRetryCount=0
- name: print JVM thread dumps when cancelled
if: cancelled()
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
$GITHUB_WORKSPACE/dev/ci-tool pick_ubuntu_mirror
- name: Build with Maven
run: mvn -B -nsu clean install -Pdocker -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
run: mvn -B -nsu clean install -Pdocker -DskipTests

- name: Test current server with old clients
run: mvn -B -nsu -DbackwardCompatTests -pl :backward-compat-current-server-old-clients test
Expand Down Expand Up @@ -471,7 +471,7 @@ jobs:
java-version: ${{ matrix.jdk_version }}

- name: Build with Maven
run: mvn clean package -B -nsu -DskipBookKeeperServerTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
run: mvn clean package -B -nsu -DskipBookKeeperServerTests

- name: print JVM thread dumps when cancelled
if: cancelled()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Validate pull request
if: steps.check_changes.outputs.docs_only != 'true'
run: |
mvn -T 1C -B -nsu clean install -Ddistributedlog -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO
mvn -T 1C -B -nsu clean install -Ddistributedlog -DskipTests
- name: Perform CodeQL Analysis
if: steps.check_changes.outputs.docs_only != 'true'
Expand Down
10 changes: 5 additions & 5 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ docker images | grep apachebookkeeper

```bash
# Run metadata driver tests
mvn -f metadata-drivers/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0
mvn -f metadata-drivers/pom.xml test -DintegrationTests -DredirectTestOutputToFile=false -DtestRetryCount=0

# Run all integration tests
mvn -f tests/pom.xml test -DintegrationTests -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0
mvn -f tests/pom.xml test -DintegrationTests -DredirectTestOutputToFile=false -DtestRetryCount=0
```

### Running backward compatibility tests

```bash
# Test current server with old clients
mvn -DbackwardCompatTests -pl :backward-compat-current-server-old-clients test -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0
mvn -DbackwardCompatTests -pl :backward-compat-current-server-old-clients test -DredirectTestOutputToFile=false -DtestRetryCount=0

# Test progressive upgrade
mvn -DbackwardCompatTests -pl :upgrade test -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0
mvn -DbackwardCompatTests -pl :upgrade test -DredirectTestOutputToFile=false -DtestRetryCount=0

# Other backward compat tests
mvn -DbackwardCompatTests -pl :bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version test -Dorg.slf4j.simpleLogger.defaultLogLevel=INFO -DredirectTestOutputToFile=false -DtestRetryCount=0
mvn -DbackwardCompatTests -pl :bc-non-fips,:hierarchical-ledger-manager,:hostname-bookieid,:old-cookie-new-cluster,:recovery-no-password,:upgrade-direct,:yahoo-custom-version test -DredirectTestOutputToFile=false -DtestRetryCount=0
```
5 changes: 0 additions & 5 deletions tests/integration-tests-base-groovy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@
<argLine>-Xmx4G -Djava.net.preferIPv4Stack=true ${test.additional.args}</argLine>
<forkCount>1</forkCount>
<useSystemClassLoader>false</useSystemClassLoader>
<systemPropertyVariables>
<!-- only takes effect in later simpleLogger versions (1.7+) //-->
<org.slf4j.simpleLogger.logFile>System.out</org.slf4j.simpleLogger.logFile>
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
</systemPropertyVariables>
</configuration>
</plugin>

Expand Down

0 comments on commit 3de8f6f

Please sign in to comment.