Apache Solr open-source search software
build: fetch BATS test libs via HTTP instead of npm/node (#4587)
David Smiley3bd2ede5d1f5
diff --git a/build.gradle b/build.gradleindex a2ad1c3072c..b82fdbbdcad 100644--- a/build.gradle+++ b/build.gradle@@ -27,7 +27,6 @@ plugins {alias(libs.plugins.kotlin.multiplatform) apply falsealias(libs.plugins.littlerobots.versioncatalogupdate) apply falsealias(libs.plugins.thetaphi.forbiddenapis) apply false- alias(libs.plugins.undercouch.download) apply falsealias(libs.plugins.ltgt.errorprone) apply falsealias(libs.plugins.diffplug.spotless) apply falsealias(libs.plugins.nodegradle.node) apply falsediff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex ae37ea2a91a..afc9c97bf56 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -52,12 +52,14 @@ asciidoctor-mathjax = "0.0.9"# @keep Asciidoctor tabs version used in ref-guideasciidoctor-tabs = "1.0.0-beta.6"azagniotov-langdetect = "12.5.2"-# @keep bats-assert (node) version used in packaging+# @keep bats-assert version used in packagingbats-assert = "2.0.0"-# @keep bats-core (node) version used in packaging+# @keep bats-core version used in packagingbats-core = "1.8.2"-# @keep bats-file (node) version used in packaging+# @keep bats-file version used in packagingbats-file = "0.3.0"+# @keep bats-support version used in packaging+bats-support = "0.2.0"bc-jose4j = "0.9.6"benmanes-caffeine = "3.2.3"benmanes-versions = "0.53.0"@@ -196,7 +198,6 @@ tdunning-tdigest = "3.3"testcontainers = "2.0.5"thetaphi-forbiddenapis = "3.10"threeten-bp = "1.7.3"-undercouch-download = "5.7.0"xerial-snappy = "1.1.10.8"[plugins]@@ -215,7 +216,6 @@ openapi-generator = { id = "org.openapi.generator", version.ref = "openapi" }owasp-dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "owasp-dependencycheck" }swagger3-core = { id = "io.swagger.core.v3.swagger-gradle-plugin", version.ref = "swagger3" }thetaphi-forbiddenapis = { id = "de.thetaphi.forbiddenapis", version.ref = "thetaphi-forbiddenapis" }-undercouch-download = { id = "de.undercouch.download", version.ref = "undercouch-download" }[libraries]adobe-testing-s3mock-junit4 = { module = "com.adobe.testing:s3mock-junit4", version.ref = "adobe-testing-s3mock" }diff --git a/gradle/node.gradle b/gradle/node.gradleindex 067b56f4471..0cf7923bac0 100644--- a/gradle/node.gradle+++ b/gradle/node.gradle@@ -15,7 +15,7 @@* limitations under the License.*/-configure([project(":solr:packaging"), project(":solr:solr-ref-guide"), project(":solr:webapp")]) {+configure([project(":solr:solr-ref-guide"), project(":solr:webapp")]) {apply plugin: libs.plugins.nodegradle.node.get().pluginIddef npmRegistry = "${-> propertyOrEnvOrDefault("solr.npm.registry", "SOLR_NPM_REGISTRY", '')}"diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradleindex 23ee9c8888c..bebfdb4057e 100644--- a/solr/packaging/build.gradle+++ b/solr/packaging/build.gradle@@ -32,6 +32,7 @@ ext {slimDistDir = file("$buildDir/solr-${version}-slim")devDir = file("$buildDir/dev")slimDevDir = file("$buildDir/dev-slim")+ batsLibsDir = file("$buildDir/bats-libs")}configurations {@@ -249,18 +250,39 @@ tasks.register('runDev', JavaExec) {args((project.findProperty('args') ?: '--module=http').split())}-task downloadBats(type: NpmTask) {+tasks.register('downloadBats') {group = 'Build Dependency Download'- args = ["install", "https://github.com/bats-core/bats-core#v${libs.versions.bats.core.get()}",- "https://github.com/bats-core/bats-assert#v${libs.versions.bats.assert.get()}",- "https://github.com/bats-core/bats-file#v${libs.versions.bats.file.get()}",+ description =+ 'Downloads BATS and its helper libraries (bats-support, bats-assert, bats-file) used by integrationTests'++ def batsLibs = [+ [org: 'bats-core', repo: 'bats-core', version: libs.versions.bats.core.get()],+ [org: 'ztombol', repo: 'bats-support', version: libs.versions.bats.support.get()],+ [org: 'bats-core', repo: 'bats-assert', version: libs.versions.bats.assert.get()],+ [org: 'bats-core', repo: 'bats-file', version: libs.versions.bats.file.get()],]-- inputs.files("${project.ext.nodeProjectDir}/package.json")- outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats")- outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats-support")- outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats-assert")- outputs.dir("${project.ext.nodeProjectDir}/node_modules/bats-file")+ def downloadDir = file("$buildDir/bats-downloads")++ inputs.property('batsLibs', batsLibs)+ outputs.dir(batsLibsDir)++ doLast {+ delete batsLibsDir+ mkdir downloadDir+ batsLibs.each {lib ->+ def archiveUrl = "https://github.com/${lib.org}/${lib.repo}/archive/refs/tags/v${lib.version}.tar.gz"+ def archiveFile = new File(downloadDir, "${lib.repo}-${lib.version}.tar.gz")+ ant.get(src: archiveUrl, dest: archiveFile, skipexisting: true)+ copy {+ from(tarTree(resources.gzip(archiveFile))) {+ // Strip the leading "<repo>-<version>/" directory that GitHub's archive adds.+ eachFile {details -> details.path = details.path.substring(details.path.indexOf('/') + 1)}+ includeEmptyDirs = false+ }+ into "$batsLibsDir/${lib.repo}"+ }+ }+ }}task integrationTests(type: BatsTask) {@@ -312,7 +334,7 @@ task integrationTests(type: BatsTask) {environment SOLR_LOGS_DIR: "$solrHome/logs"environment TEST_OUTPUT_DIR: integrationTestOutputenvironment TEST_FAILURE_DIR: solrTestFailuresDir- environment BATS_LIB_PREFIX: "$nodeProjectDir/node_modules"+ environment BATS_LIB_PREFIX: batsLibsDir}abstract class BatsTask extends Exec {@@ -337,7 +359,7 @@ abstract class BatsTask extends Exec {@Override@TaskActionprotected void exec() {- executable "$project.ext.nodeProjectDir/node_modules/bats/bin/bats"+ executable "$project.ext.batsLibsDir/bats-core/bin/bats"def batsArgs = []if (logger.isInfoEnabled()) {