This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 250e19d SOLR-15428: Fix forbiddenapis Gradle setup. Also fix java
options to … (#261)
250e19d is described below
commit 250e19d7b2e5bba9f01cb231cc00e03c09c62d19
Author: Uwe Schindler <[email protected]>
AuthorDate: Fri Aug 13 11:11:11 2021 +0200
SOLR-15428: Fix forbiddenapis Gradle setup. Also fix java options to …
(#261)
SOLR-15428: Fix forbiddenapis Gradle setup. Also fix java options to
conform to how Solr's build is setup (don't put logic of plugins into
build.gradle files)
---
gradle/defaults-java.gradle | 9 +++++++++
gradle/validation/forbidden-apis.gradle | 5 +++++
solr/benchmark/build.gradle | 15 ---------------
.../src/test/org/apache/solr/bench/DockMakerTest.java | 3 +--
4 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/gradle/defaults-java.gradle b/gradle/defaults-java.gradle
index 9e1b67c..038b602 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.gradle
index bbee655..4965182 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 a
diff --git a/solr/benchmark/build.gradle b/solr/benchmark/build.gradle
index 50bfd1b..a2188b4 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.java
index 5351fce..a17c5aa 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 {
@Before
public void setup() {
- System.setProperty("randomSeed", Long.toString(new Random().nextLong()));
+ System.setProperty("randomSeed", Long.toString(random().nextLong()));
}
@Test
