diff --git a/pom.xml b/pom.xml index ee357f8ea..8ae7d64c1 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ - 2.414.3 + 2.426.3 2.39.5 -SNAPSHOT jenkinsci/${project.artifactId}-plugin @@ -115,6 +115,10 @@ org.jenkins-ci.plugins apache-httpcomponents-client-4-api + + io.jenkins.plugins + ionicons-api + org.jenkins-ci.plugins git @@ -271,8 +275,8 @@ io.jenkins.tools.bom - bom-2.414.x - 2675.v1515e14da_7a_6 + bom-2.426.x + 2815.vf5d6f093b_23e pom import @@ -300,7 +304,6 @@ maven-surefire-plugin false - ${concurrency} @@ -334,7 +337,7 @@ - + diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement.java index b38ace966..aec7ea2e9 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement.java @@ -32,7 +32,6 @@ import com.sonymobile.tools.gerrit.gerritevents.GerritSendCommandQueue; import hudson.DescriptorExtensionList; import hudson.Extension; -import hudson.Functions; import hudson.model.AdministrativeMonitor; import hudson.model.AutoCompletionCandidates; import hudson.model.Describable; @@ -117,15 +116,18 @@ public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse respons checkPermission(); Jenkins jenkins = Jenkins.get(); ContextMenu menu = new ContextMenu(); - menu.add("newServer", Functions.joinPath(jenkins.getRootUrl(), Functions.getResourcePath(), - "images", "24x24", "new-package.png"), Messages.AddNewServer()); + MenuItem item = new MenuItem() + .withUrl("newServer") + .withDisplayName(Messages.AddNewServer()) + .withIconClass("symbol-add-outline plugin-ionicons-api"); + menu.add(item); for (GerritServer server : getServers()) { menu.add(server); } - MenuItem item = new MenuItem() + item = new MenuItem() .withUrl("diagnostics") .withDisplayName(DIAGNOSTICS) - .withStockIcon("folder.png"); + .withIconClass("symbol-folder-outline plugin-ionicons-api"); item.subMenu = DIAGNOSTICS.getContextMenu("diagnostics"); menu.add(item); return menu; diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer.java index 580c4ebdd..c0e2b5a33 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer.java @@ -1314,19 +1314,6 @@ public FormValidation doPositiveIntegerCheck( return FormValidation.validatePositiveInteger(value); } - /** - * Checks that the provided parameter is an integer and not negative, zero is accepted. - * - * @param value the value. - * @return {@link FormValidation#validateNonNegativeInteger(String)} - */ - public FormValidation doNonNegativeIntegerCheck( - @QueryParameter("value") - final String value) { - - return FormValidation.validateNonNegativeInteger(value); - } - /** * Checks that the provided parameter is an integer, not negative, that is larger * than the minimum value. @@ -1367,27 +1354,6 @@ public FormValidation doIntegerCheck( } } - /** - * Checks that the provided parameter is an empty string or an integer. - * @param value the value. - * @return {@link FormValidation#validatePositiveInteger(String)} - */ - public FormValidation doEmptyOrIntegerCheck( - @QueryParameter("value") - final String value) { - - if (value == null || value.length() <= 0) { - return FormValidation.ok(); - } else { - try { - Integer.parseInt(value); - return FormValidation.ok(); - } catch (NumberFormatException e) { - return FormValidation.error(Messages.NotANumber()); - } - } - } - /** * Checks if the value is a valid URL. It does not check if the URL is reachable. * @param value the value @@ -1437,14 +1403,14 @@ public FormValidation doValidKeyFileCheck( * Checks to see if the provided value represents a time on the hh:mm format. * Also checks that from is before to. * - * @param fromValue the from value. - * @param toValue the to value. + * @param from the from value. + * @param to the to value. * @return {@link FormValidation#ok() } if it is so. */ public FormValidation doValidTimeCheck( - @QueryParameter final String fromValue, @QueryParameter final String toValue) { - String[] splitFrom = fromValue.split(":"); - String[] splitTo = toValue.split(":"); + @QueryParameter final String from, @QueryParameter final String to) { + String[] splitFrom = from.split(":"); + String[] splitTo = to.split(":"); int fromHour; int fromMinute; int toHour; diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/Diagnostics.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/Diagnostics.java index 1092c4b04..82b72ce80 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/Diagnostics.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/diagnostics/Diagnostics.java @@ -80,15 +80,20 @@ public ContextMenu getContextMenu(String context) { String url = makeRelativeUrl(context, "buildMemory"); menu.add(new MenuItem() .withUrl(url) - .withStockIcon("clipboard.png") + .withIconClass("symbol-clipboard-outline plugin-ionicons-api") .withDisplayName(Messages.BuildMemoryReport_DisplayName())); url = makeRelativeUrl(context, "eventListeners"); menu.add(new MenuItem() .withUrl(url) - .withStockIcon("clipboard.png") + .withIconClass("symbol-clipboard-outline plugin-ionicons-api") .withDisplayName(Messages.EventListenersReport_DisplayName())); if (isDebugMode()) { - menu.add("triggerDebugEvent", "warning.png", "Trigger Debug", false, true); + MenuItem item = new MenuItem() + .withUrl("triggerDebugEvent") + .withIconClass("symbol-warning plugin-ionicons-api") + .withDisplayName("Trigger Debug"); + item.requiresConfirmation = true; + menu.add(item); } return menu; } diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerDescriptor.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerDescriptor.java index 3092014e2..c451620e7 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerDescriptor.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerDescriptor.java @@ -63,27 +63,6 @@ public boolean isUnsuccessfulMessageFileSupported(Job job) { return job instanceof AbstractProject; } - /** - * Checks that the provided parameter is an empty string or an integer. - * - * @param value the value. - * @return {@link FormValidation#validatePositiveInteger(String)} - */ - public FormValidation doEmptyOrIntegerCheck( - @QueryParameter("value") - final String value) { - if (value == null || value.length() <= 0) { - return FormValidation.ok(); - } else { - try { - Integer.parseInt(value); - return FormValidation.ok(); - } catch (NumberFormatException e) { - return FormValidation.error(Messages.NotANumber()); - } - } - } - /** * Provides auto-completion candidates for dependency jobs names. * diff --git a/src/main/resources/META-INF/hudson.remoting.ClassFilter b/src/main/resources/META-INF/hudson.remoting.ClassFilter deleted file mode 100644 index ffda5871a..000000000 --- a/src/main/resources/META-INF/hudson.remoting.ClassFilter +++ /dev/null @@ -1,3 +0,0 @@ -# Remove once https://github.com/jenkinsci/jenkins/pull/3234 is integrated? -java.util.Collections$SynchronizedList -java.util.Collections$SynchronizedRandomAccessList diff --git a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/index.jelly b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/index.jelly index 7b334117f..f924edb26 100644 --- a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/index.jelly +++ b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/index.jelly @@ -3,88 +3,80 @@ xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + ${%New Server} + + + ${%Diagnostics} + + + + + + + + + + + + + + -
-
- Filtered Out -
-
- - +
+ +
-
- Filtered In -
@@ -102,11 +94,19 @@
-
-
${%Gerrit Servers}
-

-

-
+
${%Gerrit Servers}
+ + + + + + + + + + + +
${%Server Name}${%Version}${%Status}${%Edit}${%Remove}
diff --git a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/newServer.jelly b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/newServer.jelly index 8a76620d5..d31e357e8 100644 --- a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/newServer.jelly +++ b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritManagement/newServer.jelly @@ -28,12 +28,6 @@ THE SOFTWARE. - - - - - - diff --git a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer/index.jelly b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer/index.jelly index cc14f1ec1..254cdfaf7 100644 --- a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer/index.jelly +++ b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritServer/index.jelly @@ -1,26 +1,35 @@ + xmlns:f="/lib/form"> + + - + +
+ + diff --git a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/actions/manual/ManualTriggerAction/index.jelly b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/actions/manual/ManualTriggerAction/index.jelly index 4598f31bc..3c84d2a2a 100644 --- a/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/actions/manual/ManualTriggerAction/index.jelly +++ b/src/main/resources/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/actions/manual/ManualTriggerAction/index.jelly @@ -3,16 +3,9 @@