Merge pull request #214 from basil/refresh

[JENKINS-75401] Adapt to jenkinsci/git-server-plugin#134

Author: jglick

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.8</version>
   </extension>
 </extensions>

pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.77</version>
+        <version>5.9</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -63,18 +63,26 @@
     </pluginRepositories>
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.414.3</jenkins.version>
+        <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+        <jenkins.baseline>2.479</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.414.x</artifactId>
-                <version>2718.v7e8a_d43b_3f0b_</version>
+                <artifactId>bom-${jenkins.baseline}.x</artifactId>
+                <version>4228.v0a_71308d905b_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!-- TODO until in BOM -->
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>git-server</artifactId>
+                <version>137.ve0060b_432302</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

src/main/java/org/jenkinsci/plugins/workflow/cps/global/GroovyShellDecoratorImpl.java

@@ -27,8 +27,8 @@ public GroovyShellDecorator forTrusted() {
             @Override
             public void configureShell(CpsFlowExecution context, GroovyShell shell) {
                 try {
-                    shell.getClassLoader().addURL(new File(repo.workspace,"src").toURI().toURL());
-                    shell.getClassLoader().addURL(new File(repo.workspace, UserDefinedGlobalVariableList.PREFIX).toURI().toURL());
+                    shell.getClassLoader().addURL(repo.workspace.resolve("src").toUri().toURL());
+                    shell.getClassLoader().addURL(repo.workspace.resolve(UserDefinedGlobalVariableList.PREFIX).toUri().toURL());
                 } catch (MalformedURLException e) {
                     throw new AssertionError(e);
                 }

src/main/java/org/jenkinsci/plugins/workflow/cps/global/UserDefinedGlobalVariableList.java

@@ -33,7 +33,7 @@ public class UserDefinedGlobalVariableList extends GlobalVariableSet {
      * Rebuilds the list of {@link UserDefinedGlobalVariable}s and update {@link ExtensionList} accordingly.
      */
     public synchronized void rebuild() {
-        File[] children = new File(repo.workspace, PREFIX).listFiles();
+        File[] children = repo.workspace.resolve(PREFIX).toFile().listFiles();
         if (children==null) children = new File[0];
 
         List<GlobalVariable> list = new ArrayList<GlobalVariable>();
@@ -43,7 +43,7 @@ public synchronized void rebuild() {
                 continue;
 
             String name = FilenameUtils.getBaseName(child.getName());
-            UserDefinedGlobalVariable uv = new UserDefinedGlobalVariable(name, new File(repo.workspace, PREFIX + "/" + name + ".txt"));
+            UserDefinedGlobalVariable uv = new UserDefinedGlobalVariable(name, repo.workspace.resolve(PREFIX).resolve(name + ".txt").toFile());
             list.add(uv);
         }
 

src/test/java/org/jenkinsci/plugins/workflow/cps/global/UserDefinedGlobalVariableListTest.java

@@ -52,7 +52,7 @@ public void rebuild() throws Exception {
         src.child("acme.groovy").write("// empty", "UTF-8");
         src.child("acme.txt").write("Plain\ntext<", "UTF-8");
 
-        UserDefinedGlobalVariable acme = new UserDefinedGlobalVariable("acme", new File(repo.workspace, PREFIX + "/acme.txt"));
+        UserDefinedGlobalVariable acme = new UserDefinedGlobalVariable("acme", repo.workspace.resolve(PREFIX).resolve("acme.txt").toFile());
 
         // this variable to become accessible once the new definition is pushed
         git.add().addFilepattern(".").call();

src/test/java/org/jenkinsci/plugins/workflow/cps/global/WorkflowLibRepositoryTest.java

@@ -49,7 +49,7 @@ public class WorkflowLibRepositoryTest {
     public void globalLib() throws Exception {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
-                File dir = new File(repo.workspace,"src/foo");
+                File dir = repo.workspace.resolve("src/foo").toFile();
                 dir.mkdirs();
 
                 FileUtils.write(new File(dir, "Foo.groovy"),
@@ -106,7 +106,7 @@ public void globalLib() throws Exception {
     public void userDefinedGlobalVariable() throws Exception {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
-                File vars = new File(repo.workspace, UserDefinedGlobalVariableList.PREFIX);
+                File vars = repo.workspace.resolve(UserDefinedGlobalVariableList.PREFIX).toFile();
                 vars.mkdirs();
                 FileUtils.writeStringToFile(new File(vars, "acmeVar.groovy"), StringUtils.join(Arrays.asList(
                         "def hello(name) {echo \"Hello ${name}\"}",
@@ -159,7 +159,7 @@ public void userDefinedGlobalVariable() throws Exception {
     @Test public void restartGlobalVar() {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
-                File vars = new File(repo.workspace, UserDefinedGlobalVariableList.PREFIX);
+                File vars = repo.workspace.resolve(UserDefinedGlobalVariableList.PREFIX).toFile();
                 vars.mkdirs();
                 FileUtils.writeStringToFile(new File(vars, "block.groovy"), "def call(body) {node {body()}}");
                 uvl.rebuild();
@@ -186,7 +186,7 @@ public void userDefinedGlobalVariable() throws Exception {
             @Override public void evaluate() throws Throwable {
                 File f = new File(jenkins.getRootDir(), "f");   // marker file to write from Pipeline Script
 
-                FileUtils.write(new File(new File(repo.workspace, "src/pkg"), "Privileged.groovy"),
+                FileUtils.write(repo.workspace.resolve("src/pkg").resolve("Privileged.groovy").toFile(),
                     "package pkg\n" +
                     "class Privileged implements Serializable {\n" +
                     "  void write(String content) {\n" +
@@ -196,7 +196,7 @@ public void userDefinedGlobalVariable() throws Exception {
                     "    body()\n" +
                     "  }\n" +
                     "}");
-                FileUtils.write(new File(new File(repo.workspace, UserDefinedGlobalVariableList.PREFIX), "record.groovy"),
+                FileUtils.write(repo.workspace.resolve(UserDefinedGlobalVariableList.PREFIX).resolve("record.groovy").toFile(),
                     "def call() {new pkg.Privileged().write(jenkins.model.Jenkins.instance.systemMessage)}");
                 WorkflowJob p = jenkins.createProject(WorkflowJob.class, "p");