dweiss commented on a change in pull request #304:
URL: https://github.com/apache/solr/pull/304#discussion_r715997525
##########
File path: settings.gradle
##########
@@ -17,30 +17,74 @@
rootProject.name = "solr-root"
-includeBuild("dev-tools/missing-doclet")
+includeBuild("dev-tools/solr-missing-doclet")
-if (!(System.getProperty("skip.solr") as Boolean)) {
- include "solr:solrj"
- include "solr:core"
- include "solr:server"
- include "solr:contrib:analysis-extras"
- include "solr:contrib:analytics"
- include "solr:contrib:clustering"
- include "solr:contrib:extraction"
- include "solr:contrib:langid"
- include "solr:contrib:jaegertracer-configurator"
- include "solr:contrib:prometheus-exporter"
- include "solr:contrib:s3-repository"
- include "solr:contrib:scripting"
- include "solr:contrib:ltr"
- include "solr:contrib:gcs-repository"
- include "solr:webapp"
- include "solr:benchmark"
- include "solr:test-framework"
- include "solr:solr-ref-guide"
- include "solr:example"
+include "solr:solrj"
+include "solr:core"
+include "solr:server"
+include "solr:contrib:analysis-extras"
+include "solr:contrib:analytics"
+include "solr:contrib:clustering"
+include "solr:contrib:extraction"
+include "solr:contrib:langid"
+include "solr:contrib:jaegertracer-configurator"
+include "solr:contrib:prometheus-exporter"
+include "solr:contrib:s3-repository"
+include "solr:contrib:scripting"
+include "solr:contrib:ltr"
+include "solr:contrib:gcs-repository"
+include "solr:webapp"
+include "solr:benchmark"
+include "solr:test-framework"
+include "solr:solr-ref-guide"
+include "solr:example"
+include "solr:documentation"
+include "solr:packaging"
+include "solr:docker"
- include "solr:documentation"
- include "solr:packaging"
- include "solr:docker"
+if (file("lucene/main").exists()) {
+ includeBuild("lucene/main") {
+ dependencySubstitution {
+ def substitutionMap = [
+ "org.apache.lucene:lucene-analysis-common" :
":lucene:analysis:common",
+ "org.apache.lucene:lucene-analysis-icu" : ":lucene:analysis:icu",
+ "org.apache.lucene:lucene-analysis-kuromoji" :
":lucene:analysis:kuromoji",
+ "org.apache.lucene:lucene-analysis-morfologik" :
":lucene:analysis:morfologik",
+ "org.apache.lucene:lucene-analysis-nori" : ":lucene:analysis:nori",
+ "org.apache.lucene:lucene-analysis-opennlp" :
":lucene:analysis:opennlp",
+ "org.apache.lucene:lucene-analysis-phonetic" :
":lucene:analysis:phonetic",
+ "org.apache.lucene:lucene-analysis-smartcn" :
":lucene:analysis:smartcn",
+ "org.apache.lucene:lucene-analysis-stempel" :
":lucene:analysis:stempel",
+ "org.apache.lucene:lucene-backward-codecs" :
":lucene:backward-codecs",
+ "org.apache.lucene:lucene-benchmark" : ":lucene:benchmark",
+ "org.apache.lucene:lucene-classification" :
":lucene:classification",
+ "org.apache.lucene:lucene-codecs" : ":lucene:codecs",
+ "org.apache.lucene:lucene-core" : ":lucene:core",
+ "org.apache.lucene:lucene-demo" : ":lucene:demo",
+ "org.apache.lucene:lucene-expressions" : ":lucene:expressions",
+ "org.apache.lucene:lucene-facet" : ":lucene:facet",
+ "org.apache.lucene:lucene-grouping" : ":lucene:grouping",
+ "org.apache.lucene:lucene-highlighter" : ":lucene:highlighter",
+ "org.apache.lucene:lucene-join" : ":lucene:join",
+ "org.apache.lucene:lucene-memory" : ":lucene:memory",
+ "org.apache.lucene:lucene-misc" : ":lucene:misc",
+ "org.apache.lucene:lucene-monitor" : ":lucene:monitor",
+ "org.apache.lucene:lucene-queries" : ":lucene:queries",
+ "org.apache.lucene:lucene-queryparser" : ":lucene:queryparser",
+ "org.apache.lucene:lucene-replicator" : ":lucene:replicator",
+ "org.apache.lucene:lucene-sandbox" : ":lucene:sandbox",
+ "org.apache.lucene:lucene-spatial-extras" :
":lucene:spatial-extras",
+ "org.apache.lucene:lucene-spatial3d" : ":lucene:spatial3d",
+ "org.apache.lucene:lucene-suggest" : ":lucene:suggest",
+ "org.apache.lucene:lucene-test-framework" :
":lucene:test-framework"
+ ]
+
+ // We have to provide an explicit version to substitute because
otherwise
+ // all dependencies (including plugin dependencies?!) get
substituted.
+ String luceneVersion = "9.0.0-prerelease5"
Review comment:
Apologies - I wrote it quickly before leaving as a PoC. Yes, sure - the
version would have to be parsed out from the versions.props file (sadly). It
should *in theory* work without the version number... but turns out all modules
are replaced, even in build plugins (seems like a bug in gradle to me,
actually).
I'd also add a property pointing at the module path (rather than hardcoding
lucene/main) but it's all secondary to just making sure it actually works...
I think you should be able to commit directly to this PR, Mike - feel free
to apply those minor tweaks. It's a pity gradle versions stand in the way a
bit, eh.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
