feat: Switch to bom and fix icon on dropdown

jenkinsci · Feb 10, 2022 · 451d9a4 · 451d9a4
1 parent 5b718a7
commit 451d9a4
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>3.50</version>
+		<version>4.33</version>
 	</parent>
 
 	<artifactId>scriptler</artifactId>
@@ -39,7 +39,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-		<jenkins.version>2.121.3</jenkins.version>
+		<jenkins.version>2.319.3</jenkins.version>
 		<java.level>8</java.level>
 		<spotbugs.failOnError>false</spotbugs.failOnError>
 	</properties>
@@ -49,36 +49,43 @@
 		<url>https://github.com/jenkinsci/scriptler-plugin</url>
   	  <tag>HEAD</tag>
   </scm>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.jenkins.tools.bom</groupId>
+                <artifactId>bom-2.319.x</artifactId>
+                <version>1148.v7261f385f859</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>token-macro</artifactId>
-			<version>2.3</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.jenkins-ci.modules</groupId>
 			<artifactId>sshd</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope><!-- this is in the core -->
 		</dependency>
 
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>git-server</artifactId>
-			<version>1.7</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>script-security</artifactId>
-			<version>1.26</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>antisamy-markup-formatter</artifactId>
-			<version>2.1</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/main/java/org/jenkinsci/plugins/scriptler/ScriptlerManagement.java b/src/main/java/org/jenkinsci/plugins/scriptler/ScriptlerManagement.java
@@ -100,7 +100,7 @@ public void checkAtLeastOneScriptlerPermission(){
      */
     @Override
     public String getIconFileName() {
-        return hasAtLeastOneScriptlerPermission() ? "notepad.png" : null;
+        return hasAtLeastOneScriptlerPermission() ? "notepad.svg" : null;
     }
 
     /*

diff --git a/src/main/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilder.java b/src/main/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilder.java
@@ -6,6 +6,8 @@
 import com.thoughtworks.xstream.XStreamException;
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
@@ -43,8 +45,6 @@
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.Serializable;
@@ -87,7 +87,7 @@ public ScriptlerBuilder(String builderId, String scriptId, boolean propagatePara
         this.propagateParams = propagateParams;
     }
 
-    private @Nonnull Map<String, String> checkGenericData() {
+    private @NonNull Map<String, String> checkGenericData() {
         Map<String, String> errors = new HashMap<String, String>();
 
         Script script = ScriptHelper.getScript(scriptId, true);
@@ -103,7 +103,7 @@ public ScriptlerBuilder(String builderId, String scriptId, boolean propagatePara
         return errors;
     }
 
-    private void checkPermission(@Nonnull Map<String, String> errors){
+    private void checkPermission(@NonNull Map<String, String> errors){
         if(Jenkins.getInstance().hasPermission(Jenkins.RUN_SCRIPTS)){
             // user has right to add / edit Scripler steps
             return;
@@ -135,7 +135,7 @@ private Object readResolve() {
         return this;
     }
 
-    private boolean hasSameScriptlerBuilderInProject(@Nonnull Project project, @Nonnull ScriptlerBuilder targetBuilder){
+    private boolean hasSameScriptlerBuilderInProject(@NonNull Project project, @NonNull ScriptlerBuilder targetBuilder){
         List<ScriptlerBuilder> allScriptlerBuilders = _getAllScriptlerBuildersFromProject(project);
         for (ScriptlerBuilder builder : allScriptlerBuilders) {
             if(targetBuilder.equals(builder)){
@@ -147,7 +147,7 @@ private boolean hasSameScriptlerBuilderInProject(@Nonnull Project project, @Nonn
     }
 
     @SuppressWarnings("unchecked")
-    private @Nonnull List<ScriptlerBuilder> _getAllScriptlerBuildersFromProject(@Nonnull Project project){
+    private @NonNull List<ScriptlerBuilder> _getAllScriptlerBuildersFromProject(@NonNull Project project){
         return project.getBuildersList().getAll(ScriptlerBuilder.class);
     }
 

diff --git a/src/main/java/org/jenkinsci/plugins/scriptler/config/ScriptlerConfiguration.java b/src/main/java/org/jenkinsci/plugins/scriptler/config/ScriptlerConfiguration.java
@@ -47,10 +47,8 @@
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
-/**
- */
 public final class ScriptlerConfiguration extends ScriptSet implements Saveable {
 
     private final static Logger LOGGER = Logger.getLogger(ScriptlerConfiguration.class.getName());
@@ -94,7 +92,7 @@ public static XmlFile getXmlFile() {
         return new XmlFile(XSTREAM, new File(ScriptlerManagement.getScriptlerHomeDirectory(), "scriptler.xml"));
     }
 
-    public static @Nonnull ScriptlerConfiguration load() throws IOException {
+    public static @NonNull ScriptlerConfiguration load() throws IOException {
         XmlFile f = getXmlFile();
         if (f.exists()) {
             // As it might be that we have an unsorted set, we ensure the

diff --git a/src/main/java/org/jenkinsci/plugins/scriptler/share/gh/GHCatalog.java b/src/main/java/org/jenkinsci/plugins/scriptler/share/gh/GHCatalog.java
@@ -18,7 +18,7 @@
 import org.jenkinsci.plugins.scriptler.share.ScriptInfo;
 import org.jenkinsci.plugins.scriptler.share.ScriptInfoCatalog;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 
 /**
  * Provides access to the scriptler scripts shared at https://github.com/jenkinsci/jenkins-scripts

diff --git a/src/main/java/org/jenkinsci/plugins/scriptler/util/ScriptHelper.java b/src/main/java/org/jenkinsci/plugins/scriptler/util/ScriptHelper.java
@@ -17,7 +17,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;;
 import javax.servlet.ServletException;
 
 import jenkins.model.Jenkins;
@@ -187,7 +187,7 @@ public static String runScript(String node, String scriptTxt, Parameter[] parame
      * @param fullScriptBody
      *            the script to extract the meta info from
      * @return <code>null</code> if no meta info found
-     * @see https://github.com/jenkinsci/jenkins-scripts/tree/master/scriptler
+     * @see <a href="https://github.com/jenkinsci/jenkins-scripts/tree/master/scriptler">...</a>
      */
     public static ScriptInfo extractScriptInfo(String fullScriptBody) {
         final Matcher matcher = SCRIPT_META_PATTERN.matcher(fullScriptBody);

diff --git a/src/test/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilderTest.java b/src/test/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilderTest.java
@@ -47,7 +47,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 
-import javax.annotation.CheckForNull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URL;