[java-idp-plugin-scripting] 01/03: IDP-1595 Add explicit licensing information to plugins
Rod Widdowson
rdw at steadingsoftware.com
Sun Jul 5 13:46:25 UTC 2020
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-idp-plugin-scripting.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=cec9f377c6556f427f28bcf5e0ac042de42dcd64
commit cec9f377c6556f427f28bcf5e0ac042de42dcd64
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jul 5 11:35:51 2020 +0100
IDP-1595 Add explicit licensing information to plugins
https://issues.shibboleth.net/jira/browse/IDP-1595
List the license restriction of every non Shibboleth package.
Amend the Nashorn package to ship more stuff (with the assembly
file garnished with links to the relevant license info).
---
.../src/main/assembly/nashorn-assembly.xml | 2 ++
.../src/main/resources/doc/nashhorn-plugin | 12 +++++++
nashorn-impl/pom.xml | 16 +++++++++
.../scripting/nashorn/NashornDescription.java | 9 ++---
rhino-dist/src/main/assembly/rhino-assembly.xml | 4 +--
rhino-dist/src/main/resources/doc/rhino-plugin | 39 ++++++++++++++++++++++
rhino-impl/pom.xml | 2 +-
7 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/nashorn-dist/src/main/assembly/nashorn-assembly.xml b/nashorn-dist/src/main/assembly/nashorn-assembly.xml
index 7078fe3..608967d 100644
--- a/nashorn-dist/src/main/assembly/nashorn-assembly.xml
+++ b/nashorn-dist/src/main/assembly/nashorn-assembly.xml
@@ -10,6 +10,8 @@
<outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>nashorn-impl-*.jar</include>
+ <include>asm-*.jar</include> <!-- https://asm.ow2.io/license.html -->
+ <include>icu4j-*.jar</include> <!-- http://userguide.icu-project.org/icufaq#TOC-How-is-the-ICU-licensed- -->
</includes>
<excludes>
<exclude>*test*.jar</exclude>
diff --git a/nashorn-dist/src/main/resources/doc/nashhorn-plugin b/nashorn-dist/src/main/resources/doc/nashhorn-plugin
new file mode 100644
index 0000000..9513f13
--- /dev/null
+++ b/nashorn-dist/src/main/resources/doc/nashhorn-plugin
@@ -0,0 +1,12 @@
+GraalVM:
+ GraalVM is not distributed as part of this plugin.
+
+ASM:
+ ASM is distributed under a BSD 3-clause license
+ https://asm.ow2.io/license.html
+
+ICU4J:
+ ICU4J is distributed under a ICU license
+ http://www.unicode.org/copyright.html
+
+
\ No newline at end of file
diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index cd15cc2..e5f7c07 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -58,6 +58,22 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>install</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
index 31c5388..62f1f0e 100644
--- a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
+++ b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
@@ -40,16 +40,11 @@ public class NashornDescription extends PluginDescription {
static final String GRAAL_VERSION = "20.0.0";
static final String MAVEN_REPO = "https://repo1.maven.org/maven2/";
+ /** These are the files that are not packagable. */
static final List<String> jars = List.of(MAVEN_REPO + "org/graalvm/sdk/graal-sdk/" + GRAAL_VERSION + "/graal-sdk-" + GRAAL_VERSION +".jar",
MAVEN_REPO + "org/graalvm/js/js/" + GRAAL_VERSION + "/js-" + GRAAL_VERSION +".jar",
MAVEN_REPO + "org/graalvm/regex/regex/" + GRAAL_VERSION + "/regex-" + GRAAL_VERSION +".jar",
- MAVEN_REPO + "org/graalvm/truffle/truffle-api/" + GRAAL_VERSION + "/truffle-api-" + GRAAL_VERSION +".jar",
- MAVEN_REPO + "org/os2/asm/asm/7.1/asm-7.1.jar",
- MAVEN_REPO + "org/os2/asm/asm-analysis/7.1/asm-analysis-7.1.jar",
- MAVEN_REPO + "org/os2/asm/asm-commons/7.1/asm-commons-7.1.jar",
- MAVEN_REPO + "org/os2/asm/asm-tree/7.1/asm-tree-7.1.jar",
- MAVEN_REPO + "org/os2/asm/asm-uril/7.1/asm-util-7.1.jar",
- MAVEN_REPO + "com/ibm/icu/icu4j/64.2/icu4j-64.2.jar");
+ MAVEN_REPO + "org/graalvm/truffle/truffle-api/" + GRAAL_VERSION + "/truffle-api-" + GRAAL_VERSION +".jar");
@Override
public String getPluginId() {
diff --git a/rhino-dist/src/main/assembly/rhino-assembly.xml b/rhino-dist/src/main/assembly/rhino-assembly.xml
index 1021c1d..45dafbf 100644
--- a/rhino-dist/src/main/assembly/rhino-assembly.xml
+++ b/rhino-dist/src/main/assembly/rhino-assembly.xml
@@ -6,10 +6,10 @@
</formats>
<fileSets>
<fileSet>
- <directory>../nashorn-impl/target</directory>
+ <directory>../rhino-impl/target</directory>
<outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>rhino-*.jar</include>
+ <include>rhino-*.jar</include> <!-- https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/License -->
</includes>
<excludes>
<exclude>*test*.jar</exclude>
diff --git a/rhino-dist/src/main/resources/doc/rhino-plugin b/rhino-dist/src/main/resources/doc/rhino-plugin
new file mode 100644
index 0000000..dfb3b8b
--- /dev/null
+++ b/rhino-dist/src/main/resources/doc/rhino-plugin
@@ -0,0 +1,39 @@
+https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/License
+
+Rhino is available under open source licenses.
+
+
+MPL/GPL License
+The majority of the source code for Rhino is available under a MPL 1.1/GPL 2.0 license.
+
+License for portions of the Rhino debugger
+Additionally, some files (currently the contents of toolsrc/org/mozilla/javascript/tools/debugger/treetable/) are available under the following license:
+
+ * Copyright 1997, 1998 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Sun Microsystems nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index b2a4726..4765495 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -45,7 +45,7 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>after-package</phase>
+ <phase>install</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list