Fixed licensing report issue

finos · Apr 19, 2023 · 9bf383d · 9bf383d
1 parent d6de9c9
commit 9bf383d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
@@ -38,11 +38,11 @@ jobs:
       run: mvn install -DskipTests
     - name: License XML report
       run: |
-        mvn org.codehaus.mojo:license-maven-plugin:2.0.0:download-licenses -Dlicense.excludedScopes=system,provided -DlicensesConfigFile=.github/workflows/licenses-config-file.xml
+        mvn org.codehaus.mojo:license-maven-plugin:2.0.0:aggregate-download-licenses
     - name: Validate XML report
       run: |
         ALLOW_LICENSES=`cat .github/workflows/acceptable-licenses.txt | sed "s|<name>|name='|" | sed "s|</name>|' |" | tr -s '\n' '~' | sed 's/\~/or /g' `
-        find . -name licenses.xml -exec  xq "//dependency[count(licenses/license[${ALLOW_LICENSES}])=0]" {} \; > target/license-issues.xml
+        xq "//dependency[count(licenses/license[${ALLOW_LICENSES}])=0]" target/generated-resources/aggregate-licenses.xml  > target/license-issues.xml
         LINES_FOUND=`cat target/license-issues.xml | grep "<result>" | wc -l`
         if [ $LINES_FOUND -gt 0 ]; then cat target/license-issues.xml ; exit -1; fi
     - name: Upload license XML Issues

diff --git a/.github/workflows/licenses-config-file.xml b/.github/workflows/licenses-config-file.xml
@@ -2,8 +2,8 @@
 <licenseSummary>
   <dependencies>
     <dependency>
-      <groupId>\Qorg.openapitool\E</groupId>
-      <artifactId>\Qjackson-databind-nullable\E</artifactId>
+      <groupId>org.openapitools</groupId>
+      <artifactId>jackson-databind-nullable</artifactId>
       <matchLicenses>
         <!-- Match an empty list of licenses -->
       </matchLicenses>

diff --git a/pom.xml b/pom.xml
@@ -129,6 +129,16 @@
 					<source>8</source>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>2.0.0</version>
+				<configuration>
+					<licensesConfigFile>.github/workflows/licenses-config-file.xml</licensesConfigFile>
+					<licensesOutputFile>target/generated-resources/aggregate-licenses.xml</licensesOutputFile>
+					<excludedScopes>provided,system</excludedScopes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>