From 984a5084d3080d7f1ed14a6c44ae103c0a478c52 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Mon, 23 Aug 2021 13:16:59 +0000
Subject: [PATCH] Flip incompatible_disallow_resource_jars flag.

The resource_jars is not supported by java_common.compile function. In
order to rewrite java_library to Starlark the call needs to be extended or the
feature disabled. Because the migration is relatively simple I'm opting
to flip the flag and remove it.

RELNOTES[INC]: Flipped --incompatible_disallow_resource_jars (see #13221).
---
 .../com/google/devtools/build/lib/rules/java/JavaOptions.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index ac4a4b2e97160f..a86fa8ce7ee4bd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -477,7 +477,7 @@ public ImportDepsCheckingLevelConverter() {
 
   @Option(
       name = "incompatible_disallow_resource_jars",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.UNKNOWN},
       metadataTags = {