Skip to content

Commit 312bae8

Browse files
committed
ICU-21964 use a single LICENSE file
- make the icu4c and icu4j LICENSE files symlinks - fix paths
1 parent 58c674a commit 312bae8

File tree

14 files changed

+543
-1059
lines changed

14 files changed

+543
-1059
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ _… and thanks for contributing!_
9797

9898
### License
9999

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

102102
> Copyright © 2021 and later Unicode, Inc. and others. All Rights Reserved.
103103
Unicode and the Unicode Logo are registered trademarks

LICENSE

Lines changed: 519 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ Fuzzing | [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/
3333

3434
### License
3535

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

3838
> Copyright © 2016 and later Unicode, Inc. and others. All Rights Reserved.
39-
Unicode and the Unicode Logo are registered trademarks
39+
Unicode and the Unicode Logo are registered trademarks
4040
of Unicode, Inc. in the U.S. and other countries.
4141
[Terms of Use and License](http://www.unicode.org/copyright.html)

docs/userguide/icu/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@ included, building, installing, etc.
104104

105105
## ICU License
106106

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

109109
See also FAQ section ["How is the ICU licensed"](icufaq/index#how-is-icu-licensed)

docs/userguide/icu/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ Changes in previous releases can also be found the main [ICU download page](http
3030

3131
## License Information
3232

33-
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.
33+
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.

docs/userguide/icu4c/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The ICU homepage also links to related information about writing internationaliz
5656
| Online ICU Demos | <https://icu4c-demos.unicode.org/icu-bin/icudemos> |
5757
| Contacts and Bug Reports/Feature Requests | <https://icu.unicode.org/contacts> |
5858

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

6161
## What Is New In The Current Release?
6262

icu4c/LICENSE

Lines changed: 0 additions & 519 deletions
This file was deleted.

icu4c/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE

icu4j/main/shared/licenses/LICENSE

Lines changed: 0 additions & 519 deletions
This file was deleted.

icu4j/main/shared/licenses/LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../LICENSE

icu4j/maven-build/maven-icu4j/pom.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
-->
1010
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1111
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
12-
12+
1313
<parent>
1414
<groupId>com.ibm.icu</groupId>
1515
<artifactId>icu4j-root</artifactId>
1616
<version>73.1-SNAPSHOT</version>
1717
<!-- default relativePath for parent -->
1818
</parent>
19-
19+
2020
<modelVersion>4.0.0</modelVersion>
2121

2222
<groupId>com.ibm.icu</groupId>
@@ -56,7 +56,7 @@
5656
</sources>
5757
</configuration>
5858
</execution>
59-
59+
6060
<!-- add directories with test code -->
6161
<execution>
6262
<id>add-test-source</id>
@@ -223,14 +223,14 @@
223223
</executions>
224224
</plugin>
225225

226-
<!--
226+
<!--
227227
Process and transform the resource files before they get packaged up in the .jar file.
228228
-->
229229
<plugin>
230230
<groupId>org.codehaus.mojo</groupId>
231231
<artifactId>exec-maven-plugin</artifactId>
232232
<executions>
233-
<!--
233+
<!--
234234
Replicate the creation of fullLocaleNames.lst files in every subdirectory of the dir of copied data
235235
that the Ant build.xml file encodes.
236236
-->
@@ -254,7 +254,8 @@
254254
<configuration>
255255
<executable>cp</executable>
256256
<arguments>
257-
<argument>../../../icu4c/LICENSE</argument>
257+
<!-- Note! we use the license in the icu4j subtree, because we might be running out of an unpacked icu4j source .jar -->
258+
<argument>../../main/shared/licenses/LICENSE</argument>
258259
<argument>${project.build.directory}/classes</argument>
259260
</arguments>
260261
</configuration>

icu4j/maven-build/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
<name>ICU4J Root</name>
2121
<description>
2222
International Component for Unicode for Java (ICU4J) is a mature, widely used Java library
23-
providing Unicode and Globalization support
23+
providing Unicode and Globalization support
2424
</description>
2525
<url>https://icu.unicode.org/</url>
2626
<inceptionYear>2001</inceptionYear>
2727

2828
<licenses>
2929
<license>
3030
<name>Unicode/ICU License</name>
31-
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
31+
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
3232
<distribution>repo</distribution>
3333
</license>
3434
</licenses>
@@ -149,7 +149,7 @@
149149
</distributionManagement>
150150

151151
<profiles>
152-
<!--
152+
<!--
153153
For testing localespi using the Java extensions feature, which last existed in Java 8.
154154
ICU4J currently has a minimum supported version of 8.
155155
-->
@@ -180,7 +180,7 @@
180180
</profiles>
181181

182182
<properties>
183-
<!--
183+
<!--
184184
Main ICU4J version number.
185185
Note: This version string must also be repeated in <version> of this root pom.xml above.
186186
Note: Keep the `jar.spec.version` number in sync with this value, too.

icu4j/maven/icu4j-charset/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<licenses>
2222
<license>
2323
<name>Unicode/ICU License</name>
24-
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
24+
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
2525
<distribution>repo</distribution>
2626
</license>
2727
</licenses>

icu4j/maven/icu4j-localespi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<licenses>
2222
<license>
2323
<name>Unicode/ICU License</name>
24-
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
24+
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
2525
<distribution>repo</distribution>
2626
</license>
2727
</licenses>

icu4j/maven/icu4j/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
<name>ICU4J</name>
1919
<description>
2020
International Component for Unicode for Java (ICU4J) is a mature, widely used Java library
21-
providing Unicode and Globalization support
21+
providing Unicode and Globalization support
2222
</description>
2323
<url>https://icu.unicode.org/</url>
2424
<inceptionYear>2001</inceptionYear>
2525

2626
<licenses>
2727
<license>
2828
<name>Unicode/ICU License</name>
29-
<url>https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE</url>
29+
<url>https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE</url>
3030
<distribution>repo</distribution>
3131
</license>
3232
</licenses>

tools/unicodetools/license.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<h2>ICU License - moved to LICENSE</h2>
99

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

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

0 commit comments

Comments
 (0)