From 354a054964af8c83f7ae4c5af3c06c034537e37f Mon Sep 17 00:00:00 2001
From: Jeff Thompson <jeffret.g@gmail.com>
Date: Thu, 23 Jan 2020 15:56:26 -0700
Subject: [PATCH] Don't use public static boolean property.

---
 core/pom.xml                                           |  2 +-
 core/src/main/java/jenkins/model/Jenkins.java          |  7 ++-----
 .../jenkins/security/StackTraceSuppressionTest.java    | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 05ed45ef8b..828b3a54f2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <staplerFork>true</staplerFork>
-    <stapler.version>1.259-rc1393.7b6d39453a92</stapler.version>
+    <stapler.version>1.259-rc1394.3f695d5ed2a7</stapler.version>
     <spring.version>2.5.6.SEC03</spring.version>
     <groovy.version>2.4.12</groovy.version>
   </properties>
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 42044ab4be..439f374098 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -5133,10 +5133,10 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         }
     }
 
-    @Restricted(Beta.class)
+    @Restricted(NoExternalUse.class)
     public boolean shouldShowStackTrace() {
         // Used by oops.jelly
-        return SHOW_STACK_TRACE;
+        return Boolean.getBoolean(Jenkins.class.getName() + ".SHOW_STACK_TRACE");
     }
 
     /**
@@ -5226,9 +5226,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     static final String WORKSPACES_DIR_PROP = Jenkins.class.getName() + ".workspacesDir";
 
 
-    @Restricted(Beta.class)
-    public static boolean SHOW_STACK_TRACE = Boolean.getBoolean(Jenkins.class.getName() + ".SHOW_STACK_TRACE");
-
     /**
      * Automatically try to launch an agent when Jenkins is initialized or a new agent computer is created.
      */
diff --git a/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java b/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java
index 22ede97258..a3bb658f4a 100644
--- a/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java
+++ b/test/src/test/java/jenkins/security/StackTraceSuppressionTest.java
@@ -50,8 +50,8 @@ public class StackTraceSuppressionTest {
 
     @Before
     public void setup() {
-        Jenkins.SHOW_STACK_TRACE = false;
-        HttpResponses.SHOW_STACK_TRACE = false;
+        System.setProperty("jenkins.model.Jenkins.SHOW_STACK_TRACE", "false");
+        System.setProperty("org.kohsuke.stapler.HttpResponses.SHOW_STACK_TRACE", "false");
     }
 
     @Test
@@ -107,7 +107,7 @@ public class StackTraceSuppressionTest {
            This test is based upon Stapler throwing an exception for this broken request.
            If Stapler is improved to better handle this error, this test may erroneously fail. */
         JenkinsRule.WebClient wc = j.createWebClient();
-        HttpResponses.SHOW_STACK_TRACE = true;
+        System.setProperty("org.kohsuke.stapler.HttpResponses.SHOW_STACK_TRACE", "true");
 
         wc.setThrowExceptionOnFailingStatusCode(false);
         Page page = wc.goTo("adjuncts/40331c1bldu3i%3b//'%3b//\"%3b//%25>%3f>uezm3<script>alert(1)</script>foo/org/kohsuke/stapler/jquery/jquery.full.js", "text/plain");
@@ -142,7 +142,7 @@ public class StackTraceSuppressionTest {
            If Jenkins is improved to better handle this error, this test may erroneously fail. */
         FreeStyleProject projectError = createBrokenProject();
 
-        Jenkins.SHOW_STACK_TRACE = true;
+        System.setProperty("jenkins.model.Jenkins.SHOW_STACK_TRACE", "true");
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.setThrowExceptionOnFailingStatusCode(false);
         HtmlPage page = wc.goTo("job/" + projectError.getName() + "/configure");
@@ -174,7 +174,7 @@ public class StackTraceSuppressionTest {
     public void exceptionEndpointShowsTrace() throws Exception {
         /* This test is based upon a testing endpoint that really shouldn't exist in production code.
            If Jenkins is improved to eliminate this endpoint, this test may erroneously fail. */
-        Jenkins.SHOW_STACK_TRACE = true;
+        System.setProperty("jenkins.model.Jenkins.SHOW_STACK_TRACE", "true");
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.setThrowExceptionOnFailingStatusCode(false);
         HtmlPage page = wc.goTo("exception");
-- 
GitLab