You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by md...@apache.org on 2021/10/29 14:59:56 UTC

[lucene] branch main updated: Replace deprecated Gradle 7.2 properties (#417)

This is an automated email from the ASF dual-hosted git repository.

mdrob pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new 23256a3  Replace deprecated Gradle 7.2 properties (#417)
23256a3 is described below

commit 23256a30fa341dd9fc9742e131db856fc632de1b
Author: Mike Drob <md...@apache.org>
AuthorDate: Fri Oct 29 09:59:47 2021 -0500

    Replace deprecated Gradle 7.2 properties (#417)
---
 gradle/java/folder-layout.gradle     | 2 +-
 gradle/testing/defaults-tests.gradle | 4 ++--
 gradle/validation/ecj-lint.gradle    | 2 +-
 lucene/benchmark/build.gradle        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/java/folder-layout.gradle b/gradle/java/folder-layout.gradle
index 11133aa..8b21f81 100644
--- a/gradle/java/folder-layout.gradle
+++ b/gradle/java/folder-layout.gradle
@@ -29,7 +29,7 @@ allprojects {
       from('src/test') {
         exclude '**/*.java'
       }
-      into sourceSets.test.java.outputDir
+      into sourceSets.test.java.classesDirectory
     }
     processTestResources.dependsOn copyTestResources
 
diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradle
index 986e777..4d36a67 100644
--- a/gradle/testing/defaults-tests.gradle
+++ b/gradle/testing/defaults-tests.gradle
@@ -90,7 +90,7 @@ allprojects {
 
     tasks.withType(Test) {
       ext {
-        testOutputsDir = file("${reports.junitXml.destination}/outputs")
+        testOutputsDir = file("${reports.junitXml.outputLocation}/outputs")
       }
 
       // LUCENE-9660: Make it possible to always rerun tests, even if they're incrementally up-to-date.
@@ -148,7 +148,7 @@ allprojects {
       }
 
       // Disable HTML report generation. The reports are big and slow to generate.
-      reports.html.enabled = false
+      reports.html.required = false
 
       // Set up logging.
       testLogging {
diff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradle
index 2b49717..a8f7e28 100644
--- a/gradle/validation/ecj-lint.gradle
+++ b/gradle/validation/ecj-lint.gradle
@@ -52,7 +52,7 @@ allprojects {
         enabled = !srcDirs.isEmpty()
 
         classpath = rootProject.configurations.ecjDeps
-        main = "org.eclipse.jdt.internal.compiler.batch.Main"
+        mainClass = "org.eclipse.jdt.internal.compiler.batch.Main"
 
         // Don't emit any .class files.
         // Hack around "-d none" still emitting package-info.class
diff --git a/lucene/benchmark/build.gradle b/lucene/benchmark/build.gradle
index 565516a..df8c167 100644
--- a/lucene/benchmark/build.gradle
+++ b/lucene/benchmark/build.gradle
@@ -50,7 +50,7 @@ sourceSets {
 
 task run(type: JavaExec) {
   description "Run a perf test (optional: -PtaskAlg=conf/your-algorithm-file -PmaxHeapSize=1G)"
-  main 'org.apache.lucene.benchmark.byTask.Benchmark'
+  mainClass = 'org.apache.lucene.benchmark.byTask.Benchmark'
 
   classpath sourceSets.main.runtimeClasspath
   // allow these to be specified on the CLI via -PtaskAlg=  for example