Skip to content

Commit

Permalink
CLDR-14680 Remove duplicate licenses (#1476)
Browse files Browse the repository at this point in the history 
- delete ICU-LICENSE (ICU4J is not part of the repo but automatically downloaded)
- remove copies of the license from the DTD files
- update GenerateDtd to update copyrights
- remove duplicate copies of the CLDR copyright statement
- update CLDRModify to remove garbled lines and the U+FE0F notice

Note: "CLDRModify -fp" was not performed in this commit,
that would reformat all data files.
  • Loading branch information
@srl295
srl295 authored Aug 31, 2021
1 parent 7fddb90 commit b1ff6ba
Show file tree
Hide file tree
Showing 21 changed files with 77 additions and 562 deletions.
414 changes: 0 additions & 414 deletions ICU-LICENSE
View file

This file was deleted.

15 changes: 5 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Latest Release: [v40.0](https://cldr.unicode.org/index/downloads/cldr-40) publis

## Build Status

GitHub:
GitHub:
[![cldr-mvn](https://github.com/unicode-org/cldr/workflows/cldr-mvn/badge.svg)](https://github.com/unicode-org/cldr/actions?query=branch%3Amaster+workflow%3A%22cldr-mvn%22)
[![Ansible Lint](https://github.com/unicode-org/cldr/workflows/Ansible%20Lint/badge.svg)](https://github.com/unicode-org/cldr/actions?query=branch%3Amaster+workflow%3A%22Ansible+Lint%22)

Expand All @@ -26,22 +26,17 @@ Click [HERE](http://unicode.org/cldr/survey_tool.html) for information on how to
For details about code and other contributions, see [CONTRIBUTING.md](./CONTRIBUTING.md)

### Licenses

- Usage of CLDR data and software is governed by the [Unicode Terms of Use](http://www.unicode.org/copyright.html)
a copy of which is included as [unicode-license.txt](./unicode-license.txt).

- Some CLDR tools depend on library dependencies managed via Maven,
use of these libraries is governed by separate license agreements.
- Use of the ICU libraries is subject to the
[ICU License]("https://github.com/unicode-org/icu/blob/master/icu4j/main/shared/licenses/LICENSE"),
included as [ICU-LICENSE](./ICU-LICENSE).
- Use of the Guava, Xerces, and Myanmar Tools libraries is subject to the
[Apache License]("http://www.apache.org/licenses/LICENSE-2.0.html")
included as [apache-license.txt](./apache-license.txt).
use of these libraries is governed by separate license agreements.

SPDX-License-Identifier: Unicode-DFS-2016

### Copyright

Copyright © 1991-2021 Unicode, Inc.
All rights reserved.
[Terms of use](http://www.unicode.org/copyright.html)

12 changes: 4 additions & 8 deletions common/dtd/ldml.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<!--
Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.

Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
$Revision$
Copyright © 1991-2021 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

<!ELEMENT ldml ( identity, ( alias | ( fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, characterLabels?, segmentations?, rbnf?, typographicNames?, annotations?, metadata?, references?, special* ) ) ) >
Expand Down
36 changes: 16 additions & 20 deletions common/dtd/ldmlBCP47.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
<!--
Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.

Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
$Revision$
Copyright © 1991-2021 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

<!ELEMENT ldmlBCP47 ( version, generation?, cldrVersion?, keyword*, attribute* ) >

<!ELEMENT version EMPTY >
<!--@METADATA-->
<!ATTLIST version number CDATA #REQUIRED >
<!--@MATCH:regex/\$Revision.*\$-->
<!--@MATCH:regex/\$Revision.*\$-->
<!--@METADATA-->
<!ATTLIST version cldrVersion CDATA #FIXED "40" >
<!--@MATCH:version-->
<!--@MATCH:version-->
<!--@VALUE-->

<!ELEMENT generation EMPTY >
Expand All @@ -37,41 +33,41 @@ $Revision$

<!ELEMENT key ( type* ) >
<!ATTLIST key extension NMTOKEN #IMPLIED >
<!--@MATCH:any-->
<!--@MATCH:any-->
<!ATTLIST key name NMTOKEN #REQUIRED >
<!--@MATCH:regex/[a-z0-9]{2}-->
<!--@MATCH:regex/[a-z0-9]{2}-->
<!ATTLIST key description CDATA #IMPLIED >
<!--@MATCH:any-->
<!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST key deprecated (true | false) "false" >
<!--@VALUE-->
<!ATTLIST key preferred NMTOKEN #IMPLIED >
<!--@VALUE-->
<!ATTLIST key alias NMTOKEN #IMPLIED >
<!--@MATCH:any-->
<!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST key valueType (single | multiple | incremental | any) #IMPLIED >
<!--@VALUE-->
<!ATTLIST key since CDATA #IMPLIED >
<!--@MATCH:version-->
<!--@MATCH:version-->
<!--@METADATA-->

<!ELEMENT type EMPTY >
<!ATTLIST type name NMTOKEN #REQUIRED >
<!--@MATCH:any-->
<!--@MATCH:any-->
<!ATTLIST type description CDATA #REQUIRED >
<!--@MATCH:any-->
<!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST type deprecated (true | false) "false" >
<!--@VALUE-->
<!ATTLIST type preferred NMTOKEN #IMPLIED >
<!--@MATCH:bcp47/anyvalue-->
<!--@MATCH:bcp47/anyvalue-->
<!--@VALUE-->
<!ATTLIST type alias CDATA #IMPLIED >
<!--@MATCH:any-->
<!--@MATCH:any-->
<!--@VALUE-->
<!ATTLIST type since CDATA #IMPLIED >
<!--@MATCH:version-->
<!--@MATCH:version-->
<!--@METADATA-->

<!ELEMENT attribute EMPTY >
Expand Down
13 changes: 7 additions & 6 deletions common/dtd/ldmlICU.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<!--
Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
Copyright © 1991-2021 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
<!--
NOTE: Unlike the other DTDs, this file is manually maintained.
-->

<!-- ######################################################### -->
Expand Down
13 changes: 4 additions & 9 deletions common/dtd/ldmlSupplemental.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
<!--
Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.

Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.

$Revision$
Copyright © 1991-2021 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
Expand Down
13 changes: 4 additions & 9 deletions keyboards/dtd/ldmlKeyboard.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
<!--
Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.

Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.

$Revision$
Copyright © 1991-2021 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

<!ELEMENT keyboard ( version, generation?, info?, names, settings?, import*, keyMap+, displayMap?, layer*, vkeys*, transforms*, reorders?, backspaces? ) >
Expand Down
20 changes: 8 additions & 12 deletions keyboards/dtd/ldmlPlatform.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
<!--
Copyright © 2003-2011 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.

Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.

$Revision$
Copyright © 1991-2021 Unicode, Inc.
For terms of use, see http://www.unicode.org/copyright.html
SPDX-License-Identifier: Unicode-DFS-2016
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-->

<!ELEMENT platform ( hardwareMap? ) >
<!ATTLIST platform id CDATA #REQUIRED >
<!--@MATCH:literal/android, chromeos, osx, windows-->
<!--@MATCH:literal/android, chromeos, osx, windows-->

<!ELEMENT hardwareMap ( map+ ) >

<!ELEMENT map EMPTY >
<!ATTLIST map keycode CDATA #REQUIRED >
<!--@MATCH:range/0~150-->
<!--@MATCH:range/0~150-->
<!ATTLIST map iso CDATA #REQUIRED >
<!--@MATCH:regex/[A-Z][0-9][0-9]-->
<!--@MATCH:regex/[A-Z][0-9][0-9]-->
<!--@VALUE-->
4 changes: 1 addition & 3 deletions tools/cldr-code/src/main/java/org/unicode/cldr/icu/ExtractICUData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ public static void main(String[] args) throws Exception {

static Set<String> skipLines = new HashSet<>(Arrays.asList(new String[] {
"#--------------------------------------------------------------------",
"# Copyright (c) 1999-2005, International Business Machines",
"# Copyright (c) 1999-2004, International Business Machines",
"# Corporation and others. All Rights Reserved.",

"#--------------------------------------------------------------------"
}));
static Set<String> skipFiles = new HashSet<>(Arrays.asList(new String[] {
Expand Down
4 changes: 3 additions & 1 deletion tools/cldr-code/src/main/java/org/unicode/cldr/icu/LDML2ICUBinaryWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import com.ibm.icu.lang.UCharacterEnums.ECharacterCategory;
import com.ibm.icu.text.UTF16;

import org.unicode.cldr.util.CldrUtility;

/**
* The LDML2ICUBinaryWriter class is a set of methods which can be used
* to generate Binary (.res) files in the ICU Binary format.
Expand All @@ -29,7 +31,7 @@ public class LDML2ICUBinaryWriter {
* This string is the copyright to be written into the file.
* In the C version, can be found in <I>icu4c_root</I>/source/common/unicode/uversion.h
*/
private static final String COPYRIGHT = " Copyright (C) 2012, International Business Machines Corporation and others. All Rights Reserved. ";
private static final String COPYRIGHT = CldrUtility.getCopyrightString();

public static int written = 0;

Expand Down
Loading

0 comments on commit b1ff6ba

Please sign in to comment.