Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,7 @@ jobs:
mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party \
--batch-mode \
"-Dlicense.missingFile=${PWD}/missing-dep-licenses.properties" \
-DuseMissingFile \
"-Dlicense.overrideUrl=file://${PWD}/override-dep-licenses.properties"
-DuseMissingFile

qa-os-win:
name: Build and Unit Test on Windows
Expand Down
9 changes: 0 additions & 9 deletions override-dep-licenses.properties

This file was deleted.

11 changes: 10 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<sonar.scanner.version>13.16.0.6705</sonar.scanner.version>
<sonarlint.plugin.api.version>12.1.1.87771</sonarlint.plugin.api.version>
<sonar.sca.exclusions>its/**,java-checks-test-sources/**</sonar.sca.exclusions>
<analyzer.commons.version>2.33.0.5369</analyzer.commons.version>
<analyzer.commons.version>2.34.0.15495</analyzer.commons.version>
<orchestrator.version>6.4.4.4797</orchestrator.version>
<sonar.integration.tester.version>1.5.0.1412</sonar.integration.tester.version>
<sslr.version>1.26.0.4194</sslr.version>
Expand Down Expand Up @@ -351,6 +351,15 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<licenseMerges combine.children="append">
<licenseMerge>bsd|The BSD 2-Clause License</licenseMerge>
</licenseMerges>
</configuration>
</plugin>
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
Expand Down
Loading