diff --git a/community/bolt/LICENSES.txt b/community/bolt/LICENSES.txt index aff31ecef8cc5..a3131a91b7344 100644 --- a/community/bolt/LICENSES.txt +++ b/community/bolt/LICENSES.txt @@ -5,6 +5,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. Apache Software License, Version 2.0 Apache Commons Lang ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/bolt/NOTICE.txt b/community/bolt/NOTICE.txt index 65df0ab03f846..b620fcad366b4 100644 --- a/community/bolt/NOTICE.txt +++ b/community/bolt/NOTICE.txt @@ -28,6 +28,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/consistency-check-legacy/LICENSES.txt b/community/consistency-check-legacy/LICENSES.txt index e5992a36c4207..bf81112ec4de8 100644 --- a/community/consistency-check-legacy/LICENSES.txt +++ b/community/consistency-check-legacy/LICENSES.txt @@ -4,6 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/consistency-check-legacy/NOTICE.txt b/community/consistency-check-legacy/NOTICE.txt index db43e3d869ee0..3bc613907252e 100644 --- a/community/consistency-check-legacy/NOTICE.txt +++ b/community/consistency-check-legacy/NOTICE.txt @@ -27,6 +27,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/consistency-check/LICENSES.txt b/community/consistency-check/LICENSES.txt index e5992a36c4207..bf81112ec4de8 100644 --- a/community/consistency-check/LICENSES.txt +++ b/community/consistency-check/LICENSES.txt @@ -4,6 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/consistency-check/NOTICE.txt b/community/consistency-check/NOTICE.txt index db43e3d869ee0..3bc613907252e 100644 --- a/community/consistency-check/NOTICE.txt +++ b/community/consistency-check/NOTICE.txt @@ -27,6 +27,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/cypher/cypher/LICENSES.txt b/community/cypher/cypher/LICENSES.txt index fb704217d9667..b5f7b48f0ab4c 100644 --- a/community/cypher/cypher/LICENSES.txt +++ b/community/cypher/cypher/LICENSES.txt @@ -4,6 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/cypher/cypher/NOTICE.txt b/community/cypher/cypher/NOTICE.txt index 969473c73b211..84d18679b97f3 100644 --- a/community/cypher/cypher/NOTICE.txt +++ b/community/cypher/cypher/NOTICE.txt @@ -27,6 +27,7 @@ Third-party licenses Apache Software License, Version 2.0 ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/import-tool/LICENSES.txt b/community/import-tool/LICENSES.txt index e5992a36c4207..bf81112ec4de8 100644 --- a/community/import-tool/LICENSES.txt +++ b/community/import-tool/LICENSES.txt @@ -4,6 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/import-tool/NOTICE.txt b/community/import-tool/NOTICE.txt index db43e3d869ee0..3bc613907252e 100644 --- a/community/import-tool/NOTICE.txt +++ b/community/import-tool/NOTICE.txt @@ -27,6 +27,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/lucene-index-upgrade/pom.xml b/community/lucene-index-upgrade/pom.xml index 07d943d9d6c2b..bb571fcce63a6 100644 --- a/community/lucene-index-upgrade/pom.xml +++ b/community/lucene-index-upgrade/pom.xml @@ -13,7 +13,7 @@ GPL-3-header.txt notice-gpl-prefix.txt 4.10.4 - 5.4.0 + 5.5.0 4.0.0 diff --git a/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java index f71a83921a7c1..79bcc4ddb3d2c 100644 --- a/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java +++ b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java @@ -66,8 +66,8 @@ default void migrated( String name ) {} private static final String LIBRARY_DIRECTORY = "lib"; private static final String RESOURCE_SEPARATOR = "/"; private static final String LUCENE4_CORE_JAR_NAME = "lucene-core-4.10.4.jar"; - private static final String LUCENE5_CORE_JAR_NAME = "lucene-core-5.4.0.jar"; - private static final String LUCENE5_BACKWARD_CODECS_NAME = "lucene-backward-codecs-5.4.0.jar"; + private static final String LUCENE5_CORE_JAR_NAME = "lucene-core-5.5.0.jar"; + private static final String LUCENE5_BACKWARD_CODECS_NAME = "lucene-backward-codecs-5.5.0.jar"; private static final String SEGMENTS_FILE_NAME_PREFIX = "segments"; private final Path indexRootPath; diff --git a/community/lucene-index/LICENSES.txt b/community/lucene-index/LICENSES.txt index e5992a36c4207..bf81112ec4de8 100644 --- a/community/lucene-index/LICENSES.txt +++ b/community/lucene-index/LICENSES.txt @@ -4,6 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/lucene-index/NOTICE.txt b/community/lucene-index/NOTICE.txt index db43e3d869ee0..3bc613907252e 100644 --- a/community/lucene-index/NOTICE.txt +++ b/community/lucene-index/NOTICE.txt @@ -27,6 +27,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/lucene-index/pom.xml b/community/lucene-index/pom.xml index 1b6033d05e668..4a70760a63718 100644 --- a/community/lucene-index/pom.xml +++ b/community/lucene-index/pom.xml @@ -91,6 +91,11 @@ the relevant Commercial Agreement. org.apache.lucene lucene-queryparser + + org.apache.lucene + lucene-codecs + + junit diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java index 661205f17f97a..b91a360b746c7 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/FullTxData.java @@ -377,7 +377,7 @@ private IndexSearcher searcher( boolean allowRefreshSearcher ) try { IndexReader newReader = this.reader == null ? - DirectoryReader.open( this.writer, true ) : + DirectoryReader.open( this.writer ) : DirectoryReader.openIfChanged( (DirectoryReader) this.reader ); if ( newReader == this.reader ) { diff --git a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java index db43bc0d208a6..98604472e679c 100644 --- a/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java +++ b/community/lucene-index/src/main/java/org/neo4j/index/impl/lucene/legacy/LuceneDataSource.java @@ -226,7 +226,7 @@ private IndexReference refreshSearcher( IndexReference searcher ) // TODO: this cast should always succeed, maybe check nonetheless? DirectoryReader reader = (DirectoryReader) searcher.getSearcher().getIndexReader(); IndexWriter writer = searcher.getWriter(); - IndexReader reopened = DirectoryReader.openIfChanged( reader, writer, true ); + IndexReader reopened = DirectoryReader.openIfChanged( reader, writer ); if ( reopened != null ) { IndexSearcher newSearcher = newIndexSearcher( searcher.getIdentifier(), reopened ); @@ -305,7 +305,7 @@ synchronized IndexReference syncGetIndexSearcher( IndexIdentifier identifier ) if ( searcher == null ) { IndexWriter writer = newIndexWriter( identifier ); - IndexReader reader = DirectoryReader.open( writer, true ); + IndexReader reader = DirectoryReader.open( writer ); IndexSearcher indexSearcher = newIndexSearcher( identifier, reader ); searcher = new IndexReference( identifier, indexSearcher, writer ); indexSearchers.put( identifier, searcher ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/IndexWriterConfigs.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/IndexWriterConfigs.java index e2b0adeeac234..24224f432bc2a 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/IndexWriterConfigs.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/IndexWriterConfigs.java @@ -19,6 +19,9 @@ */ package org.neo4j.kernel.api.impl.index; +import org.apache.lucene.codecs.PostingsFormat; +import org.apache.lucene.codecs.blocktreeords.BlockTreeOrdsPostingsFormat; +import org.apache.lucene.codecs.lucene54.Lucene54Codec; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LogByteSizeMergePolicy; @@ -39,6 +42,8 @@ public final class IndexWriterConfigs FeatureToggles.getDouble( IndexWriterConfigs.class, "nocfs.ratio", 1.0 ); private static final double MERGE_POLICY_MIN_MERGE_MB = FeatureToggles.getDouble( IndexWriterConfigs.class, "min.merge", 0.1 ); + private static final boolean CODEC_BLOCK_TREE_ORDS_POSTING_FORMAT = + FeatureToggles.flag( IndexWriterConfigs.class, "block.tree.ords.posting.format", true ); private static final int POPULATION_RAM_BUFFER_SIZE_MB = FeatureToggles.getInteger( IndexWriterConfigs.class, "population.ram.buffer.size", 50 ); @@ -55,6 +60,16 @@ public static IndexWriterConfig standard() writerConfig.setMaxBufferedDocs( MAX_BUFFERED_DOCS ); writerConfig.setIndexDeletionPolicy( new MultipleBackupDeletionPolicy() ); writerConfig.setUseCompoundFile( true ); + writerConfig.setCodec(new Lucene54Codec() + { + @Override + public PostingsFormat getPostingsFormatForField( String field ) + { + PostingsFormat postingFormat = super.getPostingsFormatForField( field ); + return CODEC_BLOCK_TREE_ORDS_POSTING_FORMAT ? new BlockTreeOrdsPostingsFormat() : + postingFormat; + } + }); LogByteSizeMergePolicy mergePolicy = new LogByteSizeMergePolicy(); mergePolicy.setNoCFSRatio( MERGE_POLICY_NO_CFS_RATIO ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollector.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollector.java index 9d0ddab362c99..e3b3d74c25b9c 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollector.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/collector/DocValuesCollector.java @@ -560,28 +560,17 @@ public int freq() throws IOException } @Override - public int docID() - { - throw new UnsupportedOperationException(); - } - - @Override - public int nextDoc() throws IOException + public DocIdSetIterator iterator() { throw new UnsupportedOperationException(); } @Override - public int advance( int target ) throws IOException + public int docID() { throw new UnsupportedOperationException(); } - @Override - public long cost() - { - return scores.length; - } } private static final class DocsInIndexOrderIterator extends AbstractIndexHits diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/partition/IndexPartition.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/partition/IndexPartition.java index a54f2f86eb119..0bb61e3717895 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/partition/IndexPartition.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/partition/IndexPartition.java @@ -51,7 +51,7 @@ public IndexPartition( File partitionFolder, Directory directory, IndexWriterCon this.indexFolder = partitionFolder; this.directory = directory; this.indexWriter = new IndexWriter( directory, writerConfig ); - this.searcherManager = new SearcherManager( indexWriter, true, new SearcherFactory() ); + this.searcherManager = new SearcherManager( indexWriter, new SearcherFactory() ); } public IndexWriter getIndexWriter() diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java index ad0a6eb019696..45bb13676ec02 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructure.java @@ -24,6 +24,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StringField; +import org.apache.lucene.index.FilteredTermsEnum; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.Term; @@ -32,24 +33,34 @@ import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.ConstantScoreQuery; import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.NumericRangeQuery; import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; -import org.apache.lucene.util.NumericUtils; import org.apache.lucene.search.WildcardQuery; +import org.apache.lucene.util.AttributeSource; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.NumericUtils; +import org.apache.lucene.util.StringHelper; import java.io.IOException; import java.util.EnumMap; import java.util.Iterator; import java.util.Map; +import org.neo4j.unsafe.impl.internal.dragons.FeatureToggles; + import static org.apache.lucene.document.Field.Store.YES; public class LuceneDocumentStructure { + private static final boolean USE_LUCENE_STANDARD_PREFIX_QUERY = + FeatureToggles.flag( LuceneDocumentStructure.class, "lucene.standard.prefix.query", false ); + public static final String NODE_ID_KEY = "id"; // Absolute hard maximum length for a term, in bytes once @@ -139,7 +150,7 @@ public static Query newRangeSeekByStringQuery( String lower, boolean includeLowe builder.add( termRangeQuery, BooleanClause.Occur.SHOULD ); return builder.build(); } - return termRangeQuery; + return new ConstantScoreQuery( termRangeQuery ); } public static Query newWildCardStringQuery( String searchFor ) @@ -150,9 +161,12 @@ public static Query newWildCardStringQuery( String searchFor ) return new WildcardQuery( term ); } - public static PrefixQuery newRangeSeekByPrefixQuery( String prefix ) + public static Query newRangeSeekByPrefixQuery( String prefix ) { - return new PrefixQuery( new Term( ValueEncoding.String.key(), prefix ) ); + Term term = new Term( ValueEncoding.String.key(), prefix ); + MultiTermQuery prefixQuery = USE_LUCENE_STANDARD_PREFIX_QUERY ? new PrefixQuery( term ) : + new PrefixMultiTermsQuery( term ); + return new ConstantScoreQuery( prefixQuery ); } public static Term newTermForChangeOrRemove( long nodeId ) @@ -188,6 +202,54 @@ public static TermsEnum originalTerms( Terms terms, String fieldKey ) throws IOE : termsEnum; } + /** + * Simple implementation of prefix query that mimics old lucene way of handling prefix queries. + * According to benchmarks this implementation is faster then + * {@link org.apache.lucene.search.PhraseQuery} because we do not construct automaton which is + * extremely expensive. + */ + private static class PrefixMultiTermsQuery extends MultiTermQuery + { + private Term term; + + PrefixMultiTermsQuery( Term term ) + { + super(term.field()); + this.term = term; + } + + @Override + protected TermsEnum getTermsEnum( Terms terms, AttributeSource atts ) throws IOException + { + return term.bytes().length == 0 ? terms.iterator() : new PrefixTermsEnum( terms.iterator(), term.bytes() ); + } + + + @Override + public String toString( String field ) + { + return getClass().getSimpleName() + ", term:" + term + ", field:" + field; + } + + private class PrefixTermsEnum extends FilteredTermsEnum + { + private BytesRef prefix; + + PrefixTermsEnum( TermsEnum termEnum, BytesRef prefix ) + { + super( termEnum ); + this.prefix = prefix; + setInitialSeekTerm( this.prefix ); + } + + @Override + protected AcceptStatus accept( BytesRef term ) throws IOException + { + return StringHelper.startsWith( term, prefix ) ? AcceptStatus.YES : AcceptStatus.END; + } + } + } + private static class DocWithId { private final Document document; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/IndexReaderStub.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/IndexReaderStub.java index b332c3ed9d3f4..d92e527cff9db 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/IndexReaderStub.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/index/IndexReaderStub.java @@ -42,8 +42,6 @@ import java.util.Map; import java.util.function.Function; -import static com.sun.corba.se.spi.activation.IIOP_CLEAR_TEXT.value; - public class IndexReaderStub extends LeafReader { diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructureTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructureTest.java index d8d3c2d193ec8..2791b81703cfa 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructureTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneDocumentStructureTest.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.search.ConstantScoreQuery; +import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.NumericRangeQuery; -import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; @@ -32,6 +32,8 @@ import static junit.framework.Assert.assertNull; import static junit.framework.TestCase.assertEquals; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertThat; import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.NODE_ID_KEY; import static org.neo4j.kernel.api.impl.schema.LuceneDocumentStructure.newSeekQuery; import static org.neo4j.kernel.api.impl.schema.ValueEncoding.Array; @@ -173,8 +175,9 @@ public void shouldBuildRangeSeekByNumberQueryForStrings() throws Exception public void shouldBuildRangeSeekByStringQueryForStrings() throws Exception { // given - TermRangeQuery query = - (TermRangeQuery) LuceneDocumentStructure.newRangeSeekByStringQuery( "foo", false, null, true ); + ConstantScoreQuery constantQuery = + (ConstantScoreQuery) LuceneDocumentStructure.newRangeSeekByStringQuery( "foo", false, null, true ); + TermRangeQuery query = (TermRangeQuery) constantQuery.getQuery(); // then assertEquals( "string", query.getField() ); @@ -198,9 +201,10 @@ public void shouldBuildWildcardQueries() throws Exception public void shouldBuildRangeSeekByPrefixQueryForStrings() throws Exception { // given - PrefixQuery query = LuceneDocumentStructure.newRangeSeekByPrefixQuery( "Prefix" ); + ConstantScoreQuery query = (ConstantScoreQuery) LuceneDocumentStructure.newRangeSeekByPrefixQuery( "Prefix" ); + MultiTermQuery prefixQuery = (MultiTermQuery) query.getQuery(); // then - assertEquals( "Prefix", query.getPrefix().text() ); + assertThat("Should contain term value", prefixQuery.toString(), containsString( "Prefix" ) ); } } diff --git a/community/neo4j-harness/LICENSES.txt b/community/neo4j-harness/LICENSES.txt index 3ff3baa852aed..45f0ed6612359 100644 --- a/community/neo4j-harness/LICENSES.txt +++ b/community/neo4j-harness/LICENSES.txt @@ -22,6 +22,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/neo4j-harness/NOTICE.txt b/community/neo4j-harness/NOTICE.txt index 598245abcd09f..145c085da83a1 100644 --- a/community/neo4j-harness/NOTICE.txt +++ b/community/neo4j-harness/NOTICE.txt @@ -45,6 +45,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/neo4j/LICENSES.txt b/community/neo4j/LICENSES.txt index d575fc223f6ea..f521cfeb415a2 100644 --- a/community/neo4j/LICENSES.txt +++ b/community/neo4j/LICENSES.txt @@ -5,6 +5,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. Apache Software License, Version 2.0 Apache Commons Lang ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/neo4j/NOTICE.txt b/community/neo4j/NOTICE.txt index 5df05620250cc..009d90715d068 100644 --- a/community/neo4j/NOTICE.txt +++ b/community/neo4j/NOTICE.txt @@ -28,6 +28,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/server/LICENSES.txt b/community/server/LICENSES.txt index eed51acbda5dc..168f0a1322d5e 100644 --- a/community/server/LICENSES.txt +++ b/community/server/LICENSES.txt @@ -22,6 +22,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/community/server/NOTICE.txt b/community/server/NOTICE.txt index 6f8c42db59804..e735543f173ec 100644 --- a/community/server/NOTICE.txt +++ b/community/server/NOTICE.txt @@ -45,6 +45,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/core-edge/LICENSES.txt b/enterprise/core-edge/LICENSES.txt index b070e33746b87..591774f7d781c 100644 --- a/enterprise/core-edge/LICENSES.txt +++ b/enterprise/core-edge/LICENSES.txt @@ -4,6 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 hazelcast-all + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/core-edge/NOTICE.txt b/enterprise/core-edge/NOTICE.txt index 183128afea1a6..97e6493400aeb 100644 --- a/enterprise/core-edge/NOTICE.txt +++ b/enterprise/core-edge/NOTICE.txt @@ -26,6 +26,7 @@ Third-party licenses Apache Software License, Version 2.0 hazelcast-all + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/ha/LICENSES.txt b/enterprise/ha/LICENSES.txt index 8f0e63038d354..9e0e13f608088 100644 --- a/enterprise/ha/LICENSES.txt +++ b/enterprise/ha/LICENSES.txt @@ -4,6 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/ha/NOTICE.txt b/enterprise/ha/NOTICE.txt index f23654429bdda..1bd554d9a2fc9 100644 --- a/enterprise/ha/NOTICE.txt +++ b/enterprise/ha/NOTICE.txt @@ -26,6 +26,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/neo4j-enterprise/LICENSES.txt b/enterprise/neo4j-enterprise/LICENSES.txt index 3f3be2973aab9..b9fe8c24f6493 100644 --- a/enterprise/neo4j-enterprise/LICENSES.txt +++ b/enterprise/neo4j-enterprise/LICENSES.txt @@ -7,6 +7,7 @@ Apache Software License, Version 2.0 ConcurrentLinkedHashMap Graphite Integration for Metrics hazelcast-all + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/neo4j-enterprise/NOTICE.txt b/enterprise/neo4j-enterprise/NOTICE.txt index d737f7e3b8495..8105667fc27d3 100644 --- a/enterprise/neo4j-enterprise/NOTICE.txt +++ b/enterprise/neo4j-enterprise/NOTICE.txt @@ -29,6 +29,7 @@ Apache Software License, Version 2.0 ConcurrentLinkedHashMap Graphite Integration for Metrics hazelcast-all + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/neo4j-harness-enterprise/LICENSES.txt b/enterprise/neo4j-harness-enterprise/LICENSES.txt index 55c54822cb580..0a3568474d8a7 100644 --- a/enterprise/neo4j-harness-enterprise/LICENSES.txt +++ b/enterprise/neo4j-harness-enterprise/LICENSES.txt @@ -24,6 +24,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/neo4j-harness-enterprise/NOTICE.txt b/enterprise/neo4j-harness-enterprise/NOTICE.txt index 3969ca561dccb..c4b157e585cdc 100644 --- a/enterprise/neo4j-harness-enterprise/NOTICE.txt +++ b/enterprise/neo4j-harness-enterprise/NOTICE.txt @@ -46,6 +46,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/server-enterprise/LICENSES.txt b/enterprise/server-enterprise/LICENSES.txt index deb22ef1ab66e..63da68da4fcc5 100644 --- a/enterprise/server-enterprise/LICENSES.txt +++ b/enterprise/server-enterprise/LICENSES.txt @@ -24,6 +24,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/enterprise/server-enterprise/NOTICE.txt b/enterprise/server-enterprise/NOTICE.txt index a2d380783635f..572114729d92a 100644 --- a/enterprise/server-enterprise/NOTICE.txt +++ b/enterprise/server-enterprise/NOTICE.txt @@ -46,6 +46,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/manual/cypher/graphgist/LICENSES.txt b/manual/cypher/graphgist/LICENSES.txt index 2cd605a7eb863..2b34f34ef64cb 100644 --- a/manual/cypher/graphgist/LICENSES.txt +++ b/manual/cypher/graphgist/LICENSES.txt @@ -8,6 +8,7 @@ Apache Software License, Version 2.0 ConcurrentLinkedHashMap Data Mapper for Jackson Jackson + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/manual/cypher/graphgist/NOTICE.txt b/manual/cypher/graphgist/NOTICE.txt index 366133661a149..d9bec648c5efd 100644 --- a/manual/cypher/graphgist/NOTICE.txt +++ b/manual/cypher/graphgist/NOTICE.txt @@ -31,6 +31,7 @@ Apache Software License, Version 2.0 ConcurrentLinkedHashMap Data Mapper for Jackson Jackson + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/manual/embedded-examples/LICENSES.txt b/manual/embedded-examples/LICENSES.txt index 383abdd386dfc..776c18937f7f1 100644 --- a/manual/embedded-examples/LICENSES.txt +++ b/manual/embedded-examples/LICENSES.txt @@ -5,6 +5,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. Apache Software License, Version 2.0 Apache Commons Lang ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/manual/embedded-examples/NOTICE.txt b/manual/embedded-examples/NOTICE.txt index 33c7bd1b34b41..562f7455cffa7 100644 --- a/manual/embedded-examples/NOTICE.txt +++ b/manual/embedded-examples/NOTICE.txt @@ -28,6 +28,7 @@ Third-party licenses Apache Software License, Version 2.0 Apache Commons Lang ConcurrentLinkedHashMap + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt b/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt index e775ee1c0b2ad..05ff0a11c2139 100644 --- a/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt +++ b/packaging/neo4j-desktop/src/main/distribution/text/community/LICENSES.txt @@ -24,6 +24,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt b/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt index 305f471bff9fc..9b0a22e4ba117 100644 --- a/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt +++ b/packaging/neo4j-desktop/src/main/distribution/text/community/NOTICE.txt @@ -47,6 +47,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt b/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt index 03fe74637c0c4..53c27acb5f1e4 100644 --- a/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt +++ b/packaging/standalone/standalone-community/src/main/distribution/text/community/LICENSES.txt @@ -24,6 +24,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt b/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt index d91aa2f9a2417..675d6d052e957 100644 --- a/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt +++ b/packaging/standalone/standalone-community/src/main/distribution/text/community/NOTICE.txt @@ -47,6 +47,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt index ecd470469f3ec..2f60730089de7 100644 --- a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt +++ b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/LICENSES.txt @@ -26,6 +26,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt index d067dd6e46267..e71b7f11fc5c6 100644 --- a/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt +++ b/packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/NOTICE.txt @@ -48,6 +48,7 @@ Apache Software License, Version 2.0 Jetty :: Utilities Jetty :: Webapp Application Support Jetty :: XML utilities + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/pom.xml b/pom.xml index c5ebc6c5bc4ea..6c54dd3020a2e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 2.14.3 notice-agpl-prefix.txt compile - 5.4.0 + 5.5.0 1.1.2 1.53 prepare-package @@ -474,6 +474,11 @@ lucene-core ${lucene.version} + + org.apache.lucene + lucene-codecs + ${lucene.version} + org.apache.lucene lucene-queryparser diff --git a/tools/LICENSES.txt b/tools/LICENSES.txt index 66824c6eadd42..10988d9b07dfe 100644 --- a/tools/LICENSES.txt +++ b/tools/LICENSES.txt @@ -8,6 +8,7 @@ Apache Software License, Version 2.0 ConcurrentLinkedHashMap Guava: Google Core Libraries for Java javax.inject + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory diff --git a/tools/NOTICE.txt b/tools/NOTICE.txt index cc15f538a17c2..a7d78409d5d7f 100644 --- a/tools/NOTICE.txt +++ b/tools/NOTICE.txt @@ -30,6 +30,7 @@ Apache Software License, Version 2.0 ConcurrentLinkedHashMap Guava: Google Core Libraries for Java javax.inject + Lucene codecs Lucene Common Analyzers Lucene Core Lucene Memory