ACS-2365 Ensure we run license reporting against all submodules by default. (#877)

* ACS-2365 Ensure we run license reporting against all submodules by default.

* Fix a couple of typos in comments.

* ACS-2365 Ignore all internal libraries.
This commit is contained in:
Tom Page
2022-01-07 16:41:37 +00:00
committed by GitHub
parent 00f68e591e
commit 61db08cc87
7 changed files with 112 additions and 95 deletions

View File

@@ -46,7 +46,13 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>2.0.1.alfresco-1</version> <executions>
<execution>
<id>first</id>
<goals>
<goal>update-file-header</goal>
</goals>
<phase>none</phase>
<configuration> <configuration>
<verbose>${license.verbose}</verbose> <verbose>${license.verbose}</verbose>
<addSvnKeyWords>false</addSvnKeyWords> <addSvnKeyWords>false</addSvnKeyWords>
@@ -58,7 +64,7 @@
<canUpdateCopyright>true</canUpdateCopyright> <canUpdateCopyright>true</canUpdateCopyright>
<canUpdateDescription>true</canUpdateDescription> <canUpdateDescription>true</canUpdateDescription>
<!-- licence configuration --> <!-- license configuration -->
<licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver> <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
<!-- dry run options --> <!-- dry run options -->
@@ -71,7 +77,7 @@
<root>src</root> <root>src</root>
</roots> </roots>
<!-- exculsions --> <!-- exclusions -->
<excludes> <excludes>
<exclude>**/package-info.java</exclude> <exclude>**/package-info.java</exclude>
<exclude>**/*.properties</exclude> <exclude>**/*.properties</exclude>
@@ -83,13 +89,6 @@
</excludes> </excludes>
</configuration> </configuration>
<executions>
<execution>
<id>first</id>
<goals>
<goal>update-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>

View File

@@ -37,6 +37,16 @@
<skipTests>${skip.automationtests}</skipTests> <skipTests>${skip.automationtests}</skipTests>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<id>third-party-licenses</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@@ -10,17 +10,22 @@
<version>14.73-SNAPSHOT</version> <version>14.73-SNAPSHOT</version>
</parent> </parent>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<id>first</id>
<phase>process-sources</phase>
<configuration> <configuration>
<licenseName>alfresco_community</licenseName> <licenseName>alfresco_community</licenseName>
<licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver> <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
<descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate> <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

View File

@@ -320,6 +320,10 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<id>first</id>
<phase>process-sources</phase>
<configuration> <configuration>
<licenseName>alfresco_community</licenseName> <licenseName>alfresco_community</licenseName>
<roots> <roots>
@@ -331,6 +335,8 @@
<root>test/resources</root> <root>test/resources</root>
</roots> </roots>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

View File

@@ -925,7 +925,7 @@
<configuration> <configuration>
<failOnMissing>true</failOnMissing> <failOnMissing>true</failOnMissing>
<excludedScopes>provided,test</excludedScopes> <excludedScopes>provided,test</excludedScopes>
<excludedGroups>org.alfresco</excludedGroups> <excludedGroups>^(org\.alfresco|com\.alfresco|org\.activiti).*</excludedGroups>
<failIfWarning>false</failIfWarning> <failIfWarning>false</failIfWarning>
<includedLicenses> <includedLicenses>
https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt
@@ -949,5 +949,11 @@
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
</plugin>
</plugins>
</build> </build>
</project> </project>

View File

@@ -176,15 +176,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.0.1.alfresco-1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<!-- Create a jar of test classes --> <!-- Create a jar of test classes -->
<plugin> <plugin>
@@ -271,6 +262,13 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<id>check-licenses</id>
<phase>compile</phase>
<goals>
<goal>check-file-header</goal>
</goals>
<configuration> <configuration>
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
<organizationName>Alfresco Software Limited</organizationName> <organizationName>Alfresco Software Limited</organizationName>
@@ -286,13 +284,6 @@
<include>**/*.jsp</include> <include>**/*.jsp</include>
</includes> </includes>
</configuration> </configuration>
<executions>
<execution>
<id>check-licenses</id>
<phase>compile</phase>
<goals>
<goal>check-file-header</goal>
</goals>
</execution> </execution>
</executions> </executions>
<dependencies> <dependencies>

View File

@@ -988,6 +988,13 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<id>check-licenses</id>
<phase>compile</phase>
<goals>
<goal>check-file-header</goal>
</goals>
<configuration> <configuration>
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
<organizationName>Alfresco Software Limited</organizationName> <organizationName>Alfresco Software Limited</organizationName>
@@ -1003,13 +1010,6 @@
<include>**/*.jsp</include> <include>**/*.jsp</include>
</includes> </includes>
</configuration> </configuration>
<executions>
<execution>
<id>check-licenses</id>
<phase>compile</phase>
<goals>
<goal>check-file-header</goal>
</goals>
</execution> </execution>
</executions> </executions>
<dependencies> <dependencies>