You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/07/20 19:40:32 UTC
[lucene-solr] branch jira/LUCENE-9312 updated (b0e25a5 -> 5e1bdea)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a change to branch jira/LUCENE-9312
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from b0e25a5 Use public Gradle API for resolving javadoc executable. Don't use project properties - pass them directly as task properties.
new 1cf443a Emit altJvmWarning.
new 5e1bdea Renamed the alt jdk support gradle snippet to a more intuitive name.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 2 +-
.../{runtime-jvm-support.gradle => alternative-jdk-support.gradle} | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
rename gradle/testing/{runtime-jvm-support.gradle => alternative-jdk-support.gradle} (96%)
[lucene-solr] 01/02: Emit altJvmWarning.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch jira/LUCENE-9312
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 1cf443ab7a487a3904b3ddf9e2a1aca442517464
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Jul 20 21:38:27 2020 +0200
Emit altJvmWarning.
---
gradle/testing/runtime-jvm-support.gradle | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gradle/testing/runtime-jvm-support.gradle b/gradle/testing/runtime-jvm-support.gradle
index 185390f..1e69291 100644
--- a/gradle/testing/runtime-jvm-support.gradle
+++ b/gradle/testing/runtime-jvm-support.gradle
@@ -52,17 +52,20 @@ if (!currentJvm.javaExecutable.equals(altJvm.javaExecutable)) {
allprojects {
// Any tests
tasks.withType(Test) {
+ dependsOn ":altJvmWarning"
executable = altJvm.javaExecutable
}
// Any javac compilation tasks
tasks.withType(JavaCompile) {
+ dependsOn ":altJvmWarning"
options.fork = true
options.forkOptions.javaHome = altJvm.installationDirectory.asFile
}
def javadocExecutable = altJvm.jdk.get().javadocExecutable.asFile
tasks.matching { it.name == "renderJavadoc" || it.name == "renderSiteJavadoc" }.all {
+ dependsOn ":altJvmWarning"
executable = javadocExecutable
}
}
[lucene-solr] 02/02: Renamed the alt jdk support gradle snippet to
a more intuitive name.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch jira/LUCENE-9312
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 5e1bdeadb3d2bb6f4f7ed4aa0399622e0e209b12
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Mon Jul 20 21:40:21 2020 +0200
Renamed the alt jdk support gradle snippet to a more intuitive name.
---
build.gradle | 2 +-
.../{runtime-jvm-support.gradle => alternative-jdk-support.gradle} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 5f97892..a38ca1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,7 +94,7 @@ apply from: file('gradle/defaults-java.gradle')
apply from: file('gradle/testing/defaults-tests.gradle')
apply from: file('gradle/testing/randomization.gradle')
apply from: file('gradle/testing/fail-on-no-tests.gradle')
-apply from: file('gradle/testing/runtime-jvm-support.gradle')
+apply from: file('gradle/testing/alternative-jdk-support.gradle')
apply from: file('gradle/jar-manifest.gradle')
// Maven publishing.
diff --git a/gradle/testing/runtime-jvm-support.gradle b/gradle/testing/alternative-jdk-support.gradle
similarity index 100%
rename from gradle/testing/runtime-jvm-support.gradle
rename to gradle/testing/alternative-jdk-support.gradle