Skip to content

Commit 08b825b

Browse files
committed
Merge branch 'master' into allowed-index-store-types
* master: Fix ordering of bootstrap checks in docs (elastic#32417) [TEST] Mute failing InternalEngineTests#testSeqNoAndCheckpoints [TEST] Mute failing testConvertLongHexError bump lucene version after backport Upgrade to Lucene-7.5.0-snapshot-608f0277b0 (elastic#32390) [Kerberos] Avoid vagrant update on precommit (elastic#32416)
2 parents 4f74cd0 + 3ac57f0 commit 08b825b

File tree

65 files changed

+106
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+106
-117
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 7.0.0-alpha1
2-
lucene = 7.4.0
2+
lucene = 7.5.0-snapshot-608f0277b0
33

44
# optional dependencies
55
spatial4j = 0.7

docs/Versions.asciidoc

Lines changed: 2 additions & 2 deletions

docs/reference/setup/bootstrap-checks.asciidoc

Lines changed: 13 additions & 13 deletions

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ConvertProcessorTests.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@
1919

2020
package org.elasticsearch.ingest.common;
2121

22-
import org.elasticsearch.ingest.IngestDocument;
23-
import org.elasticsearch.ingest.Processor;
24-
import org.elasticsearch.ingest.RandomDocumentPicks;
25-
import org.elasticsearch.test.ESTestCase;
26-
2722
import java.util.ArrayList;
2823
import java.util.Collections;
2924
import java.util.HashMap;
3025
import java.util.List;
3126
import java.util.Locale;
3227
import java.util.Map;
3328

29+
import org.elasticsearch.ingest.IngestDocument;
30+
import org.elasticsearch.ingest.Processor;
31+
import org.elasticsearch.ingest.RandomDocumentPicks;
32+
import org.elasticsearch.test.ESTestCase;
33+
3434
import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument;
3535
import static org.elasticsearch.ingest.common.ConvertProcessor.Type;
3636
import static org.hamcrest.Matchers.containsString;
3737
import static org.hamcrest.Matchers.equalTo;
38-
import static org.hamcrest.Matchers.sameInstance;
3938
import static org.hamcrest.Matchers.not;
39+
import static org.hamcrest.Matchers.sameInstance;
4040

4141
public class ConvertProcessorTests extends ESTestCase {
4242

@@ -138,6 +138,7 @@ public void testConvertLongLeadingZero() throws Exception {
138138
assertThat(ingestDocument.getFieldValue(fieldName, Long.class), equalTo(10L));
139139
}
140140

141+
@AwaitsFix( bugUrl = "https://github.com/elastic/elasticsearch/issues/32370")
141142
public void testConvertLongHexError() {
142143
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
143144
String value = "0x" + randomAlphaOfLengthBetween(1, 10);

modules/lang-expression/licenses/lucene-expressions-7.4.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bd7d8078a2d0ad11a24f54156cc015630c96858a

plugins/analysis-icu/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ forbiddenApis {
3030

3131
dependencies {
3232
compile "org.apache.lucene:lucene-analyzers-icu:${versions.lucene}"
33-
compile 'com.ibm.icu:icu4j:61.1'
33+
compile 'com.ibm.icu:icu4j:62.1'
3434
}
3535

3636
dependencyLicenses {

plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7a4d00d5ec5febd252a6182e8b6e87a0a9821f81

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)