jenkinsci · timja · Sep 28, 2021 · Sep 10, 2021 · Sep 10, 2021 · Sep 10, 2021
diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java
@@ -1,31 +1,15 @@
 package hudson;
 
-import static hudson.init.InitMilestone.COMPLETED;
-
-import hudson.init.Initializer;
-import java.util.logging.Logger;
-import jenkins.util.SystemProperties;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
- * Registers a DNS multi-cast service-discovery support.
- *
- * @author Kohsuke Kawaguchi
- * @deprecated No longer does anything.
+ * @deprecated No longer does anything. Only here to prevent errors from old versions of tools like {@code JenkinsRule}.
  */
 @Deprecated
 @Restricted(NoExternalUse.class)
 public class DNSMultiCast {
-    private static final Logger LOGGER = Logger.getLogger(DNSMultiCast.class.getName());
-
-    public static boolean disabled = SystemProperties.getBoolean(DNSMultiCast.class.getName()+".disabled", true);
 
-    @Initializer(before=COMPLETED)
-    public static void warn() {
-        if (!disabled) {
-            LOGGER.warning("DNS multicast capability has been removed from Jenkins. More information: https://www.jenkins.io/redirect/dns-multicast");
-        }
-    }
+    public static boolean disabled = true;
 
 }
diff --git a/core/src/main/java/hudson/UDPBroadcastThread.java b/core/src/main/java/hudson/UDPBroadcastThread.java
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -888,7 +888,6 @@ protected Jenkins(File root, ServletContext context) throws IOException, Interru
      *      If non-null, use existing plugin manager.  create a new one.
      */
     @SuppressFBWarnings({
-        "SC_START_IN_CTOR", // bug in FindBugs. It flags UDPBroadcastThread.start() call but that's for another class
         "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", // Trigger.timer
         "DM_EXIT" // Exit is wanted here
     })

diff --git a/core/src/main/java/jenkins/util/SystemProperties.java b/core/src/main/java/jenkins/util/SystemProperties.java
@@ -53,12 +53,12 @@
 /**
  * Centralizes calls to {@link System#getProperty(String)} and related calls.
  * This allows us to get values not just from environment variables but also from
- * the {@link ServletContext}, so properties like {@code hudson.DNSMultiCast.disabled}
+ * the {@link ServletContext}, so properties like {@code jenkins.whatever.Clazz.disabled}
  * can be set in {@code context.xml} and the app server's boot script does not
  * have to be changed.
  *
  * <p>This should be used to obtain hudson/jenkins "app"-level parameters
- * (e.g. {@code hudson.DNSMultiCast.disabled}), but not for system parameters
+ * (e.g. {@code jenkins.whatever.Clazz.disabled}), but not for system parameters
  * (e.g. {@code os.name}).
  *
  * <p>If you run multiple instances of Jenkins in the same virtual machine and wish

diff --git a/test/pom.xml b/test/pom.xml
@@ -81,7 +81,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1589.vc23fca066d5c</version>
+      <version>1626.v46b0925e70db</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java b/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java
@@ -69,7 +69,7 @@ public void pathInfo() throws Exception {
                     assertThat("error message using " + path, x.getResponse().getContentAsString(), containsString("No valid crumb was included in the request"));
                     break;
                 case 400: // from Jetty
-                    assertThat("error message using " + path, x.getResponse().getContentAsString(), containsString("Ambiguous path parameter in URI"));
+                    assertThat("error message using " + path, x.getResponse().getContentAsString(), containsString("Ambiguous path parameter"));
                     break;
                 default:
                     fail("unexpected error code");

diff --git a/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java b/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java
@@ -40,7 +40,7 @@ public void denySemicolonInRequestPathByDefault() throws Exception {
         assertThat(Foo.getInstance().baz, is(nullValue()));
         assertThat(response.getStatusCode(), is(HttpServletResponse.SC_BAD_REQUEST));
         // Actually served by Jetty; never even gets as far as SuspiciousRequestFilter.
-        assertThat(response.getContentAsString(), containsString("Ambiguous path parameter in URI"));
+        assertThat(response.getContentAsString(), containsString("Ambiguous path parameter"));
     }
 
     @Ignore("No longer passes Jetty")