Apache Solr open-source search software
SOLR-15428: Fix forbiddenapis Gradle setup. Also fix java options to … (#261)
Uwe Schindler250e19d7b2e5
diff --git a/gradle/defaults-java.gradle b/gradle/defaults-java.gradleindex 9e1b67ca980..038b602b301 100644--- a/gradle/defaults-java.gradle+++ b/gradle/defaults-java.gradle@@ -60,3 +60,12 @@ allprojects {}}}++configure(project(":solr:benchmark")) {+ plugins.withType(JavaPlugin) {+ tasks.named('compileJava').configure {+ options.compilerArgs -= [ "-Werror", "-proc:none" ]+ options.compilerArgs += "-Xlint:none"+ }+ }+}diff --git a/gradle/validation/forbidden-apis.gradle b/gradle/validation/forbidden-apis.gradleindex bbee655fc89..4965182d570 100644--- a/gradle/validation/forbidden-apis.gradle+++ b/gradle/validation/forbidden-apis.gradle@@ -128,6 +128,11 @@ allprojects { prj ->}}+ // Disable checks on JMH generated files.+ if (prj.path == ":solr:benchmark") {+ forbiddenApisMain.exclude("**/jmh_generated/**")+ }+// We rely on resolved configurations to compute the relevant set of rule// files for forbiddenApis. Since we don't want to resolve these configurations until// the task is executed, we can't really use them as task inputs properly. This is adiff --git a/solr/benchmark/build.gradle b/solr/benchmark/build.gradleindex 50bfd1bdba3..a2188b49679 100644--- a/solr/benchmark/build.gradle+++ b/solr/benchmark/build.gradle@@ -37,20 +37,6 @@ jmhReport {jmhReportOutput = project.file('build/reports/jmh')}-compileJava {- doFirst {- options.compilerArgs.remove("-Werror")- options.compilerArgs.remove("-proc:none")- options.compilerArgs.add("-Xlint:none")-- }-}--// forbiddenApis scans code that JMH generates-forbiddenApis {- ignoreFailures = true-}-task echoCp {doLast {print toPath((sourceSets.main.runtimeClasspath + sourceSets.main.resources).files)@@ -71,5 +57,4 @@ dependencies {implementation 'org.openjdk.jmh:jmh-core'annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess'-}diff --git a/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.java b/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.javaindex 5351fcef4ae..a17c5aa1127 100644--- a/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.java+++ b/solr/benchmark/src/test/org/apache/solr/bench/DockMakerTest.java@@ -17,7 +17,6 @@package org.apache.solr.bench;import java.util.HashSet;-import java.util.Random;import java.util.Set;import java.util.SplittableRandom;import java.util.concurrent.ThreadLocalRandom;@@ -31,7 +30,7 @@ public class DockMakerTest extends SolrTestCaseJ4 {@Beforepublic void setup() {- System.setProperty("randomSeed", Long.toString(new Random().nextLong()));+ System.setProperty("randomSeed", Long.toString(random().nextLong()));}@Test