File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
Load diff This file was deleted.
Original file line number Diff line number Diff line change 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>
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 >
You can’t perform that action at this time.
0 commit comments