Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-10192: No need for hacky classpath, add the log4j module to the root set. Automatic modules have access to all other modules by default.

This commit is contained in:
Dawid Weiss 2021-10-24 18:28:04 +02:00
parent 627ef4d469
commit 7f7007966e
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lucene/distribution/binary-release.gradle
View File

@ -15,8 +15,6 @@
* limitations under the License. * limitations under the License.
*/ */
import org.apache.tools.ant.filters.ExpandProperties
// Configure Lucene's binary release. This is a bit convoluted so is placed // Configure Lucene's binary release. This is a bit convoluted so is placed
// in a separate script. // in a separate script.
@ -30,8 +28,6 @@ configure(project(":lucene:distribution")) {
jars jars
jarsTestFramework jarsTestFramework
jarsThirdParty jarsThirdParty
log4j
} }
dependencies { DependencyHandler handler -> dependencies { DependencyHandler handler ->
@ -65,9 +61,6 @@ configure(project(":lucene:distribution")) {
transitive = true transitive = true
}) })
} }
// Just to collect the version.
log4j "org.apache.logging.log4j:log4j-api"
} }
@ -86,18 +79,8 @@ configure(project(":lucene:distribution")) {
} }
// Attach binary release - only files. // Attach binary release - only files.
// We need to substitute log4j jar name because it's a proper module (for luke)
// and is otherwise invisible.
dependsOn configurations.log4j
def antPrj = new org.apache.tools.ant.Project()
doFirst {
antPrj.setProperty("log4j.api.jar", configurations.log4j.singleFile.name)
}
from(file("src/binary-release"), { from(file("src/binary-release"), {
filteringCharset = 'UTF-8' filteringCharset = 'UTF-8'
filter(ExpandProperties, project: antPrj)
}) })
// Cherry-pick certain files from the root. // Cherry-pick certain files from the root.

2
lucene/distribution/src/binary-release/bin/luke.cmd
View File

@ -17,5 +17,5 @@
SETLOCAL SETLOCAL
SET MODULES=%~dp0.. SET MODULES=%~dp0..
start javaw --module-path %MODULES%\modules;%MODULES%\modules-thirdparty -cp %MODULES%\modules-thirdparty\${log4j.api.jar} --module lucene.luke start javaw --module-path %MODULES%\modules;%MODULES%\modules-thirdparty --add-modules org.apache.logging.log4j --module lucene.luke
ENDLOCAL ENDLOCAL

2
lucene/distribution/src/binary-release/bin/luke.sh
View File

@ -16,4 +16,4 @@
# limitations under the License. # limitations under the License.
MODULES=$(cd $(dirname $0) && pwd) MODULES=$(cd $(dirname $0) && pwd)
java --module-path $MODULES/modules;$MODULES/modules-thirdparty -cp $MODULES/modules-thirdparty/${log4j.api.jar} --module lucene.luke java --module-path $MODULES/modules;$MODULES/modules-thirdparty --add-modules org.apache.logging.log4j --module lucene.luke