Skip to content

Commit dc6183b

Browse files
renovate[bot]vdiez
andauthored
Update SonarSource/sonar-analyzer-commons monorepo to v2.34.0.15495 (#6389)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Victor Diez <victor.diez@sonarsource.com>
1 parent 5e7da5f commit dc6183b

3 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,7 @@ jobs:
411411
mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party \
412412
--batch-mode \
413413
"-Dlicense.missingFile=${PWD}/missing-dep-licenses.properties" \
414-
-DuseMissingFile \
415-
"-Dlicense.overrideUrl=file://${PWD}/override-dep-licenses.properties"
414+
-DuseMissingFile
416415
417416
qa-os-win:
418417
name: Build and Unit Test on Windows

‎override-dep-licenses.properties‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<sonar.scanner.version>13.16.0.6705</sonar.scanner.version>
9595
<sonarlint.plugin.api.version>12.1.1.87771</sonarlint.plugin.api.version>
9696
<sonar.sca.exclusions>its/**,java-checks-test-sources/**</sonar.sca.exclusions>
97-
<analyzer.commons.version>2.33.0.5369</analyzer.commons.version>
97+
<analyzer.commons.version>2.34.0.15495</analyzer.commons.version>
9898
<orchestrator.version>6.4.4.4797</orchestrator.version>
9999
<sonar.integration.tester.version>1.5.0.1412</sonar.integration.tester.version>
100100
<sslr.version>1.26.0.4194</sslr.version>
@@ -351,6 +351,15 @@
351351
<build>
352352
<pluginManagement>
353353
<plugins>
354+
<plugin>
355+
<groupId>org.codehaus.mojo</groupId>
356+
<artifactId>license-maven-plugin</artifactId>
357+
<configuration>
358+
<licenseMerges combine.children="append">
359+
<licenseMerge>bsd|The BSD 2-Clause License</licenseMerge>
360+
</licenseMerges>
361+
</configuration>
362+
</plugin>
354363
<plugin>
355364
<groupId>de.thetaphi</groupId>
356365
<artifactId>forbiddenapis</artifactId>

0 commit comments

Comments
 (0)