From a68c30c71a4c3d08e71be9bdf8788aefcd3d4c1a Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 28 Sep 2026 11:33:21 -0600 Subject: [PATCH] Remove call to isDefaultWorkspaceDir - removed in 2.584 Jenkins 2.584 removes the isDefaultWorkspaceDir method. This is the only reference found by GitHub search in all of jenkinsci. Removed by pull request: * https://github.com/jenkinsci/jenkins/pull/27406 Detected by pull requests: * https://github.com/jenkinsci/jenkins/pull/27453 * https://github.com/jenkinsci/bom/pull/7496 Upgrades the parent pom because otherwise the plugin cannot be compiled with Jenkins 2.583 Testing done: * Confirmed compilation fails without this change: `mvn -Djenkins.version=2.584-rc38753.cd27cb_2e2b_98 verify` * Confirmed compilation succeeds and test passes with this change: `mvn -Djenkins.version=2.584-rc38753.cd27cb_2e2b_98 -Dtest=JenkinsBuildsAndWorkspacesDirectoriesTest verify` --- pom.xml | 2 +- .../model/JenkinsBuildsAndWorkspacesDirectoriesTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0988427d..9e02ac78 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ THE SOFTWARE. org.jenkins-ci.plugins plugin - 5.28 + 6.2236.v12dd4c483242 diff --git a/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java b/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java index 6f0a5a75..67a62a17 100644 --- a/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java +++ b/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java @@ -70,7 +70,6 @@ void testItemFullNameExpansion() throws Throwable { story.then(j -> { assertTrue(j.getInstance().isDefaultBuildDir()); - assertTrue(j.getInstance().isDefaultWorkspaceDir()); setBuildsDirProperty("${JENKINS_HOME}/test12251_builds/${ITEM_FULL_NAME}"); setWorkspacesDirProperty("${JENKINS_HOME}/test12251_ws/${ITEM_FULL_NAME}"); }); @@ -78,7 +77,6 @@ void testItemFullNameExpansion() throws Throwable { story.then(j -> { assertTrue(JenkinsBuildsAndWorkspacesDirectoriesTest.this.logWasFound("Changing builds directories from ")); assertFalse(j.getInstance().isDefaultBuildDir()); - assertFalse(j.getInstance().isDefaultWorkspaceDir()); // build a dummy project MavenModuleSet m = j.jenkins.createProject(MavenModuleSet.class, "p");