You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pr@jena.apache.org by GitBox <gi...@apache.org> on 2021/12/31 18:06:59 UTC
[GitHub] [jena] afs opened a new pull request #1148: JENA-2236: Revise LICENSE and NOTICE files
afs opened a new pull request #1148:
URL: https://github.com/apache/jena/pull/1148
Notes:
The Maven shade and Maven war plugins combine LICENSE and NOTICE from dependence jars. This greatly simplifies the manual content we need.
- Delete jena-fuseki2/LICENSE - not needed.
- Delete jena-fuseki-server/src/main/resources/META-INF/NOTICE
Automatically done by maven-shade-plugin
- Remove jena-fuseki-geosparql/src/main/resources/META-INF/NOTICE
Automatically done by maven-shade-plugin
- Use of DEPENDENCIES in jena-fuseki-war for the JS related content. This is the same style as maven-war-plugin generates for included jar files.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org
[GitHub] [jena] kinow commented on a change in pull request #1148: JENA-2236: Revise LICENSE and NOTICE files
Posted by GitBox <gi...@apache.org>.
kinow commented on a change in pull request #1148:
URL: https://github.com/apache/jena/pull/1148#discussion_r777081649
##########
File path: jena-fuseki2/jena-fuseki-ui/dist/README-dist
##########
@@ -0,0 +1,44 @@
+## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+
+# Generating LICENSE and NOTICE for redistribution of the Fuseki UI.
+
+This only needs to be done if Javascript dependencies change. The places where
+the content is required are LICENSE files that are checked into git.
+
+ASF material:
+https://infra.apache.org/licensing-howto.html
+https://www.apache.org/legal/resolved.html#required-third-party-notices
+
+For jar files, the maven-shade-plugin aggregates LICENSE and NOTICE files.
+
+# UI code
+
+The script make-license generates the necessary content using yarn and places it
+in jena-fuseki-ui/target/ as LICENSE-UI and NOTICE-UI (if any).
+
+NOTICE particularly should be as short as possible.
+
+Typically, required license text goes in LICENSE.
+Links to licenses may be used.
+
+These file are the content for the UI inclusion - they may be other content to
+include so don't simply overwrite existing LICENSE and NOTICE files without
+checking. The conten is at the bottom of the file.
Review comment:
s/content/content
##########
File path: jena-fuseki2/jena-fuseki-ui/dist/README-dist
##########
@@ -0,0 +1,44 @@
+## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+
+# Generating LICENSE and NOTICE for redistribution of the Fuseki UI.
+
+This only needs to be done if Javascript dependencies change. The places where
+the content is required are LICENSE files that are checked into git.
+
+ASF material:
+https://infra.apache.org/licensing-howto.html
+https://www.apache.org/legal/resolved.html#required-third-party-notices
+
+For jar files, the maven-shade-plugin aggregates LICENSE and NOTICE files.
+
+# UI code
+
+The script make-license generates the necessary content using yarn and places it
+in jena-fuseki-ui/target/ as LICENSE-UI and NOTICE-UI (if any).
+
+NOTICE particularly should be as short as possible.
+
+Typically, required license text goes in LICENSE.
+Links to licenses may be used.
+
+These file are the content for the UI inclusion - they may be other content to
+include so don't simply overwrite existing LICENSE and NOTICE files without
+checking. The conten is at the bottom of the file.
+
+These files are included where the bundled jena-fuseki-ui is shipped.
+
+## Fuseki Webapp
+
+* apache-jena-fuseki/dist/LICENSE
+* jena-fuseki-war/war-inclusions/META-INF/LICENSE
+
+## Fuseki Main
+
+(Future)
+
+If there is a Fuseki module for the UI, then that will need a LICENSE file.
+That might be done automatically is the content is placed in a jar using
Review comment:
s/is the content/if the content
##########
File path: jena-fuseki2/jena-fuseki-ui/dist/make-license
##########
@@ -0,0 +1,62 @@
+#!/bin/bash
+## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+## LICENSE and NOTICE content generator.
+## see jena-fuseki-ui/README
+## Run this script in the "jena-fuseki-ui/dist"
+## Genrated files go into ../../target/
+
+## List of licenses used.
+function runYarnLicensesList() {
+ echo "## Output of 'yarn licenses list --prod'"
+ echo
+ ## Convert to plain ASCII
+ yarn licenses list --prod \
+ | sed -e 's/├/+/g' -e 's/─/-/g' -e 's/└/\\/g' -e 's/│/|/g' \
+ | sed -e 's/Done in .*$//'
+}
+
+## All the text.
+## https://infra.apache.org/licensing-howto.html
+
+function runYarnLicensesDisclaimer() {
+ (
+ cd ..
+ echo "## Output of 'yarn licenses generate-disclaimer --prod'"
+ echo
+ yarn licenses generate-disclaimer --prod
+ )
+}
+
+
+function makeLicense() {
+ # Apache License 2.0
+ (
+ cd ..
+ ## When generating fragments, this isn't needed.
+ ##curl --no-progress-meter "https://www.apache.org/licenses/LICENSE-2.0"
+ echo
+ echo "- - - - - - - - - - - - - - - - - - - - - - -"
+ echo
+ runYarnLicensesList
+ ) >> ${TARGET}/LICENSE-UI
+}
+
+function makeNotice() {
+ (
+ cd ..
+ echo "Apache Jena"
+ echo "Copyright 2011-$(date +%Y) The Apache Software Foundation"
+ echo
+ echo "- - - - - - - - - - - - - - - - - - - - - - -"
+ echo
+ runYarnLicensesDisclaimer
+ ) > ${TARGET}/NOTICE-UI
+}
+
+TARGET="../target"
+
+makeLicense
+
+## For redistributing, LICENSE is enough.
+## makeNotice
Review comment:
Thank you!!! :pray:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org
[GitHub] [jena] afs merged pull request #1148: JENA-2236: Revise LICENSE and NOTICE files
Posted by GitBox <gi...@apache.org>.
afs merged pull request #1148:
URL: https://github.com/apache/jena/pull/1148
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org