Modernization

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+# Maintain dependencies for your plugin
+- package-ecosystem: maven
+  directory: /
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 10
+  target-branch: master
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: monthly

.mvn/extensions.xml

@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.7</version>
+  </extension>
+</extensions>

.mvn/maven.config

@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals

Jenkinsfile

@@ -1,4 +1,9 @@
-#!/usr/bin/env groovy
-
-/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin()
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/ buildPlugin(
+  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  configurations: [
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
+])

modifications.patch

@@ -0,0 +1,26 @@
+diff --git a/pom.xml b/pom.xml
+index 08b78fc..5911846 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -1,9 +1,10 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+-    <parent>
++  <parent>
+     <groupId>org.jenkins-ci.plugins</groupId>
+     <artifactId>plugin</artifactId>
+-    <version>2.23</version>
++    <version>4.51</version>
++    <relativePath/>
+   </parent>
+
+   <artifactId>sectioned-view</artifactId>
+@@ -48,7 +49,7 @@
+   </pluginRepositories>
+
+   <properties>
+-    <jenkins.version>1.580.3</jenkins.version>
++    <jenkins.version>2.346.3</jenkins.version>
+     <java.version>6</java.version>
+     <findbugs.failOnError>false</findbugs.failOnError>
+   </properties>

pom.xml

@@ -1,15 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-    <parent>
+  <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.23</version>
+    <version>4.76</version>
+    <relativePath/>
   </parent>
 
   <artifactId>sectioned-view</artifactId>
   <packaging>hpi</packaging>
   <name>Sectioned View Plugin</name>
-  <version>1.27-SNAPSHOT</version>
+  <version>${revision}${changelist}</version>
   <url>http://wiki.jenkins-ci.org/display/JENKINS/Sectioned+View+Plugin</url>
   <developers>
     <developer>
@@ -28,11 +29,22 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-    <developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+    <url>https://github.com/${gitHubRepo}</url>
+    <tag>${scmTag}</tag>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.jenkins.tools.bom</groupId>
+        <artifactId>bom-2.401.x</artifactId>
+        <version>2582.v830625dd636c</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <repositories>
     <repository>
@@ -48,41 +60,51 @@
   </pluginRepositories>
 
   <properties>
-    <jenkins.version>1.580.3</jenkins.version>
-    <java.version>6</java.version>
+    <revision>1.26</revision>
+    <changelist>-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/sectioned-view-plugin</gitHubRepo>
+    <jenkins.version>2.401.3</jenkins.version>
     <findbugs.failOnError>false</findbugs.failOnError>
+    <spotbugs.effort>Max</spotbugs.effort>
+    <spotbugs.threshold>Low</spotbugs.threshold>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.10.19</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>1.2.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1.19</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <!-- brought in by io.jenkins.plugins:commons-lang3-api -->
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>antisamy-markup-formatter</artifactId>
-      <version>1.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <optional>true</optional>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>cloudbees-folder</artifactId>
-      <version>5.18</version>
     </dependency>
 
   </dependencies>

src/main/java/hudson/plugins/sectioned_view/FolderViewSection.java

@@ -103,8 +103,7 @@ public void addChildren(TopLevelItem item, Node node, int baseFolderLevel) {
     }
 
     private boolean filter(TopLevelItem item, int baseFolderLevel) {
-        boolean allow = true;
-        if (!(item instanceof Folder) & hideJobs) allow = false;
+        boolean allow = !(!(item instanceof Folder) & hideJobs);
         if (regexFilter != null && !regexFilter.isEmpty() && !regexFilterPattern.matcher(item.getName()).matches()) allow = false;
         if (folderLevels != null && item.getFullName().length() - item.getFullName().replace("/", "").length() >
                 (folderLevels + baseFolderLevel)) allow = false;

src/main/java/hudson/plugins/sectioned_view/ListViewSection.java

@@ -73,7 +73,8 @@ public static List<ListViewColumn> getDefaultColumns() {
             Descriptor<ListViewColumn> des = all.find(d);
             if (des  != null) {
                 try {
-                    r.add(des.newInstance(null, null));
+                    JSONObject json = new JSONObject();
+                    r.add(des.newInstance(null, json));
                 } catch (FormException e) {
                     LOGGER.log(Level.WARNING, "Failed to instantiate "+des.clazz,e);
                 }

src/main/java/hudson/plugins/sectioned_view/SectionedViewSection.java

@@ -23,6 +23,7 @@
  */
 package hudson.plugins.sectioned_view;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Describable;
@@ -48,16 +49,14 @@
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.Stapler;
 
-import javax.annotation.Nonnull;
-
 public abstract class SectionedViewSection implements ExtensionPoint, Describable<SectionedViewSection> {
 
     public SectionedViewSection(String name, Width width, Positioning alignment) {
         this.name = name;
         this.width = width;
         this.alignment = alignment;
         determineCss();
-        initJobFilters();
+        this.jobFilters = new DescribableList<ViewJobFilter, Descriptor<ViewJobFilter>>(Saveable.NOOP, new ArrayList<ViewJobFilter>());
     }
 
     /**
@@ -97,7 +96,7 @@ public static DescriptorExtensionList<SectionedViewSection, SectionedViewSection
         return Hudson.getInstance().<SectionedViewSection, SectionedViewSectionDescriptor>getDescriptorList(SectionedViewSection.class);
     }
 
-    public @Nonnull String getName() {
+    public @NonNull String getName() {
         return name == null ? "" : name;
     }
 

src/main/java/hudson/plugins/sectioned_view/SectionedViewSectionDescriptor.java

@@ -61,12 +61,17 @@ public boolean hasJobFilterExtensions() {
 
     @Override
     public SectionedViewSection newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        assert req != null;
         SectionedViewSection section = (SectionedViewSection)req.bindJSON(getClass().getDeclaringClass(), formData);
-
+        assert section != null;
         if (formData.get("useincluderegex") != null) {
             JSONObject merp = formData.getJSONObject("useincluderegex");
             try {
-                section.setIncludeRegex(Util.nullify(merp.getString("includeRegex")));
+                String merpString = merp.getString("includeRegex");
+                assert merpString != null;
+                merpString = Util.nullify(merpString);
+                assert merpString != null;
+                section.setIncludeRegex(merpString);
             } catch (PatternSyntaxException e) {
                 throw new FormException("Regular expression is invalid: " + e.getMessage(), e, "includeRegex");
             }

src/main/java/hudson/plugins/sectioned_view/TextSection.java

@@ -73,6 +73,7 @@ public static final class DescriptorImpl extends SectionedViewSectionDescriptor
 
         @Override
         public SectionedViewSection newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+            assert req != null;
             return (SectionedViewSection)req.bindJSON(getClass().getDeclaringClass(), formData);
         }
 

src/test/java/hudson/plugins/sectioned_view/SectionedViewTest.java

@@ -4,16 +4,16 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlButton;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
 import hudson.markup.RawHtmlMarkupFormatter;
 import hudson.model.Descriptor;
 import hudson.model.ItemGroup;
@@ -69,8 +69,7 @@ public void doNotEnumerateItemsRepeatedly() throws Exception {
 
     @Test @Issue("JENKINS-44987")
     public void htmlUI() throws Exception {
-        String MARKUP = "<div><b><a href=\"adsf\">LVS</a></b></div>";
-
+        String MARKUP = "<div><b><a href=\"adsf\" rel=\"nofollow noopener noreferrer\">LVS</a></b></div>";
         j.jenkins.setMarkupFormatter(new RawHtmlMarkupFormatter(false));
 
         SectionedView sw = new SectionedView("SW");

src/test/java/hudson/plugins/sectioned_view/TestResultViewSectionTest.java

@@ -1,7 +1,5 @@
 package hudson.plugins.sectioned_view;
 
-import static org.junit.Assert.*;
-
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
 import hudson.model.BuildListener;
@@ -15,23 +13,28 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author ogondza.
  */
 public class TestResultViewSectionTest {
 
     public @Rule JenkinsRule j = new JenkinsRule();
-    
+
     @Test
     public void showIt() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject("test_project");
-        p.getPublishersList().add(new JUnitResultArchiver("*.xml", false, null, 1));
+        p.getPublishersList().add(new JUnitResultArchiver("*.xml"));
         p.getBuildersList().add(new TestBuilder() {
             @Override
             public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
-                build.getWorkspace().child("result.xml").copyFrom(TestResultViewSectionTest.class.getResourceAsStream("junit-report-1472.xml"));
+                Objects.requireNonNull(build.getWorkspace()).child("result.xml").
+                        copyFrom(Objects.requireNonNull(TestResultViewSectionTest.class.
+                                getResourceAsStream("junit-report-1472.xml")));
                 return true;
             }
         });