Skip to content
This repository has been archived by the owner on Dec 4, 2023. It is now read-only.

Commit

Permalink
Bump codehaus-license-maven-plugin from 1.16 to 1.17. (#2333)
Browse files Browse the repository at this point in the history 
Simplify stylesheet as downloaded license filename now available in xml.
Add license overrides for those dependencies that declare a license url that that cannot be downloaded.
  • Loading branch information
@k-wall
k-wall committed Feb 18, 2019
1 parent 0c032f1 commit 9c18aa0
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 14 deletions.
107 changes: 107 additions & 0 deletions licenses-override.xml
View file
@@ -0,0 +1,107 @@
<?xml version="1.0"?>
<licenseSummary xmlns="http://mojo.codehaus.org/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://mojo.codehaus.org/ licenses.xsd">
<dependencies>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
<licenses>
<license>
<name>CC0</name>
<url>https://raw.githubusercontent.com/reactive-streams/reactive-streams-jvm/v1.0.2/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<licenses>
<license>
<name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
<url>https://javaee.github.io/glassfish/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<licenses>
<license>
<name>CDDL+GPL_1_1</name>
<url>https://javaee.github.io/glassfish/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<licenses>
<license>
<name>CDDL+GPL_1_1</name>
<url>https://javaee.github.io/glassfish/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<licenses>
<license>
<name>CDDL+GPL_1_1</name>
<url>https://javaee.github.io/glassfish/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<licenses>
<license>
<name>CDDL+GPL_1_1</name>
<url>https://javaee.github.io/glassfish/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.2_spec</artifactId>
<licenses>
<license>
<name>CDDL or GPLv2 with exceptions</name>
<url>https://raw.githubusercontent.com/jboss/jboss-annotations-api_spec/jboss-annotations-api_1.2_spec-1.0.0.Final/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.bind</groupId>
<artifactId>jboss-jaxb-api_2.3_spec</artifactId>
<licenses>
<license>
<name>CDDL or GPLv2 with exceptions</name>
<url>https://raw.githubusercontent.com/jboss/jboss-jaxb-api_spec/jboss-jaxb-api_2.3_spec-1.0.1.Final/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<licenses>
<license>
<name>Dual license consisting of the CDDL v1.1 and GPL v2</name>
<url>https://javaee.github.io/glassfish/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<licenses>
<license>
<name>CDDL+GPL_1_1</name>
<url>https://javaee.github.io/glassfish/LICENSE</url>
</license>
</licenses>
</dependency>
</dependencies>
</licenseSummary>
12 changes: 2 additions & 10 deletions licenses.xsl
View file
Expand Up @@ -88,16 +88,8 @@
</td>
<td>
<xsl:for-each select="licenses/license">
<xsl:variable name="filename">
<xsl:call-template name="remap-local-filename">
<xsl:with-param name="groupId" select="../../groupId"/>
<xsl:with-param name="artifactId" select="../../artifactId"/>
<xsl:with-param name="name" select="name"/>
<xsl:with-param name="url" select="url"/>
</xsl:call-template>
</xsl:variable>
<a href="{$filename}">
<xsl:value-of select="$filename"/>
<a href="{file}">
<xsl:value-of select="file"/>
</a>
<br/>
</xsl:for-each>
Expand Down
6 changes: 2 additions & 4 deletions pom.xml
View file
Expand Up @@ -82,7 +82,7 @@
<asciidoctor-maven-plugin.version>1.5.6</asciidoctor-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<mycila-license-maven-plugin.version>2.11</mycila-license-maven-plugin.version>
<codehaus-license-maven-plugin.version>1.16</codehaus-license-maven-plugin.version>
<codehaus-license-maven-plugin.version>1.17</codehaus-license-maven-plugin.version>
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<jmx_prometheus_javaagent.version>0.3.1</jmx_prometheus_javaagent.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
Expand Down Expand Up @@ -927,11 +927,9 @@
<id>download-thirdparty-licenses</id>
<phase>prepare-package</phase>
<configuration>
<licensesConfigFile>${maven.multiModuleProjectDirectory}/licenses-override.xml</licensesConfigFile>
<licensesOutputFile>${project.build.outputDirectory}/licenses/licenses.xml</licensesOutputFile>
<licensesOutputDirectory>${project.build.outputDirectory}/licenses</licensesOutputDirectory>
<!-- org.reactivestreams:reactive-streams is http://creativecommons.org/publicdomain/zero/1.0/,
but the programmatic download of the license seems to be disallowed by the server. -->
<excludedGroups>org.reactivestreams</excludedGroups>
<organizeLicensesByDependencies>true</organizeLicensesByDependencies>
</configuration>
<goals>
Expand Down

0 comments on commit 9c18aa0

Please sign in to comment.