You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2018/03/27 00:13:02 UTC
lucene-solr:branch_7x: LUCENE-8175: upgrade icu4j to 61.1 which fixes
concurrency issue
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 003be2da4 -> 43796e516
LUCENE-8175: upgrade icu4j to 61.1 which fixes concurrency issue
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/43796e51
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/43796e51
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/43796e51
Branch: refs/heads/branch_7x
Commit: 43796e516932881da7abbc8cc379ec2661020f7e
Parents: 003be2d
Author: Robert Muir <rm...@apache.org>
Authored: Mon Mar 26 19:02:21 2018 -0400
Committer: Robert Muir <rm...@apache.org>
Committed: Mon Mar 26 20:12:42 2018 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +-
.../lucene/analysis/util/UnicodeProps.java | 116 +++++++++----------
.../analysis/icu/segmentation/Default.brk | Bin 54488 -> 50760 bytes
.../icu/segmentation/MyanmarSyllable.brk | Bin 21976 -> 21272 bytes
lucene/ivy-versions.properties | 2 +-
lucene/licenses/icu4j-60.2.jar.sha1 | 1 -
lucene/licenses/icu4j-61.1.jar.sha1 | 1 +
solr/licenses/icu4j-60.2.jar.sha1 | 1 -
solr/licenses/icu4j-61.1.jar.sha1 | 1 +
9 files changed, 63 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 83e8f55..14fe900 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -32,7 +32,8 @@ Other
* SOLR-10912: Add automatic patch validation. (Mano Kovacs, Steve Rowe)
-* LUCENE-8122: Upgrade analysis/icu to ICU 60.2. (Robert Muir)
+* LUCENE-8122, LUCENE-8175: Upgrade analysis/icu to ICU 61.1.
+ (Robert Muir, Adrien Grand, Uwe Schindler)
======================= Lucene 7.3.0 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
index 254977f..86870d0 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/UnicodeProps.java
@@ -1,58 +1,58 @@
-// DO NOT EDIT THIS FILE! Use "ant unicode-data" to recreate.
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.lucene.analysis.util;
-
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.SparseFixedBitSet;
-
-/**
- * This file contains unicode properties used by various {@link CharTokenizer}s.
- * The data was created using ICU4J v60.2.0.0
- * <p>
- * Unicode version: 10.0.0.0
- */
-public final class UnicodeProps {
- private UnicodeProps() {}
-
- /** Unicode version that was used to generate this file: {@value} */
- public static final String UNICODE_VERSION = "10.0.0.0";
-
- /** Bitset with Unicode WHITESPACE code points. */
- public static final Bits WHITESPACE = createBits(
- 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x0020, 0x0085, 0x00A0, 0x1680, 0x2000, 0x2001, 0x2002, 0x2003,
- 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, 0x2029, 0x202F, 0x205F, 0x3000);
-
- private static Bits createBits(final int... codepoints) {
- final int len = codepoints[codepoints.length - 1] + 1;
- final SparseFixedBitSet bitset = new SparseFixedBitSet(len);
- for (int i : codepoints) bitset.set(i);
- return new Bits() {
- @Override
- public boolean get(int index) {
- return index < len && bitset.get(index);
- }
-
- @Override
- public int length() {
- return 0x10FFFF + 1;
- }
- };
- }
-}
+// DO NOT EDIT THIS FILE! Use "ant unicode-data" to recreate.
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.lucene.analysis.util;
+
+import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.SparseFixedBitSet;
+
+/**
+ * This file contains unicode properties used by various {@link CharTokenizer}s.
+ * The data was created using ICU4J v61.1.0.0
+ * <p>
+ * Unicode version: 10.0.0.0
+ */
+public final class UnicodeProps {
+ private UnicodeProps() {}
+
+ /** Unicode version that was used to generate this file: {@value} */
+ public static final String UNICODE_VERSION = "10.0.0.0";
+
+ /** Bitset with Unicode WHITESPACE code points. */
+ public static final Bits WHITESPACE = createBits(
+ 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x0020, 0x0085, 0x00A0, 0x1680, 0x2000, 0x2001, 0x2002, 0x2003,
+ 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, 0x2029, 0x202F, 0x205F, 0x3000);
+
+ private static Bits createBits(final int... codepoints) {
+ final int len = codepoints[codepoints.length - 1] + 1;
+ final SparseFixedBitSet bitset = new SparseFixedBitSet(len);
+ for (int i : codepoints) bitset.set(i);
+ return new Bits() {
+ @Override
+ public boolean get(int index) {
+ return index < len && bitset.get(index);
+ }
+
+ @Override
+ public int length() {
+ return 0x10FFFF + 1;
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk
----------------------------------------------------------------------
diff --git a/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk b/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk
index 4a9df15..e6c0ef7 100644
Binary files a/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk and b/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/MyanmarSyllable.brk
----------------------------------------------------------------------
diff --git a/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/MyanmarSyllable.brk b/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/MyanmarSyllable.brk
index a9d0673..d6bfdb4 100644
Binary files a/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/MyanmarSyllable.brk and b/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/MyanmarSyllable.brk differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 95ede15..f19e33d 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -31,7 +31,7 @@ com.fasterxml.jackson.core.version = 2.5.4
/com.googlecode.mp4parser/isoparser = 1.1.18
/com.healthmarketscience.jackcess/jackcess = 2.1.8
/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
-/com.ibm.icu/icu4j = 60.2
+/com.ibm.icu/icu4j = 61.1
/com.lmax/disruptor = 3.4.0
/com.pff/java-libpst = 0.8.1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/lucene/licenses/icu4j-60.2.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/icu4j-60.2.jar.sha1 b/lucene/licenses/icu4j-60.2.jar.sha1
deleted file mode 100644
index e613111..0000000
--- a/lucene/licenses/icu4j-60.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e452cba3caaf93b997ff543c7246a6da74ed70f1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/lucene/licenses/icu4j-61.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/icu4j-61.1.jar.sha1 b/lucene/licenses/icu4j-61.1.jar.sha1
new file mode 100644
index 0000000..bde7409
--- /dev/null
+++ b/lucene/licenses/icu4j-61.1.jar.sha1
@@ -0,0 +1 @@
+28d33b5e44e72edcc66a5da7a34a42147f38d987
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/solr/licenses/icu4j-60.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/icu4j-60.2.jar.sha1 b/solr/licenses/icu4j-60.2.jar.sha1
deleted file mode 100644
index e613111..0000000
--- a/solr/licenses/icu4j-60.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e452cba3caaf93b997ff543c7246a6da74ed70f1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/43796e51/solr/licenses/icu4j-61.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/icu4j-61.1.jar.sha1 b/solr/licenses/icu4j-61.1.jar.sha1
new file mode 100644
index 0000000..bde7409
--- /dev/null
+++ b/solr/licenses/icu4j-61.1.jar.sha1
@@ -0,0 +1 @@
+28d33b5e44e72edcc66a5da7a34a42147f38d987