Skip to content

Commit 0b2485f

Browse files
authored
Merge pull request #2069 from ClickHouse/repo_maintenance_01
[repo] added code coverage for sonar
2 parents 31fc1e6 + 351588c commit 0b2485f

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@ jobs:
9595
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
9696
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
9797
run: |
98-
mvn --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION -Dclient.tests.useNewImplementation=true \
98+
mvn --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
9999
-Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
100100
continue-on-error: true

pom.xml

+8-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<git-plugin.version>6.0.0</git-plugin.version>
132132
<gpg-plugin.version>3.1.0</gpg-plugin.version>
133133
<helper-plugin.version>3.4.0</helper-plugin.version>
134-
<jacoco-plugin.version>0.8.10</jacoco-plugin.version>
134+
<jacoco-plugin.version>0.8.12</jacoco-plugin.version>
135135
<jar-plugin.version>3.3.0</jar-plugin.version>
136136
<javadoc-plugin.version>3.5.0</javadoc-plugin.version>
137137
<native-plugin.version>0.9.23</native-plugin.version>
@@ -151,12 +151,16 @@
151151
<skipITs>${skipTests}</skipITs>
152152
<skipUTs>${skipTests}</skipUTs>
153153

154-
<sonar.projectKey>zhicwu_clickhouse-jdbc</sonar.projectKey>
154+
<sonar.projectKey>ClickHouse_clickhouse-jdbc</sonar.projectKey>
155155
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
156-
<sonar.organization>zhicwu</sonar.organization>
156+
<sonar.organization>clickhouse-java</sonar.organization>
157157
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
158-
<sonar.projectVersion>0.6.2</sonar.projectVersion>
158+
<sonar.projectVersion>${project.version}</sonar.projectVersion>
159159
<sonar.cpd.exclusions>**/*0*.java,**/data/*Value.java,**/data/array/*Value.java,**/stream/*Stream.java</sonar.cpd.exclusions>
160+
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
161+
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
162+
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
163+
<sonar.language>java</sonar.language>
160164

161165
<build_timestamp>${maven.build.timestamp}</build_timestamp>
162166
<maven.build.timestamp.format>MM-dd-yyyy HH:mm</maven.build.timestamp.format>

0 commit comments

Comments
 (0)