Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

LUCENE-9650: errorprone plugin doesn't work on jdk16. A different workaround that keeps the dependency.

Dawid Weiss8c1ecda45a36
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index edcbaed9fc6..3ed0bf31847 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -15,21 +15,37 @@
* limitations under the License.
*/
-def includeErrorProne = rootProject.runtimeJavaVersion <= JavaVersion.VERSION_15;
-if (!includeErrorProne) {
- logger.warn("WARNING: errorprone disabled (won't work with JDK ${rootProject.runtimeJavaVersion})")
+def skipErrorProne = rootProject.runtimeJavaVersion > JavaVersion.VERSION_15;
+if (skipErrorProne) {
+ configure(rootProject) {
+ task errorProneSkipped() {
+ doFirst {
+ logger.warn("WARNING: errorprone disabled (won't work with JDK ${rootProject.runtimeJavaVersion})")
+ }
+ }
+ }
}
allprojects { prj ->
plugins.withType(JavaPlugin) {
- prj.apply plugin: 'net.ltgt.errorprone'
+ // LUCENE-9650: Errorprone on master/gradle does not work with JDK-16+
+ // this is a hack to keep the dependency (so that palantir's version check doesn't complain)
+ // but don't include the plugin (which fails on JDK16+).
+ if (skipErrorProne) {
+ tasks.withType(JavaCompile) { task -> task.dependsOn ":errorProneSkipped" }
+ configurations {
+ errorprone
+ }
+ dependencies {
+ errorprone("com.google.errorprone:error_prone_core")
+ }
+ } else {
+ prj.apply plugin: 'net.ltgt.errorprone'
- dependencies {
- errorprone("com.google.errorprone:error_prone_core")
- }
+ dependencies {
+ errorprone("com.google.errorprone:error_prone_core")
+ }
- // LUCENE-9650: Errorprone on master/gradle no longer works with JDK-16
- if (includeErrorProne) {
tasks.withType(JavaCompile) { task ->
options.errorprone.disableWarningsInGeneratedCode = true
options.errorprone.errorproneArgs = [