Apache Lucene open-source search software
LUCENE-10255: add gradle compilation and module descriptor support for the java module system. Adds module descriptors to all Lucene subprojects.
Dawid Weiss6d83c2e08e61
diff --git a/build.gradle b/build.gradleindex b13d195f2f6..f8d856a7762 100644--- a/build.gradle+++ b/build.gradle@@ -119,6 +119,7 @@ apply from: file('gradle/testing/randomization.gradle')apply from: file('gradle/testing/fail-on-no-tests.gradle')apply from: file('gradle/testing/alternative-jdk-support.gradle')apply from: file('gradle/java/jar-manifest.gradle')+apply from: file('gradle/java/modules.gradle')// Maven artifact publishing.apply from: file('gradle/maven/publications.gradle')diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradleindex 4945a24583e..50093a6e4e5 100644--- a/gradle/documentation/render-javadoc.gradle+++ b/gradle/documentation/render-javadoc.gradle@@ -57,20 +57,22 @@ allprojects {outputDir = project.javadoc.destinationDir}- task renderSiteJavadoc(type: RenderJavadocTask) {- description "Generates Javadoc API documentation for the site (relative links)."- group "documentation"+ if (project.path != ':lucene:luke') {+ task renderSiteJavadoc(type: RenderJavadocTask) {+ description "Generates Javadoc API documentation for the site (relative links)."+ group "documentation"- taskResources = resources- dependsOn sourceSets.main.compileClasspath- classpath = sourceSets.main.compileClasspath- srcDirSet = sourceSets.main.java+ taskResources = resources+ dependsOn sourceSets.main.compileClasspath+ classpath = sourceSets.main.compileClasspath+ srcDirSet = sourceSets.main.java- relativeProjectLinks = true+ relativeProjectLinks = true- // Place the documentation under the documentation directory.- // docroot is defined in 'documentation.gradle'- outputDir = project.docroot.toPath().resolve(project.relativeDocPath).toFile()+ // Place the documentation under the documentation directory.+ // docroot is defined in 'documentation.gradle'+ outputDir = project.docroot.toPath().resolve(project.relativeDocPath).toFile()+ }}}}@@ -255,10 +257,6 @@ configure(subprojects) {}}-configure(project(':lucene:luke')) {- project.tasks.matching { it.name == 'renderSiteJavadoc' }.configureEach { it.enabled = false }-}-class OfflineLink implements Serializable {@InputString url@@ -353,7 +351,10 @@ class RenderJavadocTask extends DefaultTask {@TaskActionpublic void render() {- def srcDirs = srcDirSet.srcDirs.findAll { dir -> dir.exists() }+ def srcDirs = srcDirSet.sourceDirectories+ .findAll { dir -> dir.exists() }+ .findAll { dir -> dir.name != "java-module" }+def optionsFile = project.file("${getTemporaryDir()}/javadoc-options.txt")// create the directory, so relative link calculation knows that it's a directory:diff --git a/gradle/java/folder-layout.gradle b/gradle/java/folder-layout.gradleindex 8b21f81b479..9f41c056be9 100644--- a/gradle/java/folder-layout.gradle+++ b/gradle/java/folder-layout.gradle@@ -19,7 +19,10 @@allprojects {plugins.withType(JavaPlugin) {sourceSets {- main.java.srcDirs = ['src/java']+ main.java.srcDirs = [+ 'src/java',+ 'src/java-module'+ ]main.resources.srcDirs = ['src/resources']test.java.srcDirs = ['src/test']test.resources.srcDirs = ['src/test-files']diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradleindex d4ab812cf45..359b5792101 100644--- a/gradle/java/jar-manifest.gradle+++ b/gradle/java/jar-manifest.gradle@@ -69,12 +69,6 @@ subprojects {"X-Build-OS" : "${System.properties['os.name']} ${System.properties['os.arch']} ${System.properties['os.version']}"]- // Only apply automatic module name to jar task.- if (task.name in ["jar"]) {- manifestAttrs["Automatic-Module-Name"] =- "${-> project.path.replaceFirst(/^:lucene/, Matcher.quoteReplacement(project.group)).replace(':', '.').replace('-', '_')}"- }-manifest {attributes(manifestAttrs)}@@ -88,29 +82,3 @@ subprojects {}}}--configure(rootProject) {- tasks.register("showModuleNames", { showModuleTask ->- def allJarTasks = []-- rootProject.subprojects.each { subproject ->- subproject.tasks.matching { it.name == 'jar' }.all {- allJarTasks.add it- }- }-- dependsOn allJarTasks-- doFirst {- allJarTasks.each { jarTask ->- File jarFile = jarTask.outputs.files.singleFile- try (def jar = new JarFile(jarFile)) {- logger.lifecycle(String.format(Locale.ROOT,- "%-50s -> %s",- jarFile.name,- jar.manifest.mainAttributes.getValue("Automatic-Module-Name")))- }- }- }- })-}diff --git a/gradle/java/javac.gradle b/gradle/java/javac.gradleindex 78c5fb40a9e..25f66c39de0 100644--- a/gradle/java/javac.gradle+++ b/gradle/java/javac.gradle@@ -39,7 +39,8 @@ allprojects {"-Xlint:dep-ann","-Xlint:divzero","-Xlint:empty",- "-Xlint:exports",+ // TODO: uh-oh we have broken APIs.+ "-Xlint:-exports","-Xlint:fallthrough","-Xlint:finally","-Xlint:opens",diff --git a/gradle/java/modules.gradle b/gradle/java/modules.gradlenew file mode 100644index 00000000000..b1eb3816b96--- /dev/null+++ b/gradle/java/modules.gradle@@ -0,0 +1,227 @@+/*+ * 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.+ */++import java.util.function.Predicate++// Configure miscellaneous aspects required for supporting the java module system layer.++// TODO: remove the hacks excluding java-module source folder from ecjLint and javadoc rendering.++allprojects {+ plugins.withType(JavaPlugin) {+ // We won't be using gradle's built-in automatic module finder.+ java {+ modularity.inferModulePath.set(false)+ }++ // Utility method that detects whether a source set contains a module-info descriptor.+ Predicate<SourceSet> hasModuleDescriptor = { SourceSet ss ->+ ss.allJava.srcDirs.stream()+ .map(dir -> new File(dir, "module-info.java"))+ .anyMatch(file -> file.exists())+ }++ // Map convention configuration names to "modular" corresponding configurations.+ Closure<String> moduleConfigurationNameFor = { String configurationName ->+ return "module" + configurationName.capitalize().replace("Classpath", "Path")+ }++ //+ // For each source set, create explicit configurations for declaring modular dependencies.+ // These "modular" configurations correspond 1:1 to Gradle's conventions but have a 'module' prefix+ // and a capitalized remaining part of the conventional name. For example, an 'api' configuration in+ // the main source set would have a corresponding 'moduleApi' configuration for declaring modular+ // dependencies.+ //+ // Gradle's java plugin "convention" configurations extend from their modular counterparts+ // so all dependencies end up on classpath by default for backward compatibility with other+ // tasks and gradle infrastructure.+ //+ // At the same time, we also know which dependencies (and their transitive graph of dependencies!)+ // should be placed on module-path only.+ //+ // Note that an explicit configuration of modular dependencies also opens up the possibility of automatically+ // validating whether the dependency configuration for a gradle project is consistent with the information in+ // the module-info descriptor because there is a (nearly?) direct correspondence between the two:+ //+ // moduleApi - 'requires transitive'+ // moduleImplementation - 'requires'+ // moduleCompileOnly - 'requires static'+ //+ project.sourceSets.all { SourceSet sourceSet ->+ ConfigurationContainer configurations = project.configurations++ // Create modular configurations for convention configurations.+ Closure<Configuration> createModuleConfigurationForConvention = { String configurationName ->+ Configuration conventionConfiguration = configurations.maybeCreate(configurationName)+ Configuration moduleConfiguration = configurations.maybeCreate(moduleConfigurationNameFor(configurationName))+ moduleConfiguration.canBeConsumed(false)+ moduleConfiguration.canBeResolved(false)+ conventionConfiguration.extendsFrom(moduleConfiguration)++ project.logger.info("Created module configuration for '${conventionConfiguration.name}': ${moduleConfiguration.name}")+ return moduleConfiguration+ }++ Configuration moduleApi = createModuleConfigurationForConvention(sourceSet.apiConfigurationName)+ Configuration moduleImplementation = createModuleConfigurationForConvention(sourceSet.implementationConfigurationName)+ moduleImplementation.extendsFrom(moduleApi)+ Configuration moduleRuntimeOnly = createModuleConfigurationForConvention(sourceSet.runtimeOnlyConfigurationName)+ Configuration moduleCompileOnly = createModuleConfigurationForConvention(sourceSet.compileOnlyConfigurationName)+ // sourceSet.compileOnlyApiConfigurationName // This seems like a very esoteric use case, leave out.++ // Set up compilation module path configuration combining corresponding convention configurations.+ Closure<Configuration> createResolvableModuleConfiguration = { String configurationName ->+ Configuration conventionConfiguration = configurations.maybeCreate(configurationName)+ Configuration moduleConfiguration = configurations.maybeCreate(+ moduleConfigurationNameFor(conventionConfiguration.name))+ // Make these configurations resolvable, prefer classes folder over JARs.+ moduleConfiguration.canBeConsumed(false)+ moduleConfiguration.canBeResolved(true)+ moduleConfiguration.attributes {+ attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.CLASSES))+ }++ project.logger.info("Created resolvable module configuration for '${conventionConfiguration.name}': ${moduleConfiguration.name}")+ return moduleConfiguration+ }++ Configuration compileModulePathConfiguration = createResolvableModuleConfiguration(sourceSet.compileClasspathConfigurationName)+ compileModulePathConfiguration.extendsFrom(moduleCompileOnly, moduleImplementation)++ Configuration runtimeModulePathConfiguration = createResolvableModuleConfiguration(sourceSet.runtimeClasspathConfigurationName)+ runtimeModulePathConfiguration.extendsFrom(moduleRuntimeOnly, moduleImplementation)++ // Customized the JavaCompile for this source set so that it has proper module path.+ tasks.named(sourceSet.getCompileJavaTaskName()).configure({ JavaCompile task ->+ task.dependsOn compileModulePathConfiguration++ // Add modular dependencies and their transitive dependencies to module path.+ task.options.compilerArgumentProviders.add((CommandLineArgumentProvider) {+ def extraArgs = []+ if (!compileModulePathConfiguration.isEmpty()) {+ if (!hasModuleDescriptor.test(sourceSet)) {+ // We're compiling a non-module so we'll bring everything on module path in+ // otherwise things wouldn't be part of the resolved module graph.+ extraArgs += ["--add-modules", "ALL-MODULE-PATH"]+ }++ extraArgs += ["--module-path", compileModulePathConfiguration.files.join(File.pathSeparator)]+ }++ task.logger.info("Module path for ${task.path}:\n "+ + compileModulePathConfiguration.files.sort().join("\n "))++ return extraArgs+ })++ // Modify the default classpath by removing anything already placed on module path.+ // This could be done in a fancier way but a set difference is just fine for us here. Use a lazy+ // provider to delay computation of the actual path.+ task.classpath = files({ ->+ def trimmedClasspath = sourceSet.compileClasspath - compileModulePathConfiguration+ task.logger.info("Class path for ${task.path}:\n " + trimmedClasspath.files.sort().join("\n "))+ return trimmedClasspath+ })+ })+ }++ //+ // Configure the (default) test task to use module paths.+ //+ // There is no explicit connection between source sets and test tasks so there is no way (?)+ // to do this automatically, convention-style.++ // This closure can be used to configure a different task, with a different source set, should we+ // have the need for it.+ Closure<Void> configureTestTaskForSourceSet = { Test task, SourceSet sourceSet ->+ task.configure {+ Configuration modulePath = task.project.configurations.maybeCreate(+ moduleConfigurationNameFor(sourceSet.getRuntimeClasspathConfigurationName()))++ task.dependsOn modulePath++ // Add modular dependencies and their transitive dependencies to module path.+ task.jvmArgumentProviders.add((CommandLineArgumentProvider) {+ def extraArgs = []++ // Determine whether the source set classes themselves should be appended+ // to classpath or module path.+ boolean sourceSetIsAModule = hasModuleDescriptor.test(sourceSet)++ if (!modulePath.isEmpty() || sourceSetIsAModule) {+ if (sourceSetIsAModule) {+ // Add source set outputs to module path.+ extraArgs += ["--module-path", (modulePath + sourceSet.output.classesDirs).files.join(File.pathSeparator)]+ // Ideally, we should only add the sourceset's module here, everything else would be resolved via the+ // module descriptor. But this would require parsing the module descriptor and may cause JVM version conflicts+ // so keeping it simple.+ extraArgs += ["--add-modules", "ALL-MODULE-PATH"]+ } else {+ extraArgs += ["--module-path", modulePath.files.join(File.pathSeparator)]+ // In this case we're running a non-module against things on the module path so let's bring in+ // everything on module path into the resolution graph.+ extraArgs += ["--add-modules", "ALL-MODULE-PATH"]+ }+ }++ task.logger.info("Module path for ${task.path}:\n " + modulePath.files.sort().join("\n "))++ return extraArgs+ })+++ // Modify the default classpath by removing anything already placed on module path.+ // This could be done in a fancier way but a set difference is just fine for us here. Use a lazy+ // provider to delay computation of the actual path.+ task.classpath = files({ ->+ def trimmedClasspath = sourceSet.runtimeClasspath - modulePath++ boolean sourceSetIsAModule = hasModuleDescriptor.test(sourceSet)+ if (sourceSetIsAModule) {+ // also subtract the sourceSet's output directories.+ trimmedClasspath = trimmedClasspath - sourceSet.output.classesDirs+ }++ task.logger.info("Class path for ${task.path}:\n " + trimmedClasspath.files.sort().join("\n "))+ return trimmedClasspath+ })+ }+ }++ // Configure (tasks.test, sourceSets.test)+ tasks.matching { it.name == "test" }.all { Test task ->+ configureTestTaskForSourceSet(task, task.project.sourceSets.test)+ }++ // Configure module versions.+ tasks.withType(JavaCompile).configureEach { task ->+ // TODO: LUCENE-10267: workaround for gradle bug. Remove when the corresponding issue is fixed.+ task.options.compilerArgumentProviders.add((CommandLineArgumentProvider) { ->+ if (task.getClasspath().isEmpty()) {+ return ["--module-version", project.version.toString()]+ } else {+ return []+ }+ })++ task.options.javaModuleVersion.set(provider {+ return project.version.toString()+ })+ }+ }+}diff --git a/gradle/maven/publications.gradle b/gradle/maven/publications.gradleindex 32422cdf509..f4a48009743 100644--- a/gradle/maven/publications.gradle+++ b/gradle/maven/publications.gradle@@ -32,7 +32,7 @@ configure(rootProject) {ext {mavenProjects = project(":lucene").subprojects.findAll {subproject ->return !(subproject.path in [- // Exclude distribution assembly & documentation.+ // Exclude distribution assembly, tests & documentation.":lucene:distribution",":lucene:documentation",// Exclude the parent container project for analysis modules (no artifacts).diff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradleindex 398c26e10be..278986d79ed 100644--- a/gradle/validation/ecj-lint.gradle+++ b/gradle/validation/ecj-lint.gradle@@ -35,7 +35,9 @@ allprojects {// with a non-empty java.srcDirs. These tasks are then// attached to project's "ecjLint" task.def lintTasks = sourceSets.collect { sourceSet ->- def srcDirs = sourceSet.java.srcDirs.findAll { dir -> dir.exists() }+ def srcDirs = sourceSet.java.sourceDirectories+ .findAll { dir -> dir.exists() }+ .findAll { dir -> dir.name != "java-module" }tasks.create(sourceSet.getTaskName("ecjLint", null), JavaExec, {task ->// This dependency is on a configuration; technically it causesdiff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex ccaa2f2303f..dc4d2b1140d 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -45,6 +45,9 @@ API ChangesNew Features---------------------+* LUCENE-10255: Lucene JARs are now proper modules, with module descriptors and dependency information.+ (Chris Hegarty, Uwe Schindler, Tomoko Uchida, Dawid Weiss)+* LUCENE-10223: Add interval function support to StandardQueryParser. Add min-should-match operatorsupport to StandardQueryParser. Update and clean up package documentation in flexible query parsermodule. (Dawid Weiss, Alan Woodward)diff --git a/lucene/analysis/common/build.gradle b/lucene/analysis/common/build.gradleindex 6fba70adb2c..1815041f46f 100644--- a/lucene/analysis/common/build.gradle+++ b/lucene/analysis/common/build.gradle@@ -20,7 +20,7 @@ apply plugin: 'java-library'description = 'Analyzers for indexing content in different languages and domains'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/common/src/java-module/module-info.java b/lucene/analysis/common/src/java-module/module-info.javanew file mode 100644index 00000000000..00db3a91fe4--- /dev/null+++ b/lucene/analysis/common/src/java-module/module-info.java@@ -0,0 +1,218 @@+/*+ * 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.+ */++/** Lucene Analysis Common. */+module org.apache.lucene.analysis.common {+ requires java.xml;+ requires org.apache.lucene.core;++ exports org.apache.lucene.analysis.ar;+ exports org.apache.lucene.analysis.bg;+ exports org.apache.lucene.analysis.bn;+ exports org.apache.lucene.analysis.boost;+ exports org.apache.lucene.analysis.br;+ exports org.apache.lucene.analysis.ca;+ exports org.apache.lucene.analysis.charfilter;+ exports org.apache.lucene.analysis.cjk;+ exports org.apache.lucene.analysis.ckb;+ exports org.apache.lucene.analysis.classic;+ exports org.apache.lucene.analysis.commongrams;+ exports org.apache.lucene.analysis.compound;+ exports org.apache.lucene.analysis.core;+ exports org.apache.lucene.analysis.custom;+ exports org.apache.lucene.analysis.cz;+ exports org.apache.lucene.analysis.da;+ exports org.apache.lucene.analysis.de;+ exports org.apache.lucene.analysis.el;+ exports org.apache.lucene.analysis.email;+ exports org.apache.lucene.analysis.en;+ exports org.apache.lucene.analysis.es;+ exports org.apache.lucene.analysis.et;+ exports org.apache.lucene.analysis.eu;+ exports org.apache.lucene.analysis.fa;+ exports org.apache.lucene.analysis.fi;+ exports org.apache.lucene.analysis.fr;+ exports org.apache.lucene.analysis.ga;+ exports org.apache.lucene.analysis.gl;+ exports org.apache.lucene.analysis.hi;+ exports org.apache.lucene.analysis.hu;+ exports org.apache.lucene.analysis.hunspell;+ exports org.apache.lucene.analysis.hy;+ exports org.apache.lucene.analysis.id;+ exports org.apache.lucene.analysis.in;+ exports org.apache.lucene.analysis.it;+ exports org.apache.lucene.analysis.lt;+ exports org.apache.lucene.analysis.lv;+ exports org.apache.lucene.analysis.minhash;+ exports org.apache.lucene.analysis.miscellaneous;+ exports org.apache.lucene.analysis.ne;+ exports org.apache.lucene.analysis.ngram;+ exports org.apache.lucene.analysis.nl;+ exports org.apache.lucene.analysis.no;+ exports org.apache.lucene.analysis.path;+ exports org.apache.lucene.analysis.pattern;+ exports org.apache.lucene.analysis.payloads;+ exports org.apache.lucene.analysis.pt;+ exports org.apache.lucene.analysis.query;+ exports org.apache.lucene.analysis.reverse;+ exports org.apache.lucene.analysis.ro;+ exports org.apache.lucene.analysis.ru;+ exports org.apache.lucene.analysis.shingle;+ exports org.apache.lucene.analysis.sinks;+ exports org.apache.lucene.analysis.snowball;+ exports org.apache.lucene.analysis.sr;+ exports org.apache.lucene.analysis.sv;+ exports org.apache.lucene.analysis.synonym;+ exports org.apache.lucene.analysis.ta;+ exports org.apache.lucene.analysis.te;+ exports org.apache.lucene.analysis.th;+ exports org.apache.lucene.analysis.tr;+ exports org.apache.lucene.analysis.util;+ exports org.apache.lucene.analysis.wikipedia;+ exports org.apache.lucene.collation;++ provides org.apache.lucene.analysis.CharFilterFactory with+ org.apache.lucene.analysis.charfilter.HTMLStripCharFilterFactory,+ org.apache.lucene.analysis.charfilter.MappingCharFilterFactory,+ org.apache.lucene.analysis.cjk.CJKWidthCharFilterFactory,+ org.apache.lucene.analysis.fa.PersianCharFilterFactory,+ org.apache.lucene.analysis.pattern.PatternReplaceCharFilterFactory;+ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.tr.ApostropheFilterFactory,+ org.apache.lucene.analysis.ar.ArabicNormalizationFilterFactory,+ org.apache.lucene.analysis.ar.ArabicStemFilterFactory,+ org.apache.lucene.analysis.bg.BulgarianStemFilterFactory,+ org.apache.lucene.analysis.boost.DelimitedBoostTokenFilterFactory,+ org.apache.lucene.analysis.bn.BengaliNormalizationFilterFactory,+ org.apache.lucene.analysis.bn.BengaliStemFilterFactory,+ org.apache.lucene.analysis.br.BrazilianStemFilterFactory,+ org.apache.lucene.analysis.cjk.CJKBigramFilterFactory,+ org.apache.lucene.analysis.cjk.CJKWidthFilterFactory,+ org.apache.lucene.analysis.ckb.SoraniNormalizationFilterFactory,+ org.apache.lucene.analysis.ckb.SoraniStemFilterFactory,+ org.apache.lucene.analysis.classic.ClassicFilterFactory,+ org.apache.lucene.analysis.commongrams.CommonGramsFilterFactory,+ org.apache.lucene.analysis.commongrams.CommonGramsQueryFilterFactory,+ org.apache.lucene.analysis.compound.DictionaryCompoundWordTokenFilterFactory,+ org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilterFactory,+ org.apache.lucene.analysis.core.DecimalDigitFilterFactory,+ org.apache.lucene.analysis.core.LowerCaseFilterFactory,+ org.apache.lucene.analysis.core.StopFilterFactory,+ org.apache.lucene.analysis.core.TypeTokenFilterFactory,+ org.apache.lucene.analysis.core.UpperCaseFilterFactory,+ org.apache.lucene.analysis.cz.CzechStemFilterFactory,+ org.apache.lucene.analysis.de.GermanLightStemFilterFactory,+ org.apache.lucene.analysis.de.GermanMinimalStemFilterFactory,+ org.apache.lucene.analysis.de.GermanNormalizationFilterFactory,+ org.apache.lucene.analysis.de.GermanStemFilterFactory,+ org.apache.lucene.analysis.el.GreekLowerCaseFilterFactory,+ org.apache.lucene.analysis.el.GreekStemFilterFactory,+ org.apache.lucene.analysis.en.EnglishMinimalStemFilterFactory,+ org.apache.lucene.analysis.en.EnglishPossessiveFilterFactory,+ org.apache.lucene.analysis.en.KStemFilterFactory,+ org.apache.lucene.analysis.en.PorterStemFilterFactory,+ org.apache.lucene.analysis.es.SpanishLightStemFilterFactory,+ org.apache.lucene.analysis.es.SpanishMinimalStemFilterFactory,+ org.apache.lucene.analysis.es.SpanishPluralStemFilterFactory,+ org.apache.lucene.analysis.fa.PersianNormalizationFilterFactory,+ org.apache.lucene.analysis.fi.FinnishLightStemFilterFactory,+ org.apache.lucene.analysis.fr.FrenchLightStemFilterFactory,+ org.apache.lucene.analysis.fr.FrenchMinimalStemFilterFactory,+ org.apache.lucene.analysis.ga.IrishLowerCaseFilterFactory,+ org.apache.lucene.analysis.gl.GalicianMinimalStemFilterFactory,+ org.apache.lucene.analysis.gl.GalicianStemFilterFactory,+ org.apache.lucene.analysis.hi.HindiNormalizationFilterFactory,+ org.apache.lucene.analysis.hi.HindiStemFilterFactory,+ org.apache.lucene.analysis.hu.HungarianLightStemFilterFactory,+ org.apache.lucene.analysis.hunspell.HunspellStemFilterFactory,+ org.apache.lucene.analysis.id.IndonesianStemFilterFactory,+ org.apache.lucene.analysis.in.IndicNormalizationFilterFactory,+ org.apache.lucene.analysis.it.ItalianLightStemFilterFactory,+ org.apache.lucene.analysis.lv.LatvianStemFilterFactory,+ org.apache.lucene.analysis.minhash.MinHashFilterFactory,+ org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilterFactory,+ org.apache.lucene.analysis.miscellaneous.CapitalizationFilterFactory,+ org.apache.lucene.analysis.miscellaneous.CodepointCountFilterFactory,+ org.apache.lucene.analysis.miscellaneous.ConcatenateGraphFilterFactory,+ org.apache.lucene.analysis.miscellaneous.DateRecognizerFilterFactory,+ org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilterFactory,+ org.apache.lucene.analysis.miscellaneous.DropIfFlaggedFilterFactory,+ org.apache.lucene.analysis.miscellaneous.FingerprintFilterFactory,+ org.apache.lucene.analysis.miscellaneous.FixBrokenOffsetsFilterFactory,+ org.apache.lucene.analysis.miscellaneous.HyphenatedWordsFilterFactory,+ org.apache.lucene.analysis.miscellaneous.KeepWordFilterFactory,+ org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilterFactory,+ org.apache.lucene.analysis.miscellaneous.KeywordRepeatFilterFactory,+ org.apache.lucene.analysis.miscellaneous.LengthFilterFactory,+ org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilterFactory,+ org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilterFactory,+ org.apache.lucene.analysis.miscellaneous.LimitTokenPositionFilterFactory,+ org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilterFactory,+ org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilterFactory,+ org.apache.lucene.analysis.miscellaneous.ProtectedTermFilterFactory,+ org.apache.lucene.analysis.miscellaneous.TrimFilterFactory,+ org.apache.lucene.analysis.miscellaneous.TruncateTokenFilterFactory,+ org.apache.lucene.analysis.miscellaneous.TypeAsSynonymFilterFactory,+ org.apache.lucene.analysis.miscellaneous.WordDelimiterFilterFactory,+ org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilterFactory,+ org.apache.lucene.analysis.miscellaneous.ScandinavianFoldingFilterFactory,+ org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizationFilterFactory,+ org.apache.lucene.analysis.ngram.EdgeNGramFilterFactory,+ org.apache.lucene.analysis.ngram.NGramFilterFactory,+ org.apache.lucene.analysis.no.NorwegianLightStemFilterFactory,+ org.apache.lucene.analysis.no.NorwegianMinimalStemFilterFactory,+ org.apache.lucene.analysis.no.NorwegianNormalizationFilterFactory,+ org.apache.lucene.analysis.pattern.PatternReplaceFilterFactory,+ org.apache.lucene.analysis.pattern.PatternCaptureGroupFilterFactory,+ org.apache.lucene.analysis.pattern.PatternTypingFilterFactory,+ org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilterFactory,+ org.apache.lucene.analysis.payloads.NumericPayloadTokenFilterFactory,+ org.apache.lucene.analysis.payloads.TokenOffsetPayloadTokenFilterFactory,+ org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilterFactory,+ org.apache.lucene.analysis.pt.PortugueseLightStemFilterFactory,+ org.apache.lucene.analysis.pt.PortugueseMinimalStemFilterFactory,+ org.apache.lucene.analysis.pt.PortugueseStemFilterFactory,+ org.apache.lucene.analysis.reverse.ReverseStringFilterFactory,+ org.apache.lucene.analysis.ru.RussianLightStemFilterFactory,+ org.apache.lucene.analysis.shingle.ShingleFilterFactory,+ org.apache.lucene.analysis.shingle.FixedShingleFilterFactory,+ org.apache.lucene.analysis.snowball.SnowballPorterFilterFactory,+ org.apache.lucene.analysis.sr.SerbianNormalizationFilterFactory,+ org.apache.lucene.analysis.sv.SwedishLightStemFilterFactory,+ org.apache.lucene.analysis.sv.SwedishMinimalStemFilterFactory,+ org.apache.lucene.analysis.synonym.SynonymFilterFactory,+ org.apache.lucene.analysis.synonym.SynonymGraphFilterFactory,+ org.apache.lucene.analysis.core.FlattenGraphFilterFactory,+ org.apache.lucene.analysis.te.TeluguNormalizationFilterFactory,+ org.apache.lucene.analysis.te.TeluguStemFilterFactory,+ org.apache.lucene.analysis.tr.TurkishLowerCaseFilterFactory,+ org.apache.lucene.analysis.util.ElisionFilterFactory;+ provides org.apache.lucene.analysis.TokenizerFactory with+ org.apache.lucene.analysis.classic.ClassicTokenizerFactory,+ org.apache.lucene.analysis.core.KeywordTokenizerFactory,+ org.apache.lucene.analysis.core.LetterTokenizerFactory,+ org.apache.lucene.analysis.core.WhitespaceTokenizerFactory,+ org.apache.lucene.analysis.email.UAX29URLEmailTokenizerFactory,+ org.apache.lucene.analysis.ngram.EdgeNGramTokenizerFactory,+ org.apache.lucene.analysis.ngram.NGramTokenizerFactory,+ org.apache.lucene.analysis.path.PathHierarchyTokenizerFactory,+ org.apache.lucene.analysis.pattern.PatternTokenizerFactory,+ org.apache.lucene.analysis.pattern.SimplePatternSplitTokenizerFactory,+ org.apache.lucene.analysis.pattern.SimplePatternTokenizerFactory,+ org.apache.lucene.analysis.th.ThaiTokenizerFactory,+ org.apache.lucene.analysis.wikipedia.WikipediaTokenizerFactory;+}diff --git a/lucene/analysis/icu/build.gradle b/lucene/analysis/icu/build.gradleindex 2eab9633077..e76b32789a1 100644--- a/lucene/analysis/icu/build.gradle+++ b/lucene/analysis/icu/build.gradle@@ -20,10 +20,10 @@ apply plugin: 'java-library'description = 'Analysis integration with ICU (International Components for Unicode)'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')- api 'com.ibm.icu:icu4j'+ moduleApi 'com.ibm.icu:icu4j'testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/icu/src/java-module/module-info.java b/lucene/analysis/icu/src/java-module/module-info.javanew file mode 100644index 00000000000..c901af4bd20--- /dev/null+++ b/lucene/analysis/icu/src/java-module/module-info.java@@ -0,0 +1,37 @@+/*+ * 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.+ */++/** Analysis integration with ICU */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.analysis.icu {+ requires com.ibm.icu;+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.analysis.icu;+ exports org.apache.lucene.analysis.icu.segmentation;+ exports org.apache.lucene.analysis.icu.tokenattributes;++ provides org.apache.lucene.analysis.CharFilterFactory with+ org.apache.lucene.analysis.icu.ICUNormalizer2CharFilterFactory;+ provides org.apache.lucene.analysis.TokenizerFactory with+ org.apache.lucene.analysis.icu.segmentation.ICUTokenizerFactory;+ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.icu.ICUFoldingFilterFactory,+ org.apache.lucene.analysis.icu.ICUNormalizer2FilterFactory,+ org.apache.lucene.analysis.icu.ICUTransformFilterFactory;+}diff --git a/lucene/analysis/kuromoji/build.gradle b/lucene/analysis/kuromoji/build.gradleindex af2bfa5ff93..07fc0b0fe31 100644--- a/lucene/analysis/kuromoji/build.gradle+++ b/lucene/analysis/kuromoji/build.gradle@@ -20,8 +20,8 @@ apply plugin: 'java-library'description = 'Japanese Morphological Analyzer'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/kuromoji/src/java-module/module-info.java b/lucene/analysis/kuromoji/src/java-module/module-info.javanew file mode 100644index 00000000000..7c829fd4f2e--- /dev/null+++ b/lucene/analysis/kuromoji/src/java-module/module-info.java@@ -0,0 +1,40 @@+/*+ * 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.+ */++/** Japanese Morphological Analyzer */+module org.apache.lucene.analysis.kuromoji {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.analysis.ja;+ exports org.apache.lucene.analysis.ja.completion;+ exports org.apache.lucene.analysis.ja.dict;+ exports org.apache.lucene.analysis.ja.tokenattributes;+ exports org.apache.lucene.analysis.ja.util;++ provides org.apache.lucene.analysis.CharFilterFactory with+ org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilterFactory;+ provides org.apache.lucene.analysis.TokenizerFactory with+ org.apache.lucene.analysis.ja.JapaneseTokenizerFactory;+ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.ja.JapaneseBaseFormFilterFactory,+ org.apache.lucene.analysis.ja.JapaneseCompletionFilterFactory,+ org.apache.lucene.analysis.ja.JapaneseKatakanaStemFilterFactory,+ org.apache.lucene.analysis.ja.JapaneseNumberFilterFactory,+ org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilterFactory,+ org.apache.lucene.analysis.ja.JapaneseReadingFormFilterFactory;+}diff --git a/lucene/analysis/morfologik/build.gradle b/lucene/analysis/morfologik/build.gradleindex 153515fa113..03d7c098d93 100644--- a/lucene/analysis/morfologik/build.gradle+++ b/lucene/analysis/morfologik/build.gradle@@ -20,13 +20,12 @@ apply plugin: 'java-library'description = 'Analyzer for dictionary stemming, built-in Polish dictionary'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')+ moduleApi 'org.carrot2:morfologik-stemming'- api 'org.carrot2:morfologik-stemming'-- implementation 'org.carrot2:morfologik-polish'- implementation 'ua.net.nlp:morfologik-ukrainian-search'+ moduleImplementation 'org.carrot2:morfologik-polish'+ moduleImplementation 'ua.net.nlp:morfologik-ukrainian-search'testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/morfologik/src/java-module/module-info.java b/lucene/analysis/morfologik/src/java-module/module-info.javanew file mode 100644index 00000000000..3268d4b59d2--- /dev/null+++ b/lucene/analysis/morfologik/src/java-module/module-info.java@@ -0,0 +1,32 @@+/*+ * 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.+ */++/** Analyzer for dictionary stemming, built-in Polish dictionary */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.analysis.morfologik {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;+ requires org.carrot2.morfologik.stemming;+ requires org.carrot2.morfologik.polish;+ requires morfologik.ukrainian.search;++ exports org.apache.lucene.analysis.morfologik;+ exports org.apache.lucene.analysis.uk;++ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.morfologik.MorfologikFilterFactory;+}diff --git a/lucene/analysis/nori/build.gradle b/lucene/analysis/nori/build.gradleindex 430673ce583..079cf50010e 100644--- a/lucene/analysis/nori/build.gradle+++ b/lucene/analysis/nori/build.gradle@@ -20,8 +20,8 @@ apply plugin: 'java-library'description = 'Korean Morphological Analyzer'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/nori/src/java-module/module-info.java b/lucene/analysis/nori/src/java-module/module-info.javanew file mode 100644index 00000000000..9dd085b5a5d--- /dev/null+++ b/lucene/analysis/nori/src/java-module/module-info.java@@ -0,0 +1,33 @@+/*+ * 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.+ */++/** Korean Morphological Analyzer */+module org.apache.lucene.analysis.nori {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.analysis.ko;+ exports org.apache.lucene.analysis.ko.dict;+ exports org.apache.lucene.analysis.ko.tokenattributes;+ exports org.apache.lucene.analysis.ko.util;++ provides org.apache.lucene.analysis.TokenizerFactory with+ org.apache.lucene.analysis.ko.KoreanTokenizerFactory;+ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.ko.KoreanPartOfSpeechStopFilterFactory,+ org.apache.lucene.analysis.ko.KoreanReadingFormFilterFactory;+}diff --git a/lucene/analysis/opennlp/build.gradle b/lucene/analysis/opennlp/build.gradleindex c4672c06abd..3fee61a188e 100644--- a/lucene/analysis/opennlp/build.gradle+++ b/lucene/analysis/opennlp/build.gradle@@ -20,9 +20,9 @@ apply plugin: 'java-library'description = 'OpenNLP Library Integration'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')- api 'org.apache.opennlp:opennlp-tools'+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')+ moduleApi 'org.apache.opennlp:opennlp-tools'testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/opennlp/src/java-module/module-info.java b/lucene/analysis/opennlp/src/java-module/module-info.javanew file mode 100644index 00000000000..c63ecfaa387--- /dev/null+++ b/lucene/analysis/opennlp/src/java-module/module-info.java@@ -0,0 +1,34 @@+/*+ * 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.+ */++/** OpenNLP Library Integration */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.analysis.opennlp {+ requires org.apache.opennlp.tools;+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.analysis.opennlp;+ exports org.apache.lucene.analysis.opennlp.tools;++ provides org.apache.lucene.analysis.TokenizerFactory with+ org.apache.lucene.analysis.opennlp.OpenNLPTokenizerFactory;+ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.opennlp.OpenNLPChunkerFilterFactory,+ org.apache.lucene.analysis.opennlp.OpenNLPLemmatizerFilterFactory,+ org.apache.lucene.analysis.opennlp.OpenNLPPOSFilterFactory;+}diff --git a/lucene/analysis/phonetic/build.gradle b/lucene/analysis/phonetic/build.gradleindex 0f716e82b4a..e5595cb2d76 100644--- a/lucene/analysis/phonetic/build.gradle+++ b/lucene/analysis/phonetic/build.gradle@@ -20,10 +20,10 @@ apply plugin: 'java-library'description = 'Analyzer for indexing phonetic signatures (for sounds-alike search)'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')- implementation 'commons-codec:commons-codec'+ moduleImplementation 'commons-codec:commons-codec'testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/phonetic/src/java-module/module-info.java b/lucene/analysis/phonetic/src/java-module/module-info.javanew file mode 100644index 00000000000..706251af4ca--- /dev/null+++ b/lucene/analysis/phonetic/src/java-module/module-info.java@@ -0,0 +1,31 @@+/*+ * 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.+ */++/** Analyzer for indexing phonetic signatures */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.analysis.phonetic {+ requires org.apache.commons.codec;+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.analysis.phonetic;++ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.phonetic.BeiderMorseFilterFactory,+ org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilterFactory,+ org.apache.lucene.analysis.phonetic.PhoneticFilterFactory;+}diff --git a/lucene/analysis/smartcn/build.gradle b/lucene/analysis/smartcn/build.gradleindex 8d5eeb1f42d..960be700e71 100644--- a/lucene/analysis/smartcn/build.gradle+++ b/lucene/analysis/smartcn/build.gradle@@ -20,8 +20,8 @@ apply plugin: 'java-library'description = 'Analyzer for indexing Chinese'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/smartcn/src/java-module/module-info.java b/lucene/analysis/smartcn/src/java-module/module-info.javanew file mode 100644index 00000000000..44f4eb53002--- /dev/null+++ b/lucene/analysis/smartcn/src/java-module/module-info.java@@ -0,0 +1,28 @@+/*+ * 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.+ */++/** Analyzer for indexing Chinese */+module org.apache.lucene.analysis.smartcn {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.analysis.cn.smart;+ exports org.apache.lucene.analysis.cn.smart.hhmm;++ provides org.apache.lucene.analysis.TokenizerFactory with+ org.apache.lucene.analysis.cn.smart.HMMChineseTokenizerFactory;+}diff --git a/lucene/analysis/stempel/build.gradle b/lucene/analysis/stempel/build.gradleindex 3b80f9f7f88..32991597fd7 100644--- a/lucene/analysis/stempel/build.gradle+++ b/lucene/analysis/stempel/build.gradle@@ -20,8 +20,8 @@ apply plugin: 'java-library'description = 'Analyzer for indexing Polish'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')testImplementation project(':lucene:test-framework')}diff --git a/lucene/analysis/stempel/src/java-module/module-info.java b/lucene/analysis/stempel/src/java-module/module-info.javanew file mode 100644index 00000000000..d5595483c78--- /dev/null+++ b/lucene/analysis/stempel/src/java-module/module-info.java@@ -0,0 +1,29 @@+/*+ * 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.+ */++/** Analyzer for indexing Polish */+module org.apache.lucene.analysis.stempel {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.analysis.pl;+ exports org.apache.lucene.analysis.stempel;+ exports org.egothor.stemmer;++ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.analysis.stempel.StempelPolishStemFilterFactory;+}diff --git a/lucene/backward-codecs/build.gradle b/lucene/backward-codecs/build.gradleindex aa4730207eb..d5e25d92c49 100644--- a/lucene/backward-codecs/build.gradle+++ b/lucene/backward-codecs/build.gradle@@ -20,7 +20,7 @@ apply plugin: 'java-library'description = 'Codecs for older versions of Lucene'-dependencies {- api project(':lucene:core')+dependencies {+ moduleApi project(':lucene:core')testImplementation project(':lucene:test-framework')}diff --git a/lucene/backward-codecs/src/java-module/module-info.java b/lucene/backward-codecs/src/java-module/module-info.javanew file mode 100644index 00000000000..5dfe4efb4ab--- /dev/null+++ b/lucene/backward-codecs/src/java-module/module-info.java@@ -0,0 +1,45 @@+/*+ * 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.+ */++/** Codecs for older versions of Lucene */+module org.apache.lucene.backward_codecs {+ requires org.apache.lucene.core;++ exports org.apache.lucene.backward_codecs;+ exports org.apache.lucene.backward_codecs.lucene40.blocktree;+ exports org.apache.lucene.backward_codecs.lucene50;+ exports org.apache.lucene.backward_codecs.lucene50.compressing;+ exports org.apache.lucene.backward_codecs.lucene60;+ exports org.apache.lucene.backward_codecs.lucene70;+ exports org.apache.lucene.backward_codecs.lucene80;+ exports org.apache.lucene.backward_codecs.lucene84;+ exports org.apache.lucene.backward_codecs.lucene86;+ exports org.apache.lucene.backward_codecs.lucene87;+ exports org.apache.lucene.backward_codecs.packed;+ exports org.apache.lucene.backward_codecs.store;++ provides org.apache.lucene.codecs.DocValuesFormat with+ org.apache.lucene.backward_codecs.lucene80.Lucene80DocValuesFormat;+ provides org.apache.lucene.codecs.PostingsFormat with+ org.apache.lucene.backward_codecs.lucene50.Lucene50PostingsFormat,+ org.apache.lucene.backward_codecs.lucene84.Lucene84PostingsFormat;+ provides org.apache.lucene.codecs.Codec with+ org.apache.lucene.backward_codecs.lucene80.Lucene80Codec,+ org.apache.lucene.backward_codecs.lucene84.Lucene84Codec,+ org.apache.lucene.backward_codecs.lucene86.Lucene86Codec,+ org.apache.lucene.backward_codecs.lucene87.Lucene87Codec;+}diff --git a/lucene/benchmark/build.gradle b/lucene/benchmark/build.gradleindex 67b1644f3de..9da51c36229 100644--- a/lucene/benchmark/build.gradle+++ b/lucene/benchmark/build.gradle@@ -22,23 +22,23 @@ plugins {description = 'Lucene benchmarking module'dependencies {- implementation project(':lucene:core')+ moduleImplementation project(':lucene:core')- implementation project(':lucene:analysis:common')- implementation project(':lucene:facet')- implementation project(':lucene:highlighter')- implementation project(':lucene:queries')- implementation project(':lucene:spatial-extras')- implementation project(':lucene:queryparser')+ moduleImplementation project(':lucene:analysis:common')+ moduleImplementation project(':lucene:facet')+ moduleImplementation project(':lucene:highlighter')+ moduleImplementation project(':lucene:queries')+ moduleImplementation project(':lucene:spatial-extras')+ moduleImplementation project(':lucene:queryparser')- implementation "org.apache.commons:commons-compress"- implementation "com.ibm.icu:icu4j"- implementation "org.locationtech.spatial4j:spatial4j"- implementation("net.sourceforge.nekohtml:nekohtml", {+ moduleImplementation "org.apache.commons:commons-compress"+ moduleImplementation "com.ibm.icu:icu4j"+ moduleImplementation "org.locationtech.spatial4j:spatial4j"+ moduleImplementation ("net.sourceforge.nekohtml:nekohtml", {exclude module: "xml-apis"})- runtimeOnly project(':lucene:analysis:icu')+ moduleRuntimeOnly project(':lucene:analysis:icu')testImplementation project(':lucene:test-framework')}diff --git a/lucene/benchmark/src/java-module/module-info.java b/lucene/benchmark/src/java-module/module-info.javanew file mode 100644index 00000000000..f3dfac9b704--- /dev/null+++ b/lucene/benchmark/src/java-module/module-info.java@@ -0,0 +1,40 @@+/*+ * 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.+ */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.benchmark {+ requires java.xml;+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;+ requires org.apache.lucene.facet;+ requires org.apache.lucene.highlighter;+ requires org.apache.lucene.queries;+ requires org.apache.lucene.queryparser;+ requires org.apache.lucene.spatial_extras;+ requires spatial4j;++ exports org.apache.lucene.benchmark;+ exports org.apache.lucene.benchmark.byTask;+ exports org.apache.lucene.benchmark.byTask.feeds;+ exports org.apache.lucene.benchmark.byTask.programmatic;+ exports org.apache.lucene.benchmark.byTask.stats;+ exports org.apache.lucene.benchmark.byTask.tasks;+ exports org.apache.lucene.benchmark.byTask.utils;+ exports org.apache.lucene.benchmark.quality;+ exports org.apache.lucene.benchmark.quality.trec;+ exports org.apache.lucene.benchmark.quality.utils;+ exports org.apache.lucene.benchmark.utils;+}diff --git a/lucene/classification/build.gradle b/lucene/classification/build.gradleindex 736dfb305a7..8566cdbf146 100644--- a/lucene/classification/build.gradle+++ b/lucene/classification/build.gradle@@ -20,10 +20,10 @@ apply plugin: 'java-library'description = 'Classification module for Lucene'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')- implementation project(':lucene:queries')- implementation project(':lucene:grouping')+ moduleImplementation project(':lucene:queries')+ moduleImplementation project(':lucene:grouping')testImplementation project(':lucene:test-framework')testImplementation project(':lucene:analysis:common')diff --git a/lucene/classification/src/java-module/module-info.java b/lucene/classification/src/java-module/module-info.javanew file mode 100644index 00000000000..4817d8a21ce--- /dev/null+++ b/lucene/classification/src/java-module/module-info.java@@ -0,0 +1,27 @@+/*+ * 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.+ */++/** Classification module for Lucene */+module org.apache.lucene.classification {+ requires org.apache.lucene.core;+ requires org.apache.lucene.queries;+ requires org.apache.lucene.grouping;++ exports org.apache.lucene.classification;+ exports org.apache.lucene.classification.document;+ exports org.apache.lucene.classification.utils;+}diff --git a/lucene/codecs/build.gradle b/lucene/codecs/build.gradleindex ad26aae2d94..92e0782c9c0 100644--- a/lucene/codecs/build.gradle+++ b/lucene/codecs/build.gradle@@ -20,6 +20,6 @@ apply plugin: 'java-library'description = 'Lucene codecs and postings formats'dependencies {- implementation project(':lucene:core')+ moduleImplementation project(':lucene:core')testImplementation project(':lucene:test-framework')}diff --git a/lucene/codecs/src/java-module/module-info.java b/lucene/codecs/src/java-module/module-info.javanew file mode 100644index 00000000000..73f53fbf96b--- /dev/null+++ b/lucene/codecs/src/java-module/module-info.java@@ -0,0 +1,39 @@+/*+ * 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.+ */++/** Lucene codecs and postings formats */+module org.apache.lucene.codecs {+ requires org.apache.lucene.core;++ exports org.apache.lucene.codecs.blockterms;+ exports org.apache.lucene.codecs.blocktreeords;+ exports org.apache.lucene.codecs.bloom;+ exports org.apache.lucene.codecs.memory;+ exports org.apache.lucene.codecs.simpletext;+ exports org.apache.lucene.codecs.uniformsplit;+ exports org.apache.lucene.codecs.uniformsplit.sharedterms;++ provides org.apache.lucene.codecs.PostingsFormat with+ org.apache.lucene.codecs.blocktreeords.BlockTreeOrdsPostingsFormat,+ org.apache.lucene.codecs.bloom.BloomFilteringPostingsFormat,+ org.apache.lucene.codecs.memory.DirectPostingsFormat,+ org.apache.lucene.codecs.memory.FSTPostingsFormat,+ org.apache.lucene.codecs.uniformsplit.UniformSplitPostingsFormat,+ org.apache.lucene.codecs.uniformsplit.sharedterms.STUniformSplitPostingsFormat;+ provides org.apache.lucene.codecs.Codec with+ org.apache.lucene.codecs.simpletext.SimpleTextCodec;+}diff --git a/lucene/core/src/java-module/module-info.java b/lucene/core/src/java-module/module-info.javanew file mode 100644index 00000000000..931d4cbac2d--- /dev/null+++ b/lucene/core/src/java-module/module-info.java@@ -0,0 +1,72 @@+/*+ * 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.+ */++/** Lucene Core. */+module org.apache.lucene.core {+ requires jdk.unsupported; // this is needed for MMapDirectory to unmap++ exports org.apache.lucene.analysis;+ exports org.apache.lucene.analysis.standard;+ exports org.apache.lucene.analysis.tokenattributes;+ exports org.apache.lucene.codecs;+ exports org.apache.lucene.codecs.compressing;+ exports org.apache.lucene.codecs.lucene90;+ exports org.apache.lucene.codecs.lucene90.blocktree;+ exports org.apache.lucene.codecs.lucene90.compressing;+ exports org.apache.lucene.codecs.perfield;+ exports org.apache.lucene.document;+ exports org.apache.lucene.geo;+ exports org.apache.lucene.index;+ exports org.apache.lucene.search;+ exports org.apache.lucene.search.comparators;+ exports org.apache.lucene.search.similarities;+ exports org.apache.lucene.store;+ exports org.apache.lucene.util;+ exports org.apache.lucene.util.automaton;+ exports org.apache.lucene.util.bkd;+ exports org.apache.lucene.util.compress;+ exports org.apache.lucene.util.fst;+ exports org.apache.lucene.util.graph;+ exports org.apache.lucene.util.hnsw;+ exports org.apache.lucene.util.hppc;+ exports org.apache.lucene.util.mutable;+ exports org.apache.lucene.util.packed;++ provides org.apache.lucene.analysis.TokenizerFactory with+ org.apache.lucene.analysis.standard.StandardTokenizerFactory;+ provides org.apache.lucene.codecs.Codec with+ org.apache.lucene.codecs.lucene90.Lucene90Codec;+ provides org.apache.lucene.codecs.DocValuesFormat with+ org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat;+ provides org.apache.lucene.codecs.KnnVectorsFormat with+ org.apache.lucene.codecs.lucene90.Lucene90HnswVectorsFormat;+ provides org.apache.lucene.codecs.PostingsFormat with+ org.apache.lucene.codecs.lucene90.Lucene90PostingsFormat;+ provides org.apache.lucene.index.SortFieldProvider with+ org.apache.lucene.search.SortField.Provider,+ org.apache.lucene.search.SortedNumericSortField.Provider,+ org.apache.lucene.search.SortedSetSortField.Provider;++ uses org.apache.lucene.analysis.CharFilterFactory;+ uses org.apache.lucene.analysis.TokenFilterFactory;+ uses org.apache.lucene.analysis.TokenizerFactory;+ uses org.apache.lucene.codecs.Codec;+ uses org.apache.lucene.codecs.DocValuesFormat;+ uses org.apache.lucene.codecs.KnnVectorsFormat;+ uses org.apache.lucene.codecs.PostingsFormat;+ uses org.apache.lucene.index.SortFieldProvider;+}diff --git a/lucene/demo/build.gradle b/lucene/demo/build.gradleindex 3624328785a..70fd1df8248 100644--- a/lucene/demo/build.gradle+++ b/lucene/demo/build.gradle@@ -20,12 +20,12 @@ apply plugin: 'java-library'description = 'Simple example code for Apache Lucene'dependencies {- implementation project(':lucene:core')- implementation project(':lucene:facet')- implementation project(':lucene:queries')- implementation project(':lucene:analysis:common')- implementation project(':lucene:queryparser')- implementation project(':lucene:expressions')+ moduleImplementation project(':lucene:core')+ moduleImplementation project(':lucene:facet')+ moduleImplementation project(':lucene:queries')+ moduleImplementation project(':lucene:analysis:common')+ moduleImplementation project(':lucene:queryparser')+ moduleImplementation project(':lucene:expressions')testImplementation project(':lucene:test-framework')}diff --git a/lucene/demo/src/java-module/module-info.java b/lucene/demo/src/java-module/module-info.javanew file mode 100644index 00000000000..13549a56385--- /dev/null+++ b/lucene/demo/src/java-module/module-info.java@@ -0,0 +1,30 @@+/*+ * 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.+ */++/** Simple example code for Apache Lucene */+module org.apache.lucene.demo {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;+ requires org.apache.lucene.facet;+ requires org.apache.lucene.queries;+ requires org.apache.lucene.queryparser;+ requires org.apache.lucene.expressions;++ exports org.apache.lucene.demo;+ exports org.apache.lucene.demo.facet;+ exports org.apache.lucene.demo.knn;+}diff --git a/lucene/distribution/binary-release.gradle b/lucene/distribution/binary-release.gradleindex c06bb1a8777..be2ae6005ea 100644--- a/lucene/distribution/binary-release.gradle+++ b/lucene/distribution/binary-release.gradle@@ -28,6 +28,8 @@ configure(project(":lucene:distribution")) {jarsjarsTestFrameworkjarsThirdParty++ binaryDirForTests}dependencies { DependencyHandler handler ->@@ -63,7 +65,6 @@ configure(project(":lucene:distribution")) {}}-task assembleBinaryTgz(type: Tar) {description "Assemble binary Lucene artifact as a .tgz file."@@ -73,6 +74,26 @@ configure(project(":lucene:distribution")) {reproducibleFileOrder = truecompression = Compression.GZIP+ // Internal archive folder for all files.+ into "lucene-${rootProject.version}/"+ }++ task assembleBinaryDirForTests(type: Sync) {+ description "Assemble a subset of the binary Lucene distribution as an expanded directory for tests."++ destinationDir file("${packageBaseName}-itests")+ }++ artifacts {+ binaryDirForTests tasks.assembleBinaryDirForTests.destinationDir, {+ builtBy tasks.assembleBinaryDirForTests+ }+ }++ // Configure distribution content for archives and stand-alone directories.+ // This is split into binaries and other artifacts to speed up distribution+ // tests.+ Closure<Void> distributionBinaryContent = { AbstractCopyTask task ->// Manually correct posix permissions (matters when assembling archives on Windows).filesMatching(["**/*.sh", "**/*.bat"]) { copy ->copy.setMode(0755)@@ -83,6 +104,21 @@ configure(project(":lucene:distribution")) {filteringCharset = 'UTF-8'})+ // Binary modules (Lucene).+ from(configurations.jars, {+ into 'modules'+ })+ from(configurations.jarsTestFramework, {+ into 'modules-test-framework'+ })++ // Binary modules (with dependencies). Don't duplicate project artifacts.+ from((configurations.jarsThirdParty - configurations.jars), {+ into 'modules-thirdparty'+ })+ }++ Closure<Void> distributionOtherContent = { AbstractCopyTask task ->// Cherry-pick certain files from the root.from(project(':').projectDir, {include "LICENSE.txt"@@ -102,21 +138,14 @@ configure(project(":lucene:distribution")) {from(configurations.docs, {into 'docs'})+ }- // Binary modules (Lucene).- from(configurations.jars, {- into 'modules'- })- from(configurations.jarsTestFramework, {- into 'modules-test-framework'- })-- // Binary modules (with dependencies). Don't duplicate project artifacts.- from((configurations.jarsThirdParty - configurations.jars), {- into 'modules-thirdparty'- })+ [tasks.assembleBinaryTgz].each { Task task ->+ task.configure distributionBinaryContent+ task.configure distributionOtherContent+ }- // Internal archive folder for all files.- into "lucene-${rootProject.version}/"+ [tasks.assembleBinaryDirForTests].each { Task task ->+ task.configure distributionBinaryContent}}diff --git a/lucene/expressions/build.gradle b/lucene/expressions/build.gradleindex 7ba76a7f3a9..6823ae68782 100644--- a/lucene/expressions/build.gradle+++ b/lucene/expressions/build.gradle@@ -20,21 +20,14 @@ apply plugin: 'java-library'description = 'Dynamically computed values to sort/facet/search on based on a pluggable grammar'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')- implementation project(':lucene:codecs')+ moduleImplementation project(':lucene:codecs')- implementation 'org.antlr:antlr4-runtime'+ moduleImplementation 'org.antlr:antlr4-runtime'- // It is awkward that we force-omit the intermediate dependency here...- // The dependency chain is:- // asm-commons -> asm-tree -> asm- // Should we really go through these hoops?- implementation 'org.ow2.asm:asm'- implementation('org.ow2.asm:asm-commons', {- exclude group: "org.ow2.asm", module: "asm-tree"- exclude group: "org.ow2.asm", module: "asm-analysis"- })+ moduleImplementation 'org.ow2.asm:asm'+ moduleImplementation 'org.ow2.asm:asm-commons'testImplementation project(':lucene:test-framework')}diff --git a/lucene/expressions/src/java-module/module-info.java b/lucene/expressions/src/java-module/module-info.javanew file mode 100644index 00000000000..108f4532483--- /dev/null+++ b/lucene/expressions/src/java-module/module-info.java@@ -0,0 +1,28 @@+/*+ * 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.+ */++@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.expressions {+ requires org.objectweb.asm;+ requires org.objectweb.asm.commons;+ requires antlr4.runtime;+ requires org.apache.lucene.core;+ requires org.apache.lucene.codecs;++ exports org.apache.lucene.expressions;+ exports org.apache.lucene.expressions.js;+}diff --git a/lucene/facet/build.gradle b/lucene/facet/build.gradleindex b4f3ac588ac..1b16f94d574 100644--- a/lucene/facet/build.gradle+++ b/lucene/facet/build.gradle@@ -20,10 +20,10 @@ apply plugin: 'java-library'description = 'Faceted indexing and search capabilities'-dependencies {- api project(':lucene:core')+dependencies {+ moduleApi project(':lucene:core')- implementation 'com.carrotsearch:hppc'+ moduleImplementation 'com.carrotsearch:hppc'testImplementation project(':lucene:test-framework')testImplementation project(':lucene:queries')diff --git a/lucene/facet/src/java-module/module-info.java b/lucene/facet/src/java-module/module-info.javanew file mode 100644index 00000000000..26859cce6a4--- /dev/null+++ b/lucene/facet/src/java-module/module-info.java@@ -0,0 +1,31 @@+/*+ * 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.+ */++/** Faceted indexing and search capabilities */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.facet {+ requires java.logging;+ requires com.carrotsearch.hppc;+ requires org.apache.lucene.core;++ exports org.apache.lucene.facet;+ exports org.apache.lucene.facet.range;+ exports org.apache.lucene.facet.sortedset;+ exports org.apache.lucene.facet.taxonomy;+ exports org.apache.lucene.facet.taxonomy.directory;+ exports org.apache.lucene.facet.taxonomy.writercache;+}diff --git a/lucene/grouping/build.gradle b/lucene/grouping/build.gradleindex 6e719645c7e..7035a11c692 100644--- a/lucene/grouping/build.gradle+++ b/lucene/grouping/build.gradle@@ -21,9 +21,9 @@ apply plugin: 'java-library'description = 'Collectors for grouping search results'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')- implementation project(':lucene:queries')+ moduleImplementation project(':lucene:queries')testImplementation project(':lucene:test-framework')}diff --git a/lucene/grouping/src/java-module/module-info.java b/lucene/grouping/src/java-module/module-info.javanew file mode 100644index 00000000000..0f9665eb827--- /dev/null+++ b/lucene/grouping/src/java-module/module-info.java@@ -0,0 +1,24 @@+/*+ * 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.+ */++/** Collectors for grouping search results */+module org.apache.lucene.grouping {+ requires org.apache.lucene.core;+ requires org.apache.lucene.queries;++ exports org.apache.lucene.search.grouping;+}diff --git a/lucene/highlighter/build.gradle b/lucene/highlighter/build.gradleindex 6bd842690da..105f1dee539 100644--- a/lucene/highlighter/build.gradle+++ b/lucene/highlighter/build.gradle@@ -21,10 +21,10 @@ apply plugin: 'java-library'description = 'Highlights search keywords in results'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')- implementation project(':lucene:queries')- implementation project(':lucene:memory')+ moduleImplementation project(':lucene:queries')+ moduleImplementation project(':lucene:memory')testImplementation project(':lucene:test-framework')testImplementation project(':lucene:analysis:common')diff --git a/lucene/highlighter/src/java-module/module-info.java b/lucene/highlighter/src/java-module/module-info.javanew file mode 100644index 00000000000..64da8b5cd9f--- /dev/null+++ b/lucene/highlighter/src/java-module/module-info.java@@ -0,0 +1,28 @@+/*+ * 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.+ */++/** Highlights search keywords in results */+module org.apache.lucene.highlighter {+ requires org.apache.lucene.core;+ requires org.apache.lucene.queries;+ requires org.apache.lucene.memory;++ exports org.apache.lucene.search.highlight;+ exports org.apache.lucene.search.matchhighlight;+ exports org.apache.lucene.search.uhighlight;+ exports org.apache.lucene.search.vectorhighlight;+}diff --git a/lucene/join/build.gradle b/lucene/join/build.gradleindex 143daa13711..d8c2eabc52d 100644--- a/lucene/join/build.gradle+++ b/lucene/join/build.gradle@@ -20,6 +20,6 @@ apply plugin: 'java-library'description = 'Index-time and Query-time joins for normalized content'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')testImplementation project(':lucene:test-framework')}\ No newline at end of filediff --git a/lucene/join/src/java-module/module-info.java b/lucene/join/src/java-module/module-info.javanew file mode 100644index 00000000000..80d2261b5a5--- /dev/null+++ b/lucene/join/src/java-module/module-info.java@@ -0,0 +1,23 @@+/*+ * 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.+ */++/** Index-time and Query-time joins for normalized content */+module org.apache.lucene.join {+ requires org.apache.lucene.core;++ exports org.apache.lucene.search.join;+}diff --git a/lucene/licenses/asm-analysis-7.2.jar.sha1 b/lucene/licenses/asm-analysis-7.2.jar.sha1new file mode 100644index 00000000000..b0a8b7b83ed--- /dev/null+++ b/lucene/licenses/asm-analysis-7.2.jar.sha1@@ -0,0 +1 @@+b6e6abe057f23630113f4167c34bda7086691258diff --git a/lucene/licenses/asm-tree-7.2.jar.sha1 b/lucene/licenses/asm-tree-7.2.jar.sha1new file mode 100644index 00000000000..077d6f9c411--- /dev/null+++ b/lucene/licenses/asm-tree-7.2.jar.sha1@@ -0,0 +1 @@+3a23cc36edaf8fc5a89cb100182758ccb5991487diff --git a/lucene/luke/build.gradle b/lucene/luke/build.gradleindex 23c843a39ab..ac300811ac0 100644--- a/lucene/luke/build.gradle+++ b/lucene/luke/build.gradle@@ -25,27 +25,27 @@ ext {}dependencies {- api project(':lucene:core')-- implementation 'org.apache.logging.log4j:log4j-core'-- implementation project(':lucene:codecs')- implementation project(':lucene:backward-codecs')- implementation project(':lucene:analysis:common')- implementation project(':lucene:queries')- implementation project(':lucene:queryparser')- implementation project(':lucene:misc')-- implementation project(":lucene:highlighter")- implementation project(':lucene:analysis:icu')- implementation project(':lucene:analysis:kuromoji')- implementation project(':lucene:analysis:morfologik')- implementation project(':lucene:analysis:nori')- implementation project(':lucene:analysis:opennlp')- implementation project(':lucene:analysis:phonetic')- implementation project(':lucene:analysis:smartcn')- implementation project(':lucene:analysis:stempel')- implementation project(':lucene:suggest')+ moduleApi project(':lucene:core')++ moduleImplementation 'org.apache.logging.log4j:log4j-core'++ moduleImplementation project(':lucene:codecs')+ moduleImplementation project(':lucene:backward-codecs')+ moduleImplementation project(':lucene:analysis:common')+ moduleImplementation project(':lucene:queries')+ moduleImplementation project(':lucene:queryparser')+ moduleImplementation project(':lucene:misc')++ moduleImplementation project(":lucene:highlighter")+ moduleImplementation project(':lucene:analysis:icu')+ moduleImplementation project(':lucene:analysis:kuromoji')+ moduleImplementation project(':lucene:analysis:morfologik')+ moduleImplementation project(':lucene:analysis:nori')+ moduleImplementation project(':lucene:analysis:opennlp')+ moduleImplementation project(':lucene:analysis:phonetic')+ moduleImplementation project(':lucene:analysis:smartcn')+ moduleImplementation project(':lucene:analysis:stempel')+ moduleImplementation project(':lucene:suggest')testImplementation project(':lucene:test-framework')}@@ -57,6 +57,11 @@ tasks.withType(Jar) {}}+// Configure the main class and version attribute for the module system.+tasks.compileJava.configure {+ options.javaModuleMainClass.set("org.apache.lucene.luke.app.desktop.LukeMain")+}+// Process UTF8 property files to unicode escapes.tasks.withType(ProcessResources).configureEach { task ->task.filesMatching("**/messages*.properties", {@@ -107,8 +112,13 @@ task standaloneAssemble(type: Sync) {into standaloneDistDirdoLast {- logger.lifecycle("Standalone Luke distribution assembled. You can run it with:\n"- + "java -jar " + file("${standaloneDistDir}/${standaloneJar.archiveFileName.get()}"))+ logger.lifecycle(+ """+Standalone Luke distribution assembled. You can run it with:+java -jar "${standaloneDistDir}/${standaloneJar.archiveFileName.get()}"+java --module-path "${standaloneDistDir}" -m org.apache.lucene.luke+ """+ )}}@@ -143,3 +153,4 @@ task run() {}}}+diff --git a/lucene/luke/src/java-module/module-info.java b/lucene/luke/src/java-module/module-info.javanew file mode 100644index 00000000000..2c1b141ed5d--- /dev/null+++ b/lucene/luke/src/java-module/module-info.java@@ -0,0 +1,30 @@+/*+ * 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.+ */++/** Luke : Lucene toolbox project. */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.luke {+ requires java.desktop;+ requires java.logging;+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;+ requires org.apache.lucene.queries;+ requires org.apache.lucene.queryparser;+ requires org.apache.lucene.misc;+ requires org.apache.logging.log4j;+ requires org.apache.logging.log4j.core;+}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/LukeMain.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/LukeMain.javaindex 78c52544091..ba47207f9da 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/LukeMain.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/LukeMain.java@@ -20,9 +20,9 @@ package org.apache.lucene.luke.app.desktop;import static org.apache.lucene.luke.app.desktop.util.ExceptionHandler.handle;import java.awt.GraphicsEnvironment;-import java.io.IOException;import java.lang.invoke.MethodHandles;import java.nio.file.FileSystems;+import java.util.concurrent.SynchronousQueue;import javax.swing.JFrame;import javax.swing.UIManager;import org.apache.logging.log4j.Logger;@@ -55,19 +55,19 @@ public class LukeMain {return frame;}- private static void createAndShowGUI() {+ /** @return Returns {@code true} if GUI startup and initialization was successful. */+ private static boolean createAndShowGUI() {// uncaught error handlerMessageBroker messageBroker = MessageBroker.getInstance();- Thread.setDefaultUncaughtExceptionHandler((thread, cause) -> handle(cause, messageBroker));-try {+ Thread.setDefaultUncaughtExceptionHandler((thread, cause) -> handle(cause, messageBroker));+frame = new LukeWindowProvider().get();frame.setLocation(200, 100);frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);frame.pack();frame.setVisible(true);- // show open index dialogOpenIndexDialogFactory openIndexDialogFactory = OpenIndexDialogFactory.getInstance();new DialogOpener<>(openIndexDialogFactory).open(@@ -75,9 +75,12 @@ public class LukeMain {600,420,(factory) -> {});- } catch (IOException e) {++ return true;+ } catch (Throwable e) {messageBroker.showUnknownErrorMessage();- log.error("Cannot initialize components.", e);+ log.fatal("Cannot initialize components.", e);+ return false;}}@@ -93,6 +96,21 @@ public class LukeMain {GraphicsEnvironment genv = GraphicsEnvironment.getLocalGraphicsEnvironment();genv.registerFont(FontUtils.createElegantIconFont());- javax.swing.SwingUtilities.invokeLater(LukeMain::createAndShowGUI);+ var guiThreadResult = new SynchronousQueue<Boolean>();+ javax.swing.SwingUtilities.invokeLater(+ () -> {+ try {+ guiThreadResult.put(createAndShowGUI());+ } catch (InterruptedException e) {+ throw new RuntimeException(e);+ }+ });++ if (Boolean.FALSE.equals(guiThreadResult.take())) {+ // Use java logging just in case log4j didn't start up properly.+ java.util.logging.Logger.getGlobal()+ .severe("Luke could not start because of errors, see the log file: " + LOG_FILE);+ Runtime.getRuntime().exit(1);+ }}}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.javaindex 02c201ea448..90f5c2c6b42 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/FontUtils.java@@ -27,9 +27,7 @@ import javax.swing.JLabel;/** Font utilities */public class FontUtils {-- public static final String TTF_RESOURCE_NAME =- "org/apache/lucene/luke/app/desktop/font/ElegantIcons.ttf";+ private static final String TTF_RESOURCE_NAME = "ElegantIcons.ttf";@SuppressWarnings("unchecked")public static JLabel toLinkText(JLabel label) {@@ -42,7 +40,7 @@ public class FontUtils {}public static Font createElegantIconFont() throws IOException, FontFormatException {- InputStream is = FontUtils.class.getClassLoader().getResourceAsStream(TTF_RESOURCE_NAME);+ InputStream is = FontUtils.class.getResourceAsStream(TTF_RESOURCE_NAME);return Font.createFont(Font.TRUETYPE_FONT, is);}diff --git a/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.javaindex a1a91848059..6c1bc1faa63 100644--- a/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.java+++ b/lucene/luke/src/java/org/apache/lucene/luke/util/LoggerFactory.java@@ -31,7 +31,7 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;import org.apache.logging.log4j.core.layout.PatternLayout;import org.apache.lucene.luke.app.desktop.util.TextAreaAppender;-/** Logger factory. This programmatically configurates logger context (Appenders etc.) */+/** Logger factory. This programmatically configures logger context (Appenders etc.) */public class LoggerFactory {public static void initGuiLogging(String logFile) {diff --git a/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/font/ElegantIcons.ttf b/lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/util/ElegantIcons.ttfsimilarity index 100%rename from lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/font/ElegantIcons.ttfrename to lucene/luke/src/resources/org/apache/lucene/luke/app/desktop/util/ElegantIcons.ttfdiff --git a/lucene/memory/build.gradle b/lucene/memory/build.gradleindex 0d3bc1f7b03..eb6626e6d4d 100644--- a/lucene/memory/build.gradle+++ b/lucene/memory/build.gradle@@ -21,7 +21,7 @@ apply plugin: 'java-library'description = 'Single-document in-memory index implementation'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')testImplementation project(':lucene:test-framework')testImplementation project(':lucene:queryparser')diff --git a/lucene/memory/src/java-module/module-info.java b/lucene/memory/src/java-module/module-info.javanew file mode 100644index 00000000000..1d4f84a0588--- /dev/null+++ b/lucene/memory/src/java-module/module-info.java@@ -0,0 +1,23 @@+/*+ * 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.+ */++/** Single-document in-memory index implementation */+module org.apache.lucene.memory {+ requires org.apache.lucene.core;++ exports org.apache.lucene.index.memory;+}diff --git a/lucene/misc/build.gradle b/lucene/misc/build.gradleindex efed4f25408..b9d76265d5a 100644--- a/lucene/misc/build.gradle+++ b/lucene/misc/build.gradle@@ -20,7 +20,7 @@ apply plugin: 'java-library'description = 'Index tools and other miscellaneous code'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')testImplementation project(':lucene:test-framework')nativeDeps project(":lucene:misc:native")diff --git a/lucene/misc/src/java-module/module-info.java b/lucene/misc/src/java-module/module-info.javanew file mode 100644index 00000000000..269e6b0d220--- /dev/null+++ b/lucene/misc/src/java-module/module-info.java@@ -0,0 +1,29 @@+/*+ * 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.+ */++/** Index tools and other miscellaneous code */+module org.apache.lucene.misc {+ requires org.apache.lucene.core;++ exports org.apache.lucene.misc;+ exports org.apache.lucene.misc.document;+ exports org.apache.lucene.misc.index;+ exports org.apache.lucene.misc.search;+ exports org.apache.lucene.misc.store;+ exports org.apache.lucene.misc.util;+ exports org.apache.lucene.misc.util.fst;+}diff --git a/lucene/monitor/build.gradle b/lucene/monitor/build.gradleindex 3dd65a4da7a..ff6677f3704 100644--- a/lucene/monitor/build.gradle+++ b/lucene/monitor/build.gradle@@ -20,10 +20,10 @@ apply plugin: 'java-library'description = 'Reverse-search implementation for monitoring and classification'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')- implementation project(':lucene:memory')- implementation project(':lucene:analysis:common')+ moduleImplementation project(':lucene:memory')+ moduleImplementation project(':lucene:analysis:common')testImplementation project(':lucene:queryparser')testImplementation project(':lucene:test-framework')diff --git a/lucene/monitor/src/java-module/module-info.java b/lucene/monitor/src/java-module/module-info.javanew file mode 100644index 00000000000..71b70f03c7b--- /dev/null+++ b/lucene/monitor/src/java-module/module-info.java@@ -0,0 +1,25 @@+/*+ * 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.+ */++/** Reverse-search implementation for monitoring and classification */+module org.apache.lucene.monitor {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;+ requires org.apache.lucene.memory;++ exports org.apache.lucene.monitor;+}diff --git a/lucene/queries/build.gradle b/lucene/queries/build.gradleindex bd56a4dd50c..d0cc010ad77 100644--- a/lucene/queries/build.gradle+++ b/lucene/queries/build.gradle@@ -20,7 +20,7 @@ apply plugin: 'java-library'description = 'Filters and Queries that add to core Lucene'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')testImplementation project(':lucene:test-framework')testImplementation project(':lucene:expressions')diff --git a/lucene/queries/src/java-module/module-info.java b/lucene/queries/src/java-module/module-info.javanew file mode 100644index 00000000000..ae3ff4d0712--- /dev/null+++ b/lucene/queries/src/java-module/module-info.java@@ -0,0 +1,30 @@+/*+ * 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.+ */++/** Filters and Queries that add to core Lucene */+module org.apache.lucene.queries {+ requires org.apache.lucene.core;++ exports org.apache.lucene.queries;+ exports org.apache.lucene.queries.function;+ exports org.apache.lucene.queries.function.docvalues;+ exports org.apache.lucene.queries.function.valuesource;+ exports org.apache.lucene.queries.intervals;+ exports org.apache.lucene.queries.mlt;+ exports org.apache.lucene.queries.payloads;+ exports org.apache.lucene.queries.spans;+}diff --git a/lucene/queryparser/build.gradle b/lucene/queryparser/build.gradleindex 077eb245bc8..b50b565e2f7 100644--- a/lucene/queryparser/build.gradle+++ b/lucene/queryparser/build.gradle@@ -20,9 +20,9 @@ apply plugin: 'java-library'description = 'Query parsers and parsing framework'dependencies {- api project(':lucene:core')- api project(':lucene:queries')- api project(':lucene:sandbox')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:queries')+ moduleApi project(':lucene:sandbox')testImplementation project(':lucene:test-framework')}diff --git a/lucene/queryparser/src/java-module/module-info.java b/lucene/queryparser/src/java-module/module-info.javanew file mode 100644index 00000000000..3dab16dcd6f--- /dev/null+++ b/lucene/queryparser/src/java-module/module-info.java@@ -0,0 +1,52 @@+/*+ * 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.+ */++/** Query parsers and parsing framework */+module org.apache.lucene.queryparser {+ requires java.xml;+ requires org.apache.lucene.core;+ requires org.apache.lucene.queries;+ requires org.apache.lucene.sandbox;++ exports org.apache.lucene.queryparser.charstream;+ exports org.apache.lucene.queryparser.classic;+ exports org.apache.lucene.queryparser.complexPhrase;+ exports org.apache.lucene.queryparser.ext;+ exports org.apache.lucene.queryparser.flexible.core;+ exports org.apache.lucene.queryparser.flexible.core.builders;+ exports org.apache.lucene.queryparser.flexible.core.config;+ exports org.apache.lucene.queryparser.flexible.core.messages;+ exports org.apache.lucene.queryparser.flexible.core.nodes;+ exports org.apache.lucene.queryparser.flexible.core.parser;+ exports org.apache.lucene.queryparser.flexible.core.processors;+ exports org.apache.lucene.queryparser.flexible.core.util;+ exports org.apache.lucene.queryparser.flexible.messages;+ exports org.apache.lucene.queryparser.flexible.precedence;+ exports org.apache.lucene.queryparser.flexible.precedence.processors;+ exports org.apache.lucene.queryparser.flexible.standard;+ exports org.apache.lucene.queryparser.flexible.standard.builders;+ exports org.apache.lucene.queryparser.flexible.standard.config;+ exports org.apache.lucene.queryparser.flexible.standard.nodes;+ exports org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn;+ exports org.apache.lucene.queryparser.flexible.standard.parser;+ exports org.apache.lucene.queryparser.flexible.standard.processors;+ exports org.apache.lucene.queryparser.simple;+ exports org.apache.lucene.queryparser.surround.parser;+ exports org.apache.lucene.queryparser.surround.query;+ exports org.apache.lucene.queryparser.xml;+ exports org.apache.lucene.queryparser.xml.builders;+}diff --git a/lucene/replicator/build.gradle b/lucene/replicator/build.gradleindex c51feb0ba34..d3dfc07e3b3 100644--- a/lucene/replicator/build.gradle+++ b/lucene/replicator/build.gradle@@ -20,15 +20,15 @@ apply plugin: 'java-library'description = 'Lucene index files replication utility'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')- implementation project(':lucene:facet')+ moduleImplementation project(':lucene:facet')- implementation('org.apache.httpcomponents:httpclient', {+ moduleImplementation('org.apache.httpcomponents:httpclient', {exclude group: "commons-codec", module: "commons-codec"})- implementation 'javax.servlet:javax.servlet-api'+ moduleImplementation 'javax.servlet:javax.servlet-api'testImplementation 'org.eclipse.jetty:jetty-server'testImplementation('org.eclipse.jetty:jetty-servlet', {diff --git a/lucene/replicator/src/java-module/module-info.java b/lucene/replicator/src/java-module/module-info.javanew file mode 100644index 00000000000..d44b9adfa9f--- /dev/null+++ b/lucene/replicator/src/java-module/module-info.java@@ -0,0 +1,29 @@+/*+ * 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.+ */++/** Lucene index files replication utility */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.replicator {+ requires javax.servlet.api;+ requires org.apache.httpcomponents.httpclient;+ requires org.apache.lucene.core;+ requires org.apache.lucene.facet;++ exports org.apache.lucene.replicator;+ exports org.apache.lucene.replicator.http;+ exports org.apache.lucene.replicator.nrt;+}diff --git a/lucene/sandbox/build.gradle b/lucene/sandbox/build.gradleindex a1a64d1d603..b7e8018ea64 100644--- a/lucene/sandbox/build.gradle+++ b/lucene/sandbox/build.gradle@@ -20,7 +20,7 @@ apply plugin: 'java-library'description = 'Various third party contributions and new ideas'dependencies {- api project(':lucene:core')- api project(':lucene:queries')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:queries')testImplementation project(':lucene:test-framework')}diff --git a/lucene/sandbox/src/java-module/module-info.java b/lucene/sandbox/src/java-module/module-info.javanew file mode 100644index 00000000000..6d195445fbe--- /dev/null+++ b/lucene/sandbox/src/java-module/module-info.java@@ -0,0 +1,31 @@+/*+ * 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.+ */++/** Various third party contributions and new ideas */+module org.apache.lucene.sandbox {+ requires org.apache.lucene.core;+ requires org.apache.lucene.queries;++ exports org.apache.lucene.payloads;+ exports org.apache.lucene.sandbox.codecs.idversion;+ exports org.apache.lucene.sandbox.document;+ exports org.apache.lucene.sandbox.queries;+ exports org.apache.lucene.sandbox.search;++ provides org.apache.lucene.codecs.PostingsFormat with+ org.apache.lucene.sandbox.codecs.idversion.IDVersionPostingsFormat;+}diff --git a/lucene/spatial-extras/build.gradle b/lucene/spatial-extras/build.gradleindex 252056b9d8f..34fa10e13e7 100644--- a/lucene/spatial-extras/build.gradle+++ b/lucene/spatial-extras/build.gradle@@ -20,16 +20,16 @@ apply plugin: 'java-library'description = 'Geospatial search'dependencies {- api project(':lucene:core')- api project(':lucene:spatial3d')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:spatial3d')- api 'org.locationtech.spatial4j:spatial4j'- api 'io.sgr:s2-geometry-library-java'+ moduleApi 'org.locationtech.spatial4j:spatial4j'+ moduleApi 'io.sgr:s2-geometry-library-java'testImplementation project(':lucene:test-framework')testImplementation testFixtures(project(':lucene:spatial3d'))- testImplementation 'org.locationtech.jts:jts-core'+ moduleTestImplementation 'org.locationtech.jts:jts-core'testImplementation 'org.locationtech.spatial4j:spatial4j::tests'}diff --git a/lucene/spatial-extras/src/java-module/module-info.java b/lucene/spatial-extras/src/java-module/module-info.javanew file mode 100644index 00000000000..2464761b4b5--- /dev/null+++ b/lucene/spatial-extras/src/java-module/module-info.java@@ -0,0 +1,37 @@+/*+ * 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.+ */++/** Geospatial search */+@SuppressWarnings({"requires-automatic"})+module org.apache.lucene.spatial_extras {+ requires java.logging;+ requires spatial4j;+ requires s2.geometry.library.java;+ requires org.apache.lucene.core;+ requires org.apache.lucene.spatial3d;++ exports org.apache.lucene.spatial;+ exports org.apache.lucene.spatial.bbox;+ exports org.apache.lucene.spatial.composite;+ exports org.apache.lucene.spatial.prefix;+ exports org.apache.lucene.spatial.prefix.tree;+ exports org.apache.lucene.spatial.query;+ exports org.apache.lucene.spatial.serialized;+ exports org.apache.lucene.spatial.spatial4j;+ exports org.apache.lucene.spatial.util;+ exports org.apache.lucene.spatial.vector;+}diff --git a/lucene/spatial3d/build.gradle b/lucene/spatial3d/build.gradleindex db2064c9396..219d0293dc2 100644--- a/lucene/spatial3d/build.gradle+++ b/lucene/spatial3d/build.gradle@@ -21,7 +21,7 @@ apply plugin: 'java-test-fixtures'description = '3D spatial planar geometry APIs'dependencies {- api project(':lucene:core')+ moduleApi project(':lucene:core')testFixturesApi project(':lucene:test-framework')testImplementation project(':lucene:test-framework')diff --git a/lucene/spatial3d/src/java-module/module-info.java b/lucene/spatial3d/src/java-module/module-info.javanew file mode 100644index 00000000000..9bffb23a468--- /dev/null+++ b/lucene/spatial3d/src/java-module/module-info.java@@ -0,0 +1,24 @@+/*+ * 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.+ */++/** 3D spatial planar geometry APIs */+module org.apache.lucene.spatial3d {+ requires org.apache.lucene.core;++ exports org.apache.lucene.spatial3d;+ exports org.apache.lucene.spatial3d.geom;+}diff --git a/lucene/suggest/build.gradle b/lucene/suggest/build.gradleindex 54a559624da..3afccd85686 100644--- a/lucene/suggest/build.gradle+++ b/lucene/suggest/build.gradle@@ -20,8 +20,8 @@ apply plugin: 'java-library'description = 'Auto-suggest and Spellchecking support'dependencies {- api project(':lucene:core')- api project(':lucene:analysis:common')+ moduleApi project(':lucene:core')+ moduleApi project(':lucene:analysis:common')testImplementation project(':lucene:test-framework')}diff --git a/lucene/suggest/src/java-module/module-info.java b/lucene/suggest/src/java-module/module-info.javanew file mode 100644index 00000000000..4444a9dd2f1--- /dev/null+++ b/lucene/suggest/src/java-module/module-info.java@@ -0,0 +1,36 @@+/*+ * 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.+ */++/** Auto-suggest and Spellchecking support */+module org.apache.lucene.suggest {+ requires org.apache.lucene.core;+ requires org.apache.lucene.analysis.common;++ exports org.apache.lucene.search.spell;+ exports org.apache.lucene.search.suggest;+ exports org.apache.lucene.search.suggest.analyzing;+ exports org.apache.lucene.search.suggest.document;+ exports org.apache.lucene.search.suggest.fst;+ exports org.apache.lucene.search.suggest.tst;++ provides org.apache.lucene.codecs.PostingsFormat with+ org.apache.lucene.search.suggest.document.Completion50PostingsFormat,+ org.apache.lucene.search.suggest.document.Completion84PostingsFormat,+ org.apache.lucene.search.suggest.document.Completion90PostingsFormat;+ provides org.apache.lucene.analysis.TokenFilterFactory with+ org.apache.lucene.search.suggest.analyzing.SuggestStopFilterFactory;+}diff --git a/versions.lock b/versions.lockindex 98770e51109..c1e09ef8394 100644--- a/versions.lock+++ b/versions.lock@@ -20,8 +20,10 @@ org.carrot2:morfologik-polish:2.1.8 (1 constraints: 0d050036)org.carrot2:morfologik-stemming:2.1.8 (2 constraints: 1112dc0c)org.hamcrest:hamcrest:2.2 (1 constraints: a8041f2c)org.locationtech.spatial4j:spatial4j:0.8 (1 constraints: ac041f2c)-org.ow2.asm:asm:7.2 (2 constraints: 900e3e5e)+org.ow2.asm:asm:7.2 (3 constraints: 2717d96b)+org.ow2.asm:asm-analysis:7.2 (1 constraints: e409d9a5)org.ow2.asm:asm-commons:7.2 (1 constraints: ad042e2c)+org.ow2.asm:asm-tree:7.2 (2 constraints: 2f14468c)ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: 10051b36)xerces:xercesImpl:2.12.0 (2 constraints: 1f14b675)diff --git a/versions.props b/versions.propsindex d4a9677b56b..36c320f5e1a 100644--- a/versions.props+++ b/versions.props@@ -19,4 +19,4 @@ org.locationtech.jts:jts-core=1.17.0org.locationtech.spatial4j:*=0.8org.ow2.asm:*=7.2ua.net.nlp:morfologik-ukrainian-search=4.9.1-xerces:xercesImpl=2.12.0+xerces:xercesImpl=2.12.0\ No newline at end of file