Skip to content

Commit 2cbcbcc

Browse files
Seppli11sonartech
authored and
sonartech
committed
SONARPY-2539 Fix license check in the enterprise-plugin (#11)
GitOrigin-RevId: 82f55d872594eaa348135faed8d0ab3adeeed2c3
1 parent a8e3f47 commit 2cbcbcc

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

Diff for: .cirrus-public.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ build_task:
4646
- rm -rf private
4747
- source cirrus-env BUILD
4848
- regular_mvn_build_deploy_analyze -DskipTests=true -Dsonar.skip=true -P-typeshed_serializer,-sign,-private
49-
- ./check-license-compliance.sh -P-private
49+
- ./check-license-compliance.sh
5050
cleanup_before_cache_script: cleanup_maven_repository
5151

5252
test_analyze_task:

Diff for: check-license-compliance.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ set -euo pipefail
33

44
mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party \
55
-Dlicense.overrideUrl=file://$(pwd)/override-dep-licenses.properties \
6+
-P-private \
67
"$@"

Diff for: pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -300,21 +300,6 @@
300300
<modules>
301301
<module>private</module>
302302
</modules>
303-
<build>
304-
<pluginManagement>
305-
<plugins>
306-
<plugin>
307-
<groupId>org.codehaus.mojo</groupId>
308-
<artifactId>license-maven-plugin</artifactId>
309-
<configuration>
310-
<includedLicenses>
311-
apache_v2|bouncy_castle|bsd|cddl_gpl|cddl_v1|epl_v1|epl_v2|h2|jaxen|lgpl_v2_1|lgpl_v3|mit|public_domain|tmate|SSALv1|sonarsource
312-
</includedLicenses>
313-
</configuration>
314-
</plugin>
315-
</plugins>
316-
</pluginManagement>
317-
</build>
318303
</profile>
319304
</profiles>
320305
</project>

0 commit comments

Comments
 (0)