Skip to content

Commit 876a62d

Browse files
hduelmehduelme
authored
Update license plugin (#3999)
1 parent 66625e6 commit 876a62d

File tree

4 files changed

+55
-37
lines changed

4 files changed

+55
-37
lines changed

‎integrationtest/src/test/resources/gradleIncrementalCompilationTest/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright MapStruct Authors.
3+
*
4+
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
5+
*/
16
plugins {
27
id 'java'
38
}

‎integrationtest/src/test/resources/gradleIncrementalCompilationTest/settings.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1+
/*
2+
* Copyright MapStruct Authors.
3+
*
4+
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
5+
*/
16
rootProject.name = 'gradle-incremental-compilation-test'

‎parent/pom.xml‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,9 @@
509509
<version>${kotlin.version}</version>
510510
</plugin>
511511
<plugin>
512-
<groupId>com.mycila.maven-license-plugin</groupId>
513-
<artifactId>maven-license-plugin</artifactId>
514-
<version>1.10.b1</version>
512+
<groupId>com.mycila</groupId>
513+
<artifactId>license-maven-plugin</artifactId>
514+
<version>4.6</version>
515515
</plugin>
516516
<plugin>
517517
<groupId>org.codehaus.mojo</groupId>
@@ -649,39 +649,43 @@
649649

650650
<plugins>
651651
<plugin>
652-
<groupId>com.mycila.maven-license-plugin</groupId>
653-
<artifactId>maven-license-plugin</artifactId>
652+
<groupId>com.mycila</groupId>
653+
<artifactId>license-maven-plugin</artifactId>
654654
<configuration>
655-
<header>${basedir}/../etc/license.txt</header>
656655
<strictCheck>true</strictCheck>
657-
<excludes>
658-
<exclude>**/.idea/**</exclude>
659-
<exclude>**/.mvn/**</exclude>
660-
<exclude>**/build-config/checkstyle.xml</exclude>
661-
<exclude>**/build-config/import-control.xml</exclude>
662-
<exclude>copyright.txt</exclude>
663-
<exclude>**/LICENSE.txt</exclude>
664-
<exclude>**/mapstruct.xml</exclude>
665-
<exclude>**/ci-settings.xml</exclude>
666-
<exclude>**/eclipse-formatter-config.xml</exclude>
667-
<exclude>**/forbidden-apis.txt</exclude>
668-
<exclude>**/checkstyle-for-generated-sources.xml</exclude>
669-
<exclude>**/nb-configuration.xml</exclude>
670-
<exclude>**/junit-platform.properties</exclude>
671-
<exclude>maven-settings.xml</exclude>
672-
<exclude>readme.md</exclude>
673-
<exclude>CONTRIBUTING.md</exclude>
674-
<exclude>NEXT_RELEASE_CHANGELOG.md</exclude>
675-
<exclude>.gitattributes</exclude>
676-
<exclude>.gitignore</exclude>
677-
<exclude>.factorypath</exclude>
678-
<exclude>.checkstyle</exclude>
679-
<exclude>*.yml</exclude>
680-
<exclude>mvnw*</exclude>
681-
<exclude>**/*.asciidoc</exclude>
682-
<exclude>**/binding.xjb</exclude>
683-
<exclude>**/*.flattened-pom.xml</exclude>
684-
</excludes>
656+
<licenseSets>
657+
<licenseSet>
658+
<header>${basedir}/../etc/license.txt</header>
659+
<excludes>
660+
<exclude>**/.idea/**</exclude>
661+
<exclude>**/.mvn/**</exclude>
662+
<exclude>**/build-config/checkstyle.xml</exclude>
663+
<exclude>**/build-config/import-control.xml</exclude>
664+
<exclude>copyright.txt</exclude>
665+
<exclude>**/LICENSE.txt</exclude>
666+
<exclude>**/mapstruct.xml</exclude>
667+
<exclude>**/ci-settings.xml</exclude>
668+
<exclude>**/eclipse-formatter-config.xml</exclude>
669+
<exclude>**/forbidden-apis.txt</exclude>
670+
<exclude>**/checkstyle-for-generated-sources.xml</exclude>
671+
<exclude>**/nb-configuration.xml</exclude>
672+
<exclude>**/junit-platform.properties</exclude>
673+
<exclude>maven-settings.xml</exclude>
674+
<exclude>readme.md</exclude>
675+
<exclude>CONTRIBUTING.md</exclude>
676+
<exclude>NEXT_RELEASE_CHANGELOG.md</exclude>
677+
<exclude>.gitattributes</exclude>
678+
<exclude>.gitignore</exclude>
679+
<exclude>.factorypath</exclude>
680+
<exclude>.checkstyle</exclude>
681+
<exclude>*.yml</exclude>
682+
<exclude>mvnw*</exclude>
683+
<exclude>**/*.asciidoc</exclude>
684+
<exclude>**/binding.xjb</exclude>
685+
<exclude>**/*.flattened-pom.xml</exclude>
686+
</excludes>
687+
</licenseSet>
688+
</licenseSets>
685689
<mapping>
686690
<java>SLASHSTAR_STYLE</java>
687691
<proto>SLASHSTAR_STYLE</proto>

‎pom.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@
3535
<build>
3636
<plugins>
3737
<plugin>
38-
<groupId>com.mycila.maven-license-plugin</groupId>
39-
<artifactId>maven-license-plugin</artifactId>
38+
<groupId>com.mycila</groupId>
39+
<artifactId>license-maven-plugin</artifactId>
4040
<configuration>
41-
<header>etc/license.txt</header>
41+
<licenseSets>
42+
<licenseSet>
43+
<header>etc/license.txt</header>
44+
</licenseSet>
45+
</licenseSets>
4246
<mapping>
4347
<xjb>XML_STYLE</xjb>
4448
<java>SLASHSTAR_STYLE</java>

0 commit comments

Comments
 (0)