This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 8433eb6 Update references to non-Apache licensed files in LICENSE
8433eb6 is described below
commit 8433eb6a12496a74326100b7e658564ab8037bb9
Author: Steve Lawrence <[email protected]>
AuthorDate: Wed Oct 14 09:54:50 2020 -0400
Update references to non-Apache licensed files in LICENSE
Some files have moved locations since originally being listed in the
LICENSE file. This updates those links so the match the actual
locations. The links are also sorted to ease scanning the list of files.
DAFFODIL-2365
---
LICENSE | 23 +++++++++++------------
daffodil-cli/bin.LICENSE | 4 ++--
daffodil-lib/src/main/resources/META-INF/LICENSE | 4 ++--
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/LICENSE b/LICENSE
index 1a95476..f21793e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -242,9 +242,9 @@ subcomponents is subject to the terms and conditions of the
following licenses.
following files:
- daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd
(https://www.w3.org/2001/XMLSchema.dtd)
- daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.xsd
(https://www.w3.org/2001/XMLSchema.xsd)
- - daffodil-lib/src/main/resources/org/apache/daffodil/xsd/xml.xsd
(https://www.w3.org/2001/xml.xsd)
- - daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd
(https://www.w3.org/2001/datatypes.dtd)
-
daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
(https://www.w3.org/2001/XMLSchema.dtd)
+ - daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd
(https://www.w3.org/2001/datatypes.dtd)
+ - daffodil-lib/src/main/resources/org/apache/daffodil/xsd/xml.xsd
(https://www.w3.org/2001/xml.xsd)
These files are available under the W3C Software and Document Licnese:
By obtaining and/or copying this work, you (the licensee) agree that you
have
@@ -285,20 +285,19 @@ subcomponents is subject to the terms and conditions of
the following licenses.
This product bundles content from the Open Grid Forum Data Format Description
Language (DFDL) v1.0 Specification, including the following files:
- -
daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd
- -
daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd
- -
daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc121_02.dfdl.xsd
- -
daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd
- -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd
- -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_01.dfdl.xsd
- -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_02.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_01.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd
-
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
-
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc81_01.dfdl.xsd
- -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
- -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd
-
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
- -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_01.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_01.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_02.dfdl.xsd
-
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_03.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd
+ -
daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd
The content is available under the Open Grid Forum license:
Intellectual Property Statement
diff --git a/daffodil-cli/bin.LICENSE b/daffodil-cli/bin.LICENSE
index 3594910..f104e28 100644
--- a/daffodil-cli/bin.LICENSE
+++ b/daffodil-cli/bin.LICENSE
@@ -241,9 +241,9 @@ subcomponents is subject to the terms and conditions of the
following licenses.
following files:
- org/apache/daffodil/xsd/XMLSchema.dtd
(https://www.w3.org/2001/XMLSchema.dtd) in
lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
- org/apache/daffodil/xsd/XMLSchema.xsd
(https://www.w3.org/2001/XMLSchema.xsd) in
lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
- - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd) in
lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
- - org/apache/daffodil/xsd/datatypes.dtd
(https://www.w3.org/2001/datatypes.dtd) in
lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
- org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
(https://www.w3.org/2001/XMLSchema.dtd) in
lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
+ - org/apache/daffodil/xsd/datatypes.dtd
(https://www.w3.org/2001/datatypes.dtd) in
lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
+ - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd) in
lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
These files are available under the W3C Software and Document Licnese:
By obtaining and/or copying this work, you (the licensee) agree that you
have
diff --git a/daffodil-lib/src/main/resources/META-INF/LICENSE
b/daffodil-lib/src/main/resources/META-INF/LICENSE
index 8df56fa..c38099f 100644
--- a/daffodil-lib/src/main/resources/META-INF/LICENSE
+++ b/daffodil-lib/src/main/resources/META-INF/LICENSE
@@ -242,9 +242,9 @@ subcomponents is subject to the terms and conditions of the
following licenses.
following files:
- org/apache/daffodil/xsd/XMLSchema.dtd
(https://www.w3.org/2001/XMLSchema.dtd)
- org/apache/daffodil/xsd/XMLSchema.xsd
(https://www.w3.org/2001/XMLSchema.xsd)
- - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd)
- - org/apache/daffodil/xsd/datatypes.dtd
(https://www.w3.org/2001/datatypes.dtd)
- org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
(https://www.w3.org/2001/XMLSchema.dtd)
+ - org/apache/daffodil/xsd/datatypes.dtd
(https://www.w3.org/2001/datatypes.dtd)
+ - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd)
These files are available under the W3C Software and Document Licnese:
By obtaining and/or copying this work, you (the licensee) agree that you
have
