Skip to content

Commit

Permalink
ICU-21964 use a single LICENSE file
Browse files Browse the repository at this point in the history
- make the icu4c and icu4j LICENSE files symlinks
- fix paths
  • Loading branch information
srl295 committed Apr 12, 2023
1 parent 58c674a commit 312bae8
Show file tree
Hide file tree
Showing 14 changed files with 543 additions and 1,059 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ _… and thanks for contributing!_

### License

Please see [./icu4c/LICENSE](./icu4c/LICENSE) (C and J are under an identical license file.)
Please see [./LICENSE](./LICENSE)

> Copyright © 2021 and later Unicode, Inc. and others. All Rights Reserved.
Unicode and the Unicode Logo are registered trademarks
Expand Down
519 changes: 519 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ Fuzzing | [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/

### License

Please see [./icu4c/LICENSE](./icu4c/LICENSE) (C and J are under an identical license file.)
Please see [./LICENSE](./LICENSE)

> Copyright © 2016 and later Unicode, Inc. and others. All Rights Reserved.
Unicode and the Unicode Logo are registered trademarks
Unicode and the Unicode Logo are registered trademarks
of Unicode, Inc. in the U.S. and other countries.
[Terms of Use and License](http://www.unicode.org/copyright.html)
2 changes: 1 addition & 1 deletion docs/userguide/icu/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ included, building, installing, etc.

## ICU License

Current license: <https://github.com/unicode-org/icu/blob/main/icu4c/LICENSE>
Current license: <https://github.com/unicode-org/icu/blob/main/LICENSE>

See also FAQ section ["How is the ICU licensed"](icufaq/index#how-is-icu-licensed)
2 changes: 1 addition & 1 deletion docs/userguide/icu/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Changes in previous releases can also be found the main [ICU download page](http

## License Information

The ICU projects (ICU4C and ICU4J) are hosted by the [Unicode Consortium](http://www.unicode.org/). The ICU binary and source files are distributed under the [UNICODE DATA FILES AND SOFTWARE LICENSE](http://www.unicode.org/copyright.html). The full copy of the license and third party software licenses are available in [LICENSE](https://github.com/unicode-org/icu/blob/main/icu4j/main/shared/licenses/LICENSE) file included in this package.
The ICU projects (ICU4C and ICU4J) are hosted by the [Unicode Consortium](https://www.unicode.org/). The ICU binary and source files are distributed under the [Unicode Data Files and Software License](https://www.unicode.org/license.txt). The full copy of the license and third party software licenses are available in the [LICENSE](https://github.com/unicode-org/icu/blob/main/LICENSE) file included in this package.
2 changes: 1 addition & 1 deletion docs/userguide/icu4c/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ The ICU homepage also links to related information about writing internationaliz
| Online ICU Demos | <https://icu4c-demos.unicode.org/icu-bin/icudemos> |
| Contacts and Bug Reports/Feature Requests | <https://icu.unicode.org/contacts> |

**Important:** Please make sure you understand the [Copyright and License Information](https://github.com/unicode-org/icu/blob/main/icu4c/LICENSE).
**Important:** Please make sure you understand the [Copyright and License Information](https://github.com/unicode-org/icu/blob/main/LICENSE).

## What Is New In The Current Release?

Expand Down
519 changes: 0 additions & 519 deletions icu4c/LICENSE

This file was deleted.

1 change: 1 addition & 0 deletions icu4c/LICENSE
519 changes: 0 additions & 519 deletions icu4j/main/shared/licenses/LICENSE

This file was deleted.

1 change: 1 addition & 0 deletions icu4j/main/shared/licenses/LICENSE
13 changes: 7 additions & 6 deletions icu4j/maven-build/maven-icu4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>73.1-SNAPSHOT</version>
<!-- default relativePath for parent -->
</parent>

<modelVersion>4.0.0</modelVersion>

<groupId>com.ibm.icu</groupId>
Expand Down Expand Up @@ -56,7 +56,7 @@
</sources>
</configuration>
</execution>

<!-- add directories with test code -->
<execution>
<id>add-test-source</id>
Expand Down Expand Up @@ -223,14 +223,14 @@
</executions>
</plugin>

<!--
<!--
Process and transform the resource files before they get packaged up in the .jar file.
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<!--
<!--
Replicate the creation of fullLocaleNames.lst files in every subdirectory of the dir of copied data
that the Ant build.xml file encodes.
-->
Expand All @@ -254,7 +254,8 @@
<configuration>
<executable>cp</executable>
<arguments>
<argument>../../../icu4c/LICENSE</argument>
<!-- Note! we use the license in the icu4j subtree, because we might be running out of an unpacked icu4j source .jar -->
<argument>../../main/shared/licenses/LICENSE</argument>
<argument>${project.build.directory}/classes</argument>
</arguments>
</configuration>
Expand Down
8 changes: 4 additions & 4 deletions icu4j/maven-build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
<name>ICU4J Root</name>
<description>
International Component for Unicode for Java (ICU4J) is a mature, widely used Java library
providing Unicode and Globalization support
providing Unicode and Globalization support
</description>
<url>https://icu.unicode.org/</url>
<inceptionYear>2001</inceptionYear>

<licenses>
<license>
<name>Unicode/ICU License</name>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -149,7 +149,7 @@
</distributionManagement>

<profiles>
<!--
<!--
For testing localespi using the Java extensions feature, which last existed in Java 8.
ICU4J currently has a minimum supported version of 8.
-->
Expand Down Expand Up @@ -180,7 +180,7 @@
</profiles>

<properties>
<!--
<!--
Main ICU4J version number.
Note: This version string must also be repeated in <version> of this root pom.xml above.
Note: Keep the `jar.spec.version` number in sync with this value, too.
Expand Down
2 changes: 1 addition & 1 deletion icu4j/maven/icu4j-charset/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<licenses>
<license>
<name>Unicode/ICU License</name>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down
2 changes: 1 addition & 1 deletion icu4j/maven/icu4j-localespi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<licenses>
<license>
<name>Unicode/ICU License</name>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down
4 changes: 2 additions & 2 deletions icu4j/maven/icu4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
<name>ICU4J</name>
<description>
International Component for Unicode for Java (ICU4J) is a mature, widely used Java library
providing Unicode and Globalization support
providing Unicode and Globalization support
</description>
<url>https://icu.unicode.org/</url>
<inceptionYear>2001</inceptionYear>

<licenses>
<license>
<name>Unicode/ICU License</name>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down
2 changes: 1 addition & 1 deletion tools/unicodetools/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<h2>ICU License - moved to LICENSE</h2>

<p>The ICU license is now in plain text format, see
<a href="https://github.com/unicode-org/icu/blob/main/icu4j/main/shared/licenses/LICENSE">LICENSE</a>.
<a href="https://github.com/unicode-org/icu/blob/main/LICENSE">LICENSE</a>.
Update links and software appropriately.</p>

<i>© 2016 and later: Unicode, Inc. and others. License &amp; terms of use: http://www.unicode.org/copyright.html</i>
Expand Down

0 comments on commit 312bae8

Please sign in to comment.