You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2022/07/06 17:56:22 UTC
[solr] branch branch_9_0 updated: SOLR-16264: Set versions for all Antora build tools (#917)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9_0
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_0 by this push:
new a96b3799d75 SOLR-16264: Set versions for all Antora build tools (#917)
a96b3799d75 is described below
commit a96b3799d75e7f48f59a08d65ed72354e332b0ff
Author: Houston Putman <ho...@apache.org>
AuthorDate: Wed Jul 6 13:38:43 2022 -0400
SOLR-16264: Set versions for all Antora build tools (#917)
(cherry picked from commit 625389a1e280ba2195b0edc106773171e4b86a40)
---
solr/CHANGES.txt | 2 ++
solr/solr-ref-guide/build.gradle | 28 ++++++++++++++++------------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 113f6c002dd..79ec41f3437 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -13,6 +13,8 @@ Bug Fixes
* SOLR-16209: Rolling restart will no longer trigger as much PKI Plugin error logging. (Mike Drob, Tomás Fernández Löbbe)
+* SOLR-16264: Set versions for all Antora build tools (Houston Putman)
+
================== 9.0.0 ==================
New Features
diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index f44d3583527..22193e38166 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -53,6 +53,12 @@ dependencies {
ext {
antoraVersion = "3.0.1"
+ antoraLunrExtensionVersion = "1.0.0-alpha.8"
+ asciidoctorMathjaxVersion = "0.0.8"
+ linkCheckerVersion = "1.4.2"
+ gulpCliVersion = "2.3.0"
+ // Most recent commit as of 2022-06-24, this repo does not have tags
+ antoraDefaultUIVersion = "51ad811622394027afb4e182c2fdabc235ae04dd"
siteDir = "${buildDir}/site"
antoraConfigBuildDir = "${buildDir}/antora-config"
@@ -204,7 +210,6 @@ task downloadAntoraCli(type: NpmTask) {
args = ["install", "@antora/cli@${project.ext.antoraVersion}"]
inputs.property("Antora version", project.ext.antoraVersion)
- inputs.files("${project.ext.nodeProjectDir}/package.json")
outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/cli")
}
@@ -213,23 +218,22 @@ task downloadAntoraSiteGenerator(type: NpmTask) {
args = ["install", "@antora/site-generator-default@${project.ext.antoraVersion}"]
inputs.property("Antora version", project.ext.antoraVersion)
- inputs.files("${project.ext.nodeProjectDir}/package.json")
outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/site-generator-default")
}
task downloadAntoraLunrExtension(type: NpmTask) {
group = 'Build Dependency Download'
- args = ["install", "@antora/lunr-extension"]
+ args = ["install", "@antora/lunr-extension@${project.ext.antoraLunrExtensionVersion}"]
- inputs.files("${project.ext.nodeProjectDir}/package.json")
+ inputs.property("Antora lunr-extension version", project.ext.antoraLunrExtensionVersion)
outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/lunr-extension")
}
task downloadAsciidoctorMathjaxExtension(type: NpmTask) {
group = 'Build Dependency Download'
- args = ["install", "@djencks/asciidoctor-mathjax"]
+ args = ["install", "@djencks/asciidoctor-mathjax@${project.ext.asciidoctorMathjaxVersion}"]
- inputs.files("${project.ext.nodeProjectDir}/package.json")
+ inputs.property("asciidoctor-mathjax version", project.ext.asciidoctorMathjaxVersion)
outputs.dir("${project.ext.nodeProjectDir}/node_modules/@djencks/asciidoctor-mathjax")
}
@@ -245,17 +249,17 @@ task downloadAntora {
task downloadLinkValidator(type: NpmTask) {
group = 'Build Dependency Download'
- args = ["install", "link-checker"]
+ args = ["install", "link-checker@${project.ext.linkCheckerVersion}"]
- inputs.files("${project.ext.nodeProjectDir}/package.json")
+ inputs.property("link-checker version", project.ext.linkCheckerVersion)
outputs.dir("${project.ext.nodeProjectDir}/node_modules/link-checker")
}
task downloadDefaultUITemplate(type: NpmTask) {
group = 'Build Dependency Download'
- args = ["install", "gitlab:antora/antora-ui-default", "--include=dev"]
+ args = ["install", "gitlab:antora/antora-ui-default#${project.ext.antoraDefaultUIVersion}", "--include=dev"]
- inputs.files("${project.ext.nodeProjectDir}/package.json")
+ inputs.property("Antora default-ui version", project.ext.antoraDefaultUIVersion)
outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/ui-default")
}
@@ -293,14 +297,14 @@ task downloadGulp(type: NpmTask) {
group = 'Build Dependency Download'
dependsOn tasks.startUIBuildDir
- args = ["install", "gulp-cli", "--legacy-peer-deps"]
+ args = ["install", "gulp-cli@${project.ext.gulpCliVersion}", "--legacy-peer-deps"]
execOverrides {
// The it variable contains the `ExecSpec`
workingDir = project.ext.uiBuildDir
}
inputs.property("Antora version", project.ext.antoraVersion)
- inputs.files("${project.ext.uiBuildDir}/package.json")
+ inputs.property("Gulp CLI version", project.ext.gulpCliVersion)
outputs.dir("${project.ext.uiBuildDir}/node_modules/")
}