Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix icon on dropdown and address EOL JSR 305 from core #48

Merged
merged 3 commits into from
May 9, 2022
Merged

Fix icon on dropdown and address EOL JSR 305 from core #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7b7a53
feat: Switch to bom and fix icon on dropdown
NotMyFault Feb 10, 2022
07429f6
build: Update bom
NotMyFault Mar 11, 2022
8277616
build: Update bom
mtughan May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<jenkins.version>2.249</jenkins.version>
<jenkins.version>2.332.1</jenkins.version>
<java.level>8</java.level>
</properties>
<scm>
Expand All @@ -48,43 +48,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.332.x</artifactId>
<version>1362.v59f2f3db_80ee</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
<version>2.13</version>
<exclusions>
<exclusion>
<!-- Causes enforcer violation with Jenkins 2.249 -->
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
<version>2.6</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>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/scriptler/ScriptlerManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void checkAtLeastOneScriptlerPermission(){
*/
@Override
public String getIconFileName() {
return hasAtLeastOneScriptlerPermission() ? "notepad.png" : null;
return hasAtLeastOneScriptlerPermission() ? "notepad.svg" : null;
}

/*
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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.ExtensionList;
Expand Down Expand Up @@ -45,8 +46,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;
Expand Down Expand Up @@ -89,7 +88,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<>();

Script script = ScriptHelper.getScript(scriptId, true);
Expand All @@ -104,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.get().hasPermission(Jenkins.RUN_SCRIPTS)){
// user has right to add / edit Scripler steps
return;
Expand Down Expand Up @@ -137,7 +136,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)){
Expand All @@ -148,7 +147,7 @@ private boolean hasSameScriptlerBuilderInProject(@Nonnull Project<?, ?> project,
return false;
}

private @Nonnull List<ScriptlerBuilder> _getAllScriptlerBuildersFromProject(@Nonnull Project<?, ?> project){
private @NonNull List<ScriptlerBuilder> _getAllScriptlerBuildersFromProject(@NonNull Project<?, ?> project){
return project.getBuildersList().getAll(ScriptlerBuilder.class);
}

Expand Down
6 changes: 2 additions & 4 deletions src/main/java/org/jenkinsci/plugins/scriptler/config/ScriptlerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,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());
Expand Down Expand Up @@ -97,7 +95,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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/scriptler/share/gh/GHCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/scriptler/util/ScriptHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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;
Expand Down Expand Up @@ -191,7 +191,7 @@ public static String runScript(String node, String scriptTxt, @NonNull Collectio
* @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);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jenkinsci/plugins/scriptler/builder/ScriptlerBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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;
Expand Down