Merge branch 'master' into JENKINS-66898

Author: mawinter69

pom.xml

@@ -63,14 +63,14 @@
     </pluginRepositories>
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.303.1</jenkins.version>
+        <jenkins.version>2.289.1</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.303.x</artifactId>
+                <artifactId>bom-2.289.x</artifactId>
                 <version>1008.vb9e22885c9cf</version>
                 <scope>import</scope>
                 <type>pom</type>

src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java

@@ -50,6 +50,7 @@
 import java.util.logging.Logger;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution;
 import org.jenkinsci.plugins.workflow.cps.GlobalVariable;
@@ -377,7 +378,7 @@ private static String readResource(FilePath file, @CheckForNull String encoding)
                                     continue;
                                 }
                                 for (FilePath groovy : root.list("**/*.groovy")) {
-                                    String clazz = groovy.getRemote().replaceFirst("^\\Q" + root.getRemote() + "\\E[/\\\\](.+)[.]groovy", "$1").replace('/', '.').replace('\\', '.');
+                                    String clazz = className(groovy.getRemote(), root.getRemote());
                                     scripts.put(clazz, groovy.readToString()); // TODO no idea what encoding the Groovy compiler uses
                                 }
                             }
@@ -390,6 +391,10 @@ private static String readResource(FilePath file, @CheckForNull String encoding)
             return scripts;
         }
 
+        static String className(String groovy, String root) {
+            return groovy.replaceFirst("^" + Pattern.quote(root) + "[/\\\\](.+)[.]groovy", "$1").replace('/', '.').replace('\\', '.');
+        }
+
     }
 
     @Extension public static class Copier extends FlowCopier.ByRun {

src/test/java/org/jenkinsci/plugins/workflow/libs/LibraryAdderTest.java

@@ -31,13 +31,10 @@
 import hudson.model.queue.QueueTaskFuture;
 import hudson.plugins.git.BranchSpec;
 import hudson.plugins.git.GitSCM;
-import hudson.plugins.git.SubmoduleConfig;
 import hudson.plugins.git.UserRemoteConfig;
-import hudson.plugins.git.extensions.GitSCMExtension;
-import hudson.slaves.WorkspaceList;
-import hudson.scm.SubversionSCM;
 import hudson.scm.ChangeLogSet;
-
+import hudson.scm.SubversionSCM;
+import hudson.slaves.WorkspaceList;
 import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,25 +45,28 @@
 import jenkins.plugins.git.GitSampleRepoRule;
 import jenkins.scm.impl.subversion.SubversionSCMSource;
 import jenkins.scm.impl.subversion.SubversionSampleRepoRule;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.cps.GlobalVariable;
 import org.jenkinsci.plugins.workflow.cps.global.GrapeTest;
 import org.jenkinsci.plugins.workflow.cps.global.UserDefinedGlobalVariable;
 import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import org.junit.ClassRule;
-import org.junit.Test;
 import org.junit.Rule;
+import org.junit.Test;
 import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
+import org.jvnet.hudson.test.WithoutJenkins;
 import org.jvnet.hudson.test.recipes.LocalData;
 
-import static org.hamcrest.Matchers.nullValue;
-
 public class LibraryAdderTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
@@ -106,7 +106,7 @@ public class LibraryAdderTest {
             new SCMRetriever(
                     new GitSCM(Collections.singletonList(new UserRemoteConfig(sampleRepo.fileUrl(), null, null, null)),
                             Collections.singletonList(new BranchSpec("${library.stuff.version}")),
-                            false, Collections.<SubmoduleConfig>emptyList(), null, null, Collections.<GitSCMExtension>emptyList())));
+                            null, null, Collections.emptyList())));
         stuff.setDefaultVersion("master");
         stuff.setImplicit(true);
         GlobalLibraries.get().setLibraries(Collections.singletonList(stuff));
@@ -512,4 +512,13 @@ public void parallelBuildsDontInterfereWithExpiredCache() throws Throwable {
         r.assertLogContains("is due for a refresh after", r1);
         r.assertLogContains("Library library@master is cached. Copying from home.", r2);
     }
+
+    @Issue("JENKINS-68544")
+    @WithoutJenkins
+    @Test public void className() {
+        assertThat(LibraryAdder.LoadedLibraries.className("/path/to/lib/src/some/pkg/Type.groovy", "/path/to/lib/src"), is("some.pkg.Type"));
+        assertThat(LibraryAdder.LoadedLibraries.className("C:\\path\\to\\lib\\src\\some\\pkg\\Type.groovy", "C:\\path\\to\\lib\\src"), is("some.pkg.Type"));
+        assertThat(LibraryAdder.LoadedLibraries.className("C:\\path\\to\\Extra\\lib\\src\\some\\pkg\\Type.groovy", "C:\\path\\to\\Extra\\lib\\src"), is("some.pkg.Type"));
+    }
+
 }