This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new 74a4b74e8 Update icu4j to 71.1
74a4b74e8 is described below
commit 74a4b74e8739bec7a991c4672a67dd275caf7980
Author: Scala Steward <[email protected]>
AuthorDate: Thu Apr 7 22:03:31 2022 +0200
Update icu4j to 71.1
bin.LICENSE: Incorporate icu4c/LICENSE changes from ICU 71.1.
---
daffodil-cli/bin.LICENSE | 61 ++++++++++++++++++++++++++++++++--------------
project/Dependencies.scala | 2 +-
2 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/daffodil-cli/bin.LICENSE b/daffodil-cli/bin.LICENSE
index 7a90aca77..76189c1d9 100644
--- a/daffodil-cli/bin.LICENSE
+++ b/daffodil-cli/bin.LICENSE
@@ -213,9 +213,22 @@ is subject to the terms and conditions of the following
licenses.
These files are available under the Unicode License. For details, see
https://github.com/unicode-org/icu/blob/release-<VERSION>/icu4c/LICENSE
- COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
+ UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
- Copyright © 1991-2020 Unicode, Inc. All rights reserved.
+ See Terms of Use <https://www.unicode.org/copyright.html>
+ for definitions of Unicode Inc.’s Data Files and Software.
+
+ NOTICE TO USER: Carefully read the following legal agreement.
+ BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+ DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+ YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+ TERMS AND CONDITIONS OF THIS AGREEMENT.
+ IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+ THE DATA FILES OR SOFTWARE.
+
+ COPYRIGHT AND PERMISSION NOTICE
+
+ Copyright © 1991-2022 Unicode, Inc. All rights reserved.
Distributed under the Terms of Use in
https://www.unicode.org/copyright.html.
Permission is hereby granted, free of charge, to any person obtaining
@@ -247,7 +260,7 @@ is subject to the terms and conditions of the following
licenses.
use or other dealings in these Data Files or Software without prior
written authorization of the copyright holder.
- ---------------------
+ ----------------------------------------------------------------------
Third-Party Software Licenses
@@ -255,7 +268,9 @@ is subject to the terms and conditions of the following
licenses.
terms for licensed third-party software components included within ICU
libraries.
- 1. ICU License - ICU 1.8.1 to ICU 57.1
+ ----------------------------------------------------------------------
+
+ ICU License - ICU 1.8.1 to ICU 57.1
COPYRIGHT AND PERMISSION NOTICE
@@ -290,7 +305,9 @@ is subject to the terms and conditions of the following
licenses.
All trademarks and registered trademarks mentioned herein are the
property of their respective owners.
- 2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+ ----------------------------------------------------------------------
+
+ Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
# The Google Chrome software developed by Google is licensed under
# the BSD license. Other software included in this distribution is
@@ -494,7 +511,9 @@ is subject to the terms and conditions of the following
licenses.
#
# ---------------COPYING.ipadic-----END----------------------------------
- 3. Lao Word Break Dictionary Data (laodict.txt)
+ ----------------------------------------------------------------------
+
+ Lao Word Break Dictionary Data (laodict.txt)
# Copyright (C) 2016 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html
@@ -534,7 +553,9 @@ is subject to the terms and conditions of the following
licenses.
# OF THE POSSIBILITY OF SUCH DAMAGE.
#
--------------------------------------------------------------------------
- 4. Burmese Word Break Dictionary Data (burmesedict.txt)
+ ----------------------------------------------------------------------
+
+ Burmese Word Break Dictionary Data (burmesedict.txt)
# Copyright (c) 2014 International Business Machines Corporation
# and others. All Rights Reserved.
@@ -574,7 +595,9 @@ is subject to the terms and conditions of the following
licenses.
# SUCH DAMAGE.
#
--------------------------------------------------------------------------
- 5. Time Zone Database
+ ----------------------------------------------------------------------
+
+ Time Zone Database
ICU uses the public domain data and code derived from Time Zone
Database for its time zone support. The ownership of the TZ database
@@ -597,22 +620,24 @@ is subject to the terms and conditions of the following
licenses.
# making a contribution to the database or code waives all rights to
# future claims in that contribution or in the TZ Database.
- 6. Google double-conversion
+ ----------------------------------------------------------------------
+
+ Google double-conversion
Copyright 2006-2011, the V8 project authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index b584bc70b..93825af28 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -25,7 +25,7 @@ object Dependencies {
"com.lihaoyi" %% "os-lib" % "0.8.1", // for writing/compiling C source
files
"org.scala-lang.modules" %% "scala-xml" % "2.0.1",
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1",
- "com.ibm.icu" % "icu4j" % "70.1",
+ "com.ibm.icu" % "icu4j" % "71.1",
"xerces" % "xercesImpl" % "2.12.2",
"xml-resolver" % "xml-resolver" % "1.2",
"commons-io" % "commons-io" % "2.11.0",
