Rename TolerateBuilderClassesOnImageClasspath to AllowDreprecatedBuilderClassesOnImageClasspath

Author: Christian Wimmer

java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py

@@ -371,7 +371,7 @@ def extra_image_build_argument(self, benchmark, args):
                 '-H:EnableURLProtocols=http',
                 '-H:NativeLinkerOption=-no-pie',
                 '-H:-UseServiceLoaderFeature',
-                '-H:+TolerateBuilderClassesOnImageClasspath', # needs to be removed once GR-41746 is fixed
+                '-H:+AllowDeprecatedBuilderClassesOnImageClasspath', # needs to be removed once GR-41746 is fixed
                 '--add-exports=org.graalvm.sdk/org.graalvm.nativeimage.impl=ALL-UNNAMED',
                 '--add-exports=org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UNNAMED',
                 '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED',

substratevm/CHANGELOG.md

@@ -3,7 +3,7 @@
 This changelog summarizes major changes to GraalVM Native Image.
 
 ## Version 23.0.0
-* (GR-40187) Report invalid use of SVM specific classes on image class- or module-path as error. As a temporary workaround, -H:+TolerateBuilderClassesOnImageClasspath allows turning the error into a warning.
+* (GR-40187) Report invalid use of SVM specific classes on image class- or module-path as error. As a temporary workaround, `-H:+AllowDeprecatedBuilderClassesOnImageClasspath` allows turning the error into a warning.
 * (GR-41196) Provide `.debug.svm.imagebuild.*` sections that contain build options and properties used in the build of the image.
 * (GR-41978) Disallow `--initialize-at-build-time` without arguments. As a temporary workaround, `-H:+AllowDeprecatedInitializeAllClassesAtBuildTime` allows turning this error into a warning.
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -858,6 +858,6 @@ public Boolean getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> v
     };
 
     @Option(help = "Instead of abort, only warn if image builder classes are found on the image class-path.", type = Debug)//
-    public static final HostedOptionKey<Boolean> TolerateBuilderClassesOnImageClasspath = new HostedOptionKey<>(false);
+    public static final HostedOptionKey<Boolean> AllowDeprecatedBuilderClassesOnImageClasspath = new HostedOptionKey<>(false);
 
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java

@@ -819,7 +819,7 @@ public void reportBuilderClassesInApplication() {
             var destinationMap = builderURILocations.contains(classesEntries.getKey()) ? builderClasses : applicationClasses;
             destinationMap.put(classesEntries.getKey(), classesEntries.getValue());
         }
-        boolean tolerateViolations = SubstrateOptions.TolerateBuilderClassesOnImageClasspath.getValue(parsedHostedOptions);
+        boolean tolerateViolations = SubstrateOptions.AllowDeprecatedBuilderClassesOnImageClasspath.getValue(parsedHostedOptions);
         MapCursor<URI, EconomicSet<String>> applicationClassesEntries = applicationClasses.getEntries();
         while (applicationClassesEntries.advance()) {
             var applicationClassContainer = applicationClassesEntries.getKey();
@@ -834,9 +834,9 @@ public void reportBuilderClassesInApplication() {
                             String errorMessage = String.join(" ", message,
                                             "This can be caused by a fat-jar that illegally includes svm.jar (or graal-sdk.jar) due to its build-time dependency on it.",
                                             "As a temporary workaround, %s allows turning this error into a warning.");
-                            throw UserError.abort(errorMessage, SubstrateOptionsParser.commandArgument(SubstrateOptions.TolerateBuilderClassesOnImageClasspath, "+"));
+                            throw UserError.abort(errorMessage, SubstrateOptionsParser.commandArgument(SubstrateOptions.AllowDeprecatedBuilderClassesOnImageClasspath, "+"));
                         } else {
-                            System.out.println("Warning: " + message);
+                            System.err.println("Warning: " + message);
                         }
                     }
                 }