Skip to content

[JENKINS-33596] Delete more of UDPBroadcastThread & DNSMultiCast #5720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timja merged 9 commits into from
Sep 28, 2021
Merged

[JENKINS-33596] Delete more of UDPBroadcastThread & DNSMultiCast #5720

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb041df
[JENKINS-33596] Fully delete `UDPBroadcastThread` & `DNSMultiCast`
jglick Sep 10, 2021
1b515b2
Will need https://github.com/jenkinsci/jenkins-test-harness/pull/330
jglick Sep 10, 2021
ac0979b
https://github.com/jenkinsci/jenkins-test-harness/pull/330 released i…
jglick Sep 10, 2021
d908a3f
Merge branch 'master' of https://github.com/jenkinsci/jenkins into re…
jglick Sep 10, 2021
ff6601a
Try to restore binary compat for tools calling `hudson.DNSMultiCast.d…
jglick Sep 10, 2021
a6bc646
Merge branch 'master' into removeMulticast-redux
timja Sep 26, 2021
9959f3b
Merge branch 'master' of https://github.com/jenkinsci/jenkins into re…
jglick Sep 27, 2021
7b0cede
Adjusted tests to change in wording of exception message from Jetty
jglick Sep 27, 2021
711f3ae
Merge branch 'removeMulticast-redux' of https://github.com/jglick/jen…
jglick Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions core/src/main/java/hudson/DNSMultiCast.java
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions core/src/main/java/hudson/UDPBroadcastThread.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/src/main/java/jenkins/model/Jenkins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,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
})
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/jenkins/util/SystemProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,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
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ THE SOFTWARE.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>1589.vc23fca066d5c</version>
<version>1626.v46b0925e70db</version>
Copy link
Member

@timja timja Sep 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the test failures related to updating this?

Copy link
Member

@timja timja Sep 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any idea why dependabot isn't updating this?

updater | INFO <job_213087289> Checking if org.jenkins-ci.main:jenkins-test-harness 1589.vc23fca066d5c needs updating
  proxy | 2021/09/26 19:10:19 [146] GET https://repo.jenkins-ci.org:443/public/org/jenkins-ci/jenkins/1.67/jenkins-1.67.pom
  proxy | 2021/09/26 19:10:19 [146] 200 https://repo.jenkins-ci.org:443/public/org/jenkins-ci/jenkins/1.67/jenkins-1.67.pom
  proxy | 2021/09/26 19:10:19 [148] GET https://repo.jenkins-ci.org:443/public/org/jenkins-ci/main/jenkins-test-harness/maven-metadata.xml
  proxy | 2021/09/26 19:10:19 [148] 200 https://repo.jenkins-ci.org:443/public/org/jenkins-ci/main/jenkins-test-harness/maven-metadata.xml
  proxy | 2021/09/26 19:10:19 [150] GET https://repo.maven.apache.org:443/maven2/org/jenkins-ci/main/jenkins-test-harness/maven-metadata.xml
  proxy | 2021/09/26 19:10:19 [150] 404 https://repo.maven.apache.org:443/maven2/org/jenkins-ci/main/jenkins-test-harness/maven-metadata.xml
  proxy | 2021/09/26 19:10:19 [152] HEAD https://repo.jenkins-ci.org:443/public/org/jenkins-ci/main/jenkins-test-harness/1589.vc23fca066d5c/jenkins-test-harness-1589.vc23fca066d5c.jar
  proxy | 2021/09/26 19:10:19 [152] 200 https://repo.jenkins-ci.org:443/public/org/jenkins-ci/main/jenkins-test-harness/1589.vc23fca066d5c/jenkins-test-harness-1589.vc23fca066d5c.jar
updater | INFO <job_213087289> Latest version is 1589.vc23fca066d5c

Copy link
Member Author

@jglick jglick Sep 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea offhand.

<scope>test</scope>
<exclusions>
<exclusion>
Expand Down