Merge branch 'master' into base.view

mawinter69 · web-flow · commit 8628d932e956 · 2025-08-10T22:02:10.000+01:00
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.8</version>
+    <version>1.10</version>
   </extension>
 </extensions>
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.17</version>
+    <version>5.18</version>
     <relativePath/>
   </parent>
 
@@ -69,7 +69,7 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.baseline>2.504</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.1</jenkins.version>
 
     <hpi.compatibleSinceVersion>2.0.0</hpi.compatibleSinceVersion>
@@ -81,7 +81,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3893.v213a_42768d35</version>
+        <version>5043.v855ff4819a_0f</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -101,6 +101,10 @@
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>caffeine-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>ionicons-api</artifactId>
diff --git a/src/main/java/jenkins/branch/BranchEventCause.java b/src/main/java/jenkins/branch/BranchEventCause.java
@@ -32,7 +32,7 @@
 import hudson.model.Run;
 import java.util.Date;
 import jenkins.scm.api.SCMEvent;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 
diff --git a/src/main/java/jenkins/branch/DescriptionColumn.java b/src/main/java/jenkins/branch/DescriptionColumn.java
@@ -36,7 +36,7 @@
 import java.io.IOException;
 import jenkins.model.Jenkins;
 import jenkins.scm.api.metadata.ObjectMetadataAction;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/jenkins/branch/ItemColumn.java b/src/main/java/jenkins/branch/ItemColumn.java
@@ -38,7 +38,7 @@
 import hudson.views.ListViewColumnDescriptor;
 import jenkins.scm.api.metadata.ObjectMetadataAction;
 import jenkins.scm.api.metadata.PrimaryInstanceMetadataAction;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/jenkins/branch/MetadataActionFolderIcon.java b/src/main/java/jenkins/branch/MetadataActionFolderIcon.java
@@ -71,7 +71,7 @@ protected void setOwner(AbstractFolder<?> folder) {
     public String getIconClassName() {
         if (owner != null) {
             if (owner.isDisabled()) {
-                return "icon-folder-disabled";
+                return "symbol-folder-disabled-outline plugin-branch-api";
             }
             AvatarMetadataAction action = owner.getAction(AvatarMetadataAction.class);
             if (action != null) {
@@ -100,11 +100,9 @@ public String getIconClassName() {
                 }
                 // otherwise the metadata doesn't want to control the icon, so fall back to the descriptor's default
             }
-            if (owner instanceof IconSpec) {
-                String result = ((IconSpec) owner).getIconClassName();
-                if (result != null) {
-                    return result;
-                }
+            String result = ((IconSpec) owner).getIconClassName();
+            if (result != null) {
+                return result;
             }
             return owner.getDescriptor().getIconClassName();
         }
diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -24,7 +24,6 @@
 
 package jenkins.branch;
 
-import com.cloudbees.hudson.plugins.folder.ChildNameGenerator;
 import com.cloudbees.hudson.plugins.folder.FolderIcon;
 import com.cloudbees.hudson.plugins.folder.computed.ChildObserver;
 import com.cloudbees.hudson.plugins.folder.computed.ComputedFolder;
@@ -108,7 +107,7 @@
 import jenkins.util.SystemProperties;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkins.ui.icon.IconSpec;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -2092,21 +2091,16 @@ private void observeExisting(@NonNull SCMHead head, @NonNull SCMRevision revisio
         }
 
         private void observeNew(@NonNull SCMHead head, @NonNull SCMRevision revision, @NonNull Branch branch, String rawName, String encodedName, Action[] revisionActions) {
-            P project;
             if (!observer.mayCreate(encodedName)) {
                 listener.getLogger().println("Ignoring duplicate branch project " + rawName);
                 return;
             }
-            try (ChildNameGenerator.Trace trace = ChildNameGenerator.beforeCreateItem(
-                MultiBranchProject.this, encodedName, branch.getName()
-            )) {
-                if (getItem(encodedName) != null) {
-                    throw new IllegalStateException(
-                        "JENKINS-42511: attempted to redundantly create " + encodedName + " in "
-                            + MultiBranchProject.this);
-                }
-                project = _factory.newInstance(branch);
+            if (getItem(encodedName) != null) {
+                throw new IllegalStateException(
+                    "JENKINS-42511: attempted to redundantly create " + encodedName + " in "
+                        + MultiBranchProject.this);
             }
+            P project = _factory.newInstance(branch);
             if (!project.getName().equals(encodedName)) {
                 throw new IllegalStateException(
                     "Name of created project " + project + " did not match expected " + encodedName);
diff --git a/src/main/java/jenkins/branch/MultiBranchProjectDescriptor.java b/src/main/java/jenkins/branch/MultiBranchProjectDescriptor.java
@@ -34,7 +34,6 @@
 import hudson.model.Run;
 import hudson.model.TopLevelItem;
 import hudson.model.TopLevelItemDescriptor;
-import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -231,9 +230,9 @@ public String itemNameFromItem(@NonNull MultiBranchProject<P,R> parent, @NonNull
             if (factory.isProject(item)) {
                 return NameEncoder.encode(factory.getBranch(item).getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameEncoder.encode(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameEncoder.encode(name);
             }
             return null;
         }
@@ -245,9 +244,9 @@ public String dirNameFromItem(@NonNull MultiBranchProject<P,R> parent, @NonNull
             if (factory.isProject(item)) {
                 return NameMangler.apply(factory.getBranch(item).getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameMangler.apply(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameMangler.apply(name);
             }
             return null;
         }
@@ -263,12 +262,5 @@ public String itemNameFromLegacy(@NonNull MultiBranchProject<P, R> parent, @NonN
         public String dirNameFromLegacy(@NonNull MultiBranchProject<P, R> parent, @NonNull String legacyDirName) {
             return NameMangler.apply(NameEncoder.decode(legacyDirName));
         }
-
-        // TODO remove after it is removed in cloudbees-folder
-        public void recordLegacyName(MultiBranchProject<P, R> parent, P item, String legacyDirName) throws IOException {
-            // no-op because we already tracked the name in Branch.getName()
-        }
-
     }
-
 }
diff --git a/src/main/java/jenkins/branch/MultiBranchProjectDisplayNamingStrategy.java b/src/main/java/jenkins/branch/MultiBranchProjectDisplayNamingStrategy.java
@@ -29,7 +29,7 @@
 import org.jvnet.localizer.Localizable;
 
 import static java.lang.String.format;
-import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 
 /**
  * Possible Display naming strategies.
diff --git a/src/main/java/jenkins/branch/NameMangler.java b/src/main/java/jenkins/branch/NameMangler.java
@@ -27,7 +27,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Mangles names that are not nice so that they are safe to use on filesystem.
diff --git a/src/main/java/jenkins/branch/NamedExceptionsBranchPropertyStrategy.java b/src/main/java/jenkins/branch/NamedExceptionsBranchPropertyStrategy.java
@@ -30,7 +30,7 @@
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
 import jenkins.scm.api.SCMHead;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/jenkins/branch/OrganizationFolder.java b/src/main/java/jenkins/branch/OrganizationFolder.java
@@ -95,7 +95,7 @@
 
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkins.ui.icon.Icon;
 import org.jenkins.ui.icon.IconSet;
 import org.jenkins.ui.icon.IconSpec;
@@ -852,9 +852,9 @@ public String itemNameFromItem(@NonNull OrganizationFolder parent, @NonNull Mult
             if (property != null) {
                 return NameEncoder.encode(property.getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameEncoder.encode(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameEncoder.encode(name);
             }
             return null;
         }
@@ -866,9 +866,9 @@ public String dirNameFromItem(@NonNull OrganizationFolder parent, @NonNull Multi
             if (property != null) {
                 return NameMangler.apply(property.getName());
             }
-            String idealName = idealNameFromItem(parent, item);
-            if (idealName != null) {
-                return NameMangler.apply(idealName);
+            String name = item.getName();
+            if (name != null) {
+                return NameMangler.apply(name);
             }
             return null;
         }
@@ -884,12 +884,6 @@ public String itemNameFromLegacy(@NonNull OrganizationFolder parent, @NonNull St
         public String dirNameFromLegacy(@NonNull OrganizationFolder parent, @NonNull String legacyDirName) {
             return NameMangler.apply(NameEncoder.decode(legacyDirName));
         }
-
-        // TODO remove after it is removed in cloudbees-folder
-        public void recordLegacyName(OrganizationFolder parent, MultiBranchProject<?, ?> item, String legacyDirName)
-                throws IOException {
-            item.addProperty(new ProjectNameProperty(legacyDirName));
-        }
     }
 
     /**
@@ -1436,19 +1430,14 @@ private void completeNew(MultiBranchProjectFactory factory, Map<String, Object>
                                 .println("Ignoring duplicate child " + projectName + " named " + folderName);
                         return;
                     }
-                    MultiBranchProject<?, ?> project;
-                    try (ChildNameGenerator.Trace trace = ChildNameGenerator.beforeCreateItem(
-                            OrganizationFolder.this, folderName, projectName
-                    )) {
-                        if (getItem(folderName) != null) {
-                            throw new IllegalStateException(
-                                    "JENKINS-42511: attempted to redundantly create " + folderName + " in "
-                                            + OrganizationFolder.this);
-                        }
-                        project = factory.createNewProject(
-                                OrganizationFolder.this, folderName, sources, attributes, listener
-                        );
+                    if (getItem(folderName) != null) {
+                        throw new IllegalStateException(
+                                "JENKINS-42511: attempted to redundantly create " + folderName + " in "
+                                        + OrganizationFolder.this);
                     }
+                    MultiBranchProject<?, ?> project = factory.createNewProject(
+                            OrganizationFolder.this, folderName, sources, attributes, listener
+                    );
                     BulkChange bc = new BulkChange(project);
                     try {
                         if (!projectName.equals(folderName)) {
diff --git a/src/main/java/jenkins/branch/WorkspaceLocatorImpl.java b/src/main/java/jenkins/branch/WorkspaceLocatorImpl.java
@@ -84,7 +84,7 @@
 import jenkins.util.ErrorLoggingExecutorService;
 import jenkins.util.SystemProperties;
 import org.apache.commons.codec.binary.Base32;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
diff --git a/src/main/resources/images/symbols/folder-disabled-outline.svg b/src/main/resources/images/symbols/folder-disabled-outline.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="ionicon" viewBox="0 0 512 512">
+  <path d="M440 432H72a40 40 0 01-40-40V120a40 40 0 0140-40h75.89a40 40 0 0122.19 6.72l27.84 18.56a40 40 0 0022.19 6.72H440a40 40 0 0140 40v240a40 40 0 01-40 40zM32 192h448" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/>
+  <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M472 472L40 40"/>  
+</svg>
diff --git a/src/test/java/integration/MigrationTest.java b/src/test/java/integration/MigrationTest.java
@@ -40,7 +40,7 @@
 import jenkins.scm.impl.mock.MockSCMDiscoverBranches;
 import jenkins.scm.impl.mock.MockSCMNavigator;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
diff --git a/src/test/java/jenkins/branch/WorkspaceLocatorImplTest.java b/src/test/java/jenkins/branch/WorkspaceLocatorImplTest.java
@@ -24,7 +24,10 @@
 
 package jenkins.branch;
 
+import static org.junit.Assume.assumeFalse;
+
 import hudson.FilePath;
+import hudson.Functions;
 import hudson.model.FreeStyleProject;
 import hudson.scm.NullSCM;
 import hudson.slaves.DumbSlave;
@@ -215,6 +218,7 @@ public void delete() throws Exception {
     @Issue("JENKINS-2111")
     @Test
     public void deleteOffline() throws Exception {
+        assumeFalse("TODO: Fails on Windows CI runs", Functions.isWindows() && System.getenv("CI") != null);
         WorkspaceLocatorImpl.MODE = WorkspaceLocatorImpl.Mode.ENABLED;
         FreeStyleProject p = r.createFreeStyleProject("a'b");
         DumbSlave s = r.createSlave("remote", null, null);
@@ -227,11 +231,7 @@ public void deleteOffline() throws Exception {
         s = (DumbSlave) r.jenkins.getNode("remote");
         s.toComputer().connect(true).get();
         assertEquals(Collections.emptyList(), s.getWorkspaceRoot().listDirectories());
-        try {
-            s.toComputer().getLogText().writeLogTo(0, System.out);
-        } catch (IOException x) { // observed in Windows CI: FileNotFoundException: …\logs\slaves\remote\slave.log
-            x.printStackTrace();
-        }
+        s.toComputer().getLogText().writeLogTo(0, System.out);
     }
 
     @Issue({"JENKINS-2111", "JENKINS-58177"})

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected void setOwner(AbstractFolder<?> folder) {`
`71`	`71`	`public String getIconClassName() {`
`72`	`72`	`if (owner != null) {`
`73`	`73`	`if (owner.isDisabled()) {`
`74`		`- return "icon-folder-disabled";`
	`74`	`+ return "symbol-folder-disabled-outline plugin-branch-api";`
`75`	`75`	`}`
`76`	`76`	`AvatarMetadataAction action = owner.getAction(AvatarMetadataAction.class);`
`77`	`77`	`if (action != null) {`
`@@ -100,11 +100,9 @@ public String getIconClassName() {`
`100`	`100`	`}`
`101`	`101`	`// otherwise the metadata doesn't want to control the icon, so fall back to the descriptor's default`
`102`	`102`	`}`
`103`		`- if (owner instanceof IconSpec) {`
`104`		`- String result = ((IconSpec) owner).getIconClassName();`
`105`		`- if (result != null) {`
`106`		`- return result;`
`107`		`- }`
	`103`	`+ String result = ((IconSpec) owner).getIconClassName();`
	`104`	`+ if (result != null) {`
	`105`	`+ return result;`
`108`	`106`	`}`
`109`	`107`	`return owner.getDescriptor().getIconClassName();`
`110`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@`
`34`	`34`	`import hudson.model.Run;`
`35`	`35`	`import hudson.model.TopLevelItem;`
`36`	`36`	`import hudson.model.TopLevelItemDescriptor;`
`37`		`-import java.io.IOException;`
`38`	`37`	`import java.lang.reflect.ParameterizedType;`
`39`	`38`	`import java.lang.reflect.Type;`
`40`	`39`	`import java.util.ArrayList;`
`@@ -231,9 +230,9 @@ public String itemNameFromItem(@NonNull MultiBranchProject<P,R> parent, @NonNull`
`231`	`230`	`if (factory.isProject(item)) {`
`232`	`231`	`return NameEncoder.encode(factory.getBranch(item).getName());`
`233`	`232`	`}`
`234`		`- String idealName = idealNameFromItem(parent, item);`
`235`		`- if (idealName != null) {`
`236`		`- return NameEncoder.encode(idealName);`
	`233`	`+ String name = item.getName();`
	`234`	`+ if (name != null) {`
	`235`	`+ return NameEncoder.encode(name);`
`237`	`236`	`}`
`238`	`237`	`return null;`
`239`	`238`	`}`
`@@ -245,9 +244,9 @@ public String dirNameFromItem(@NonNull MultiBranchProject<P,R> parent, @NonNull`
`245`	`244`	`if (factory.isProject(item)) {`
`246`	`245`	`return NameMangler.apply(factory.getBranch(item).getName());`
`247`	`246`	`}`
`248`		`- String idealName = idealNameFromItem(parent, item);`
`249`		`- if (idealName != null) {`
`250`		`- return NameMangler.apply(idealName);`
	`247`	`+ String name = item.getName();`
	`248`	`+ if (name != null) {`
	`249`	`+ return NameMangler.apply(name);`
`251`	`250`	`}`
`252`	`251`	`return null;`
`253`	`252`	`}`
`@@ -263,12 +262,5 @@ public String itemNameFromLegacy(@NonNull MultiBranchProject<P, R> parent, @NonN`
`263`	`262`	`public String dirNameFromLegacy(@NonNull MultiBranchProject<P, R> parent, @NonNull String legacyDirName) {`
`264`	`263`	`return NameMangler.apply(NameEncoder.decode(legacyDirName));`
`265`	`264`	`}`
`266`		`-`
`267`		`- // TODO remove after it is removed in cloudbees-folder`
`268`		`- public void recordLegacyName(MultiBranchProject<P, R> parent, P item, String legacyDirName) throws IOException {`
`269`		`- // no-op because we already tracked the name in Branch.getName()`
`270`		`- }`
`271`		`-`
`272`	`265`	`}`
`273`		`-`
`274`	`266`	`}`