This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new aca8939b29 [Chore] Fix sonar error (#17722)
aca8939b29 is described below
commit aca8939b29c1897483dc7c251c9ad3d07d488635
Author: xiangzihao <[email protected]>
AuthorDate: Wed Nov 26 11:22:19 2025 +0800
[Chore] Fix sonar error (#17722)
---
.github/workflows/unit-test.yml | 7 ++-----
.../plugin/storage/api/local/LocalStorageOperatorTest.java | 10 ++++++++--
pom.xml | 11 +++++++++--
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 7fbd7d356f..8e6c50f66e 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -81,7 +81,7 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-backend
restore-keys: ${{ runner.os }}-maven-
- name: Run Unit tests
- run: ./mvnw clean verify -B -Dmaven.test.skip=false
-Dspotless.skip=true -DskipUT=false -Danalyze.skip=true
+ run: export MAVEN_OPTS="-Xmx8g -XX:MetaspaceSize=256m
-XX:MaxMetaspaceSize=1024m" && ./mvnw clean verify -B -Dmaven.test.skip=false
-Dspotless.skip=true -DskipUT=false -Danalyze.skip=true
- name: Upload coverage report to codecov
run: CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl
-s https://codecov.io/bash)
@@ -102,16 +102,13 @@ jobs:
-Dsonar.organization=apache
-Dsonar.core.codeCoveragePlugin=jacoco
-Dsonar.projectKey=apache-dolphinscheduler
- -Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
+ -Dsonar.token=e4058004bc6be89decf558ac819aa1ecbee57682
-Dsonar.exclusions=dolphinscheduler-ui/src/**/i18n/locale/*.js,dolphinscheduler-microbench/src/**/*
-Dhttp.keepAlive=false
-Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-DskipUT=true
-Danalyze.skip=true
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
result:
name: Unit Test
diff --git
a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/src/test/java/org/apache/dolphinscheduler/plugin/storage/api/local/LocalStorageOperatorTest.java
b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/src/test/java/org/apache/dolphinscheduler/plugin/storage/api/local/LocalStorageOperatorTest.java
index 5a00890ae5..39c65bcb30 100644
---
a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/src/test/java/org/apache/dolphinscheduler/plugin/storage/api/local/LocalStorageOperatorTest.java
+++
b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/src/test/java/org/apache/dolphinscheduler/plugin/storage/api/local/LocalStorageOperatorTest.java
@@ -246,14 +246,20 @@ class LocalStorageOperatorTest {
List<StorageEntity> storageEntities =
storageOperator.listStorageEntity(TENANT_BASE_DIR);
assertThat(storageEntities.size()).isEqualTo(2);
- StorageEntity storageEntity1 = storageEntities.get(0);
+ StorageEntity storageEntity1 = storageEntities.stream()
+ .filter(v -> v.getFileName().contains("emptyDirectory"))
+ .findFirst()
+ .orElse(null);
assertThat(storageEntity1.getFullName()).isEqualTo(TENANT_BASE_DIR +
"/emptyDirectory");
assertThat(storageEntity1.getFileName()).isEqualTo("emptyDirectory");
assertThat(storageEntity1.getPfullName()).isEqualTo(TENANT_BASE_DIR);
assertThat(storageEntity1.isDirectory()).isTrue();
assertThat(storageEntity1.getType()).isEqualTo(ResourceType.FILE);
- StorageEntity storageEntity2 = storageEntities.get(1);
+ StorageEntity storageEntity2 = storageEntities.stream()
+ .filter(v -> v.getFileName().contains("sqlDirectory"))
+ .findFirst()
+ .orElse(null);
assertThat(storageEntity2.getFullName()).isEqualTo(TENANT_BASE_DIR +
"/sqlDirectory");
assertThat(storageEntity2.getFileName()).isEqualTo("sqlDirectory");
assertThat(storageEntity2.getPfullName()).isEqualTo(TENANT_BASE_DIR);
diff --git a/pom.xml b/pom.xml
index 701d7e664b..83ff608d79 100755
--- a/pom.xml
+++ b/pom.xml
@@ -73,13 +73,14 @@
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-source-plugin.version>2.4</maven-source-plugin.version>
- <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
<rpm-maven-plugion.version>2.2.0</rpm-maven-plugion.version>
<aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
<spotless.version>2.27.2</spotless.version>
- <jacoco.version>0.8.8</jacoco.version>
+ <jacoco.version>0.8.14</jacoco.version>
+ <sonar.maven.plugin.version>5.3.0.6276</sonar.maven.plugin.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<auto-service.version>1.0.1</auto-service.version>
<jacoco.skip>false</jacoco.skip>
@@ -612,6 +613,12 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>${sonar.maven.plugin.version}</version>
+ </plugin>
+
<!-- jenkins plugin jacoco report-->
<plugin>
<groupId>org.jacoco</groupId>
