\ -# Find that out by checking the fingerprint against \ -# the database in Jenkins description=\ - Tem um arquivo jar mas n\u00E3o sabe em qual vers\u00e3o est\u00e1?
\ - Descubra atrav\u00e9s dos fingerprints na base de dados do Jenkins + Tem um arquivo jar mas n\u00E3o sabe em qual vers\u00E3o est\u00E1?
\ + Descubra atrav\u00E9s dos fingerprints na base de dados do Jenkins more\ details=mais detalhes diff --git a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties index 2fb38afc560e..175daad8733e 100644 --- a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties +++ b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties @@ -54,7 +54,7 @@ DefaultProjectNamingStrategy.DisplayName=Padr\u00E3o ParameterizedJobMixIn.build_with_parameters=Construir com par\u00E2metros ParameterizedJobMixIn.build_now=Construir agora BlockedBecauseOfBuildInProgress.shortDescription=A constru\u00E7\u00E3o #{0} j\u00E1 est\u00E1 em progresso {1} -BlockedBecauseOfBuildInProgress.ETA=\ (ETA: {0}) +BlockedBecauseOfBuildInProgress.ETA=\ (Tempo estimado de t\u00E9rmino: {0}) BuildDiscarderProperty.displayName=Descartar constru\u00E7\u00F5es antigas CLI.disable-job.shortDescription=Desabilitar uma tarefa CLI.enable-job.shortDescription=Habilita uma tarefa diff --git a/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message_pt_BR.properties b/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message_pt_BR.properties index 361561422591..cd2ea1228c1f 100644 --- a/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message_pt_BR.properties +++ b/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message_pt_BR.properties @@ -22,3 +22,10 @@ More\ Info=Mais informa\u00E7\u00E3o Dismiss=Dispensar +Recommended_Java_Version=
Voc\u00EA est\u00E1 executando o Jenkins com o Java {0}, cujo \ + suporte ser\u00E1 encerrado em 21 de junho de 2022. Isto \u00E9 antes do que a data previamente anunciada.
\ +A linha de suporte de longo per\u00EDodo (LTS) do Jenkins continuar\u00E1 a suportar esta \ + vers\u00E3o at\u00E9 setembro de 2022.
Por favor se refira a \ + \ + a documenta\u00E7\u00E3o para maiores detalhes sobre atualizar para o Java vers\u00E3o 11.
+Recommended_Java_Version_Heading=Fim de suporte ao Java {0} pelo Jenkins diff --git a/core/src/main/resources/lib/layout/layout_pt_BR.properties b/core/src/main/resources/lib/layout/layout_pt_BR.properties index 5f9047d2664c..54dcb0014fd8 100644 --- a/core/src/main/resources/lib/layout/layout_pt_BR.properties +++ b/core/src/main/resources/lib/layout/layout_pt_BR.properties @@ -21,9 +21,7 @@ # THE SOFTWARE. search=pesquisar -# https://www.jenkins.io/redirect/search-box searchBox.url=https://www.jenkins.io/redirect/search-box -# log out logout=sair title=Jenkins jenkinshead.alt=Jenkins From d4d1fb8a17ea61b3c8d86bfcfa598eadd428c35d Mon Sep 17 00:00:00 2001 From: Alexander Brandes
+ * Built-in functionality for buttons with event handlers is included. - * If the optional YUI Button dependancy is included on the page, the buttons + * If the optional YUI Button dependency is included on the page, the buttons * created will be instances of YAHOO.widget.Button, otherwise regular HTML buttons * will be created. *
From e8884df579413cb0d626217a92593625676488d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 10:48:27 -0700 Subject: [PATCH 09/64] Bump Mockito from 4.5.1 to 4.6.0 (#6612) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99fddf009765..19ad1290b764 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ THE SOFTWARE.
-
-
+
+
+
+ {
@Extension @Symbol("password")
public static final class DescriptorImpl extends UserPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.HudsonPrivateSecurityRealm_Details_DisplayName();
@@ -964,6 +965,7 @@ public boolean isPasswordHashed(String password) {
@Extension @Symbol("local")
public static final class DescriptorImpl extends Descriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.HudsonPrivateSecurityRealm_DisplayName();
diff --git a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java
index fc4f613bd9ba..f9285262d9ac 100644
--- a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java
@@ -24,6 +24,7 @@
package hudson.security;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.Descriptor;
import java.util.Collection;
@@ -59,6 +60,7 @@ public Collection getGroups() {
@Extension @Symbol("legacy")
public static final class DescriptorImpl extends Descriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.LegacyAuthorizationStrategy_DisplayName();
diff --git a/core/src/main/java/hudson/security/LegacySecurityRealm.java b/core/src/main/java/hudson/security/LegacySecurityRealm.java
index 91ea25f31428..1e869475caf2 100644
--- a/core/src/main/java/hudson/security/LegacySecurityRealm.java
+++ b/core/src/main/java/hudson/security/LegacySecurityRealm.java
@@ -24,6 +24,7 @@
package hudson.security;
+import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Extension;
import hudson.model.Descriptor;
@@ -106,6 +107,7 @@ public DescriptorImpl() {
DESCRIPTOR = this;
}
+ @NonNull
@Override
public String getDisplayName() {
return Messages.LegacySecurityRealm_Displayname();
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index b959d2d1bbb3..f2ad1fa7b63d 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -24,6 +24,7 @@
package hudson.security;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.DescriptorExtensionList;
import hudson.Extension;
import hudson.ExtensionPoint;
@@ -715,6 +716,7 @@ private Object readResolve() {
@Symbol("none")
public static class DescriptorImpl extends Descriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.NoneSecurityRealm_DisplayName();
diff --git a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
index 3cb8c3eace10..89c7da39e7b4 100644
--- a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
@@ -6,6 +6,7 @@
package hudson.security.csrf;
+import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Extension;
import hudson.Util;
@@ -127,6 +128,7 @@ public DescriptorImpl() {
super(CRUMB_SALT.get(), SystemProperties.getString("hudson.security.csrf.requestfield", CrumbIssuer.DEFAULT_CRUMB_NAME));
}
+ @NonNull
@Override
public String getDisplayName() {
return Messages.DefaultCrumbIssuer_DisplayName();
diff --git a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
index 65d84f6426b6..be50bc982062 100644
--- a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
+++ b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
@@ -24,6 +24,7 @@
package hudson.slaves;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.EnvVars;
import hudson.Extension;
import hudson.Launcher;
@@ -89,6 +90,7 @@ public void buildEnvVars(EnvVars env, TaskListener listener) throws IOException,
@Extension @Symbol("envVars")
public static class DescriptorImpl extends NodePropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.EnvironmentVariablesNodeProperty_displayName();
diff --git a/core/src/main/java/hudson/slaves/RetentionStrategy.java b/core/src/main/java/hudson/slaves/RetentionStrategy.java
index 34da53d05806..e06b8e42c069 100644
--- a/core/src/main/java/hudson/slaves/RetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/RetentionStrategy.java
@@ -176,6 +176,7 @@ public long check(SlaveComputer c) {
@Extension(ordinal = 100) @Symbol("always")
public static class DescriptorImpl extends Descriptor> {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.RetentionStrategy_Always_displayName();
@@ -289,6 +290,7 @@ public long check(final SlaveComputer c) {
@Extension @Symbol("demand")
public static class DescriptorImpl extends Descriptor> {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.RetentionStrategy_Demand_displayName();
diff --git a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
index efb0df51b3ba..adabf6e07dc3 100644
--- a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
@@ -28,6 +28,7 @@
import static java.util.logging.Level.INFO;
import antlr.ANTLRException;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.Computer;
import hudson.model.Descriptor;
@@ -248,6 +249,7 @@ private synchronized boolean isOnlineScheduled() {
@Extension @Symbol("schedule")
public static class DescriptorImpl extends Descriptor> {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.SimpleScheduledRetentionStrategy_displayName();
diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
index 44702bf64dc9..ffeefda8afe7 100644
--- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -347,6 +347,7 @@ public DescriptorImpl() {
DESCRIPTOR = this; // backward compatibility
}
+ @NonNull
@Override
public String getDisplayName() {
return Messages.ArtifactArchiver_DisplayName();
diff --git a/core/src/main/java/hudson/tasks/BatchFile.java b/core/src/main/java/hudson/tasks/BatchFile.java
index 2d1b2e4cc7c1..38cd9841a78d 100644
--- a/core/src/main/java/hudson/tasks/BatchFile.java
+++ b/core/src/main/java/hudson/tasks/BatchFile.java
@@ -25,6 +25,7 @@
package hudson.tasks;
import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.Util;
@@ -113,6 +114,7 @@ public String getHelpFile() {
return "/help/project-config/batch.html";
}
+ @NonNull
@Override
public String getDisplayName() {
return Messages.BatchFile_DisplayName();
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 0a683fb13c45..3be7631bb1f0 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -24,6 +24,7 @@
package hudson.tasks;
+import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.EnvVars;
import hudson.Extension;
@@ -331,6 +332,7 @@ private void record(Run build, FilePath ws, TaskListener listener, Map {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.Fingerprinter_DisplayName();
diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java
index f3d0f0d630c8..3d5f3975808a 100644
--- a/core/src/main/java/hudson/tasks/LogRotator.java
+++ b/core/src/main/java/hudson/tasks/LogRotator.java
@@ -28,6 +28,7 @@
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.FINER;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.Job;
import hudson.model.Run;
@@ -296,6 +297,7 @@ private String toString(Integer i) {
@Extension @Symbol("logRotator")
public static final class LRDescriptor extends BuildDiscarderDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Log Rotation";
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index 4c059b78f1b4..beee7b8624d5 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -446,6 +446,7 @@ public String getHelpFile(String fieldName) {
return super.getHelpFile(fieldName);
}
+ @NonNull
@Override
public String getDisplayName() {
return Messages.Maven_DisplayName();
@@ -684,6 +685,7 @@ public MavenInstallation forNode(Node node, TaskListener log) throws IOException
@Extension @Symbol("maven")
public static class DescriptorImpl extends ToolDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Maven";
@@ -764,6 +766,7 @@ public MavenInstaller(String id) {
@Extension @Symbol("maven")
public static final class DescriptorImpl extends DownloadFromUrlInstaller.DescriptorImpl {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.InstallFromApache();
diff --git a/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java b/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java
index 3bca8127be68..f43f96cb783d 100644
--- a/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java
+++ b/core/src/main/java/hudson/tasks/_maven/Maven3MojoNote.java
@@ -24,6 +24,7 @@
package hudson.tasks._maven;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.MarkupText;
import hudson.console.ConsoleAnnotationDescriptor;
@@ -60,6 +61,7 @@ public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
@Extension @Symbol("maven3Mojos")
public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Maven 3 Mojos";
diff --git a/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java b/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java
index ec7a231403f6..467b3884ac8e 100644
--- a/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java
+++ b/core/src/main/java/hudson/tasks/_maven/MavenErrorNote.java
@@ -24,6 +24,7 @@
package hudson.tasks._maven;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.MarkupText;
import hudson.console.ConsoleAnnotationDescriptor;
@@ -47,6 +48,7 @@ public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
@Extension @Symbol("mavenErrors")
public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Maven Errors";
diff --git a/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java b/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java
index 581cb8d22b21..184fda189bb5 100644
--- a/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java
+++ b/core/src/main/java/hudson/tasks/_maven/MavenMojoNote.java
@@ -24,6 +24,7 @@
package hudson.tasks._maven;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.MarkupText;
import hudson.console.ConsoleAnnotationDescriptor;
@@ -52,6 +53,7 @@ public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
@Extension @Symbol("mavenMojos")
public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Maven Mojos";
diff --git a/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java b/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java
index f6eaa933461d..6d894a556b57 100644
--- a/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java
+++ b/core/src/main/java/hudson/tasks/_maven/MavenWarningNote.java
@@ -24,6 +24,7 @@
package hudson.tasks._maven;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.MarkupText;
import hudson.console.ConsoleAnnotationDescriptor;
@@ -49,6 +50,7 @@ public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
@Extension @Symbol("mavenWarnings")
public static final class DescriptorImpl extends ConsoleAnnotationDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Maven Warnings";
diff --git a/core/src/main/java/hudson/tools/BatchCommandInstaller.java b/core/src/main/java/hudson/tools/BatchCommandInstaller.java
index 763f20192f16..d2e9275b1d61 100644
--- a/core/src/main/java/hudson/tools/BatchCommandInstaller.java
+++ b/core/src/main/java/hudson/tools/BatchCommandInstaller.java
@@ -24,6 +24,7 @@
package hudson.tools;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.util.LineEndingConversion;
@@ -60,6 +61,7 @@ private Object readResolve() throws ObjectStreamException {
@Extension @Symbol("batchFile")
public static class DescriptorImpl extends Descriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.BatchCommandInstaller_DescriptorImpl_displayName();
diff --git a/core/src/main/java/hudson/tools/CommandInstaller.java b/core/src/main/java/hudson/tools/CommandInstaller.java
index 13e9029a9f52..a3c3e71fc9aa 100644
--- a/core/src/main/java/hudson/tools/CommandInstaller.java
+++ b/core/src/main/java/hudson/tools/CommandInstaller.java
@@ -24,6 +24,7 @@
package hudson.tools;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.util.LineEndingConversion;
@@ -59,6 +60,7 @@ private Object readResolve() throws ObjectStreamException {
@Extension @Symbol("command")
public static class DescriptorImpl extends Descriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.CommandInstaller_DescriptorImpl_displayName();
diff --git a/core/src/main/java/hudson/tools/InstallSourceProperty.java b/core/src/main/java/hudson/tools/InstallSourceProperty.java
index 6de1af522318..2e2eaf5a2232 100644
--- a/core/src/main/java/hudson/tools/InstallSourceProperty.java
+++ b/core/src/main/java/hudson/tools/InstallSourceProperty.java
@@ -24,6 +24,7 @@
package hudson.tools;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.Descriptor;
import hudson.model.Saveable;
@@ -65,6 +66,7 @@ public Class type() {
@Extension @Symbol("installSource")
public static class DescriptorImpl extends ToolPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.InstallSourceProperty_DescriptorImpl_displayName();
diff --git a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
index 290f1e4e3baa..d6cf27305939 100644
--- a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
+++ b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
@@ -24,6 +24,7 @@
package hudson.tools;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.DescriptorExtensionList;
import hudson.Extension;
import hudson.model.Descriptor;
@@ -118,6 +119,7 @@ public static String getToolHome(Node node, ToolInstallation installation, TaskL
@Extension @Symbol("toolLocation")
public static class DescriptorImpl extends NodePropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.ToolLocationNodeProperty_displayName();
diff --git a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
index b1204bd0da07..a3ded83462f8 100644
--- a/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
+++ b/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
@@ -24,6 +24,7 @@
package hudson.tools;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.Functions;
@@ -92,6 +93,7 @@ public FilePath performInstallation(ToolInstallation tool, Node node, TaskListen
@Extension @Symbol("zip")
public static class DescriptorImpl extends ToolInstallerDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.ZipExtractionInstaller_DescriptorImpl_displayName();
diff --git a/core/src/main/java/hudson/views/BuildButtonColumn.java b/core/src/main/java/hudson/views/BuildButtonColumn.java
index 5a48f0da6de8..39d20f6cb5a6 100644
--- a/core/src/main/java/hudson/views/BuildButtonColumn.java
+++ b/core/src/main/java/hudson/views/BuildButtonColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.AbstractItem;
import org.jenkinsci.Symbol;
@@ -43,6 +44,7 @@ public String taskNoun(Object job) {
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_ACTIONS_START - 1) @Symbol("buildButton")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.BuildButtonColumn_DisplayName();
diff --git a/core/src/main/java/hudson/views/DefaultMyViewsTabBar.java b/core/src/main/java/hudson/views/DefaultMyViewsTabBar.java
index d697552a6857..68870f137b2b 100644
--- a/core/src/main/java/hudson/views/DefaultMyViewsTabBar.java
+++ b/core/src/main/java/hudson/views/DefaultMyViewsTabBar.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -42,6 +43,7 @@ public DefaultMyViewsTabBar() {
@Extension @Symbol("standard")
public static class DescriptorImpl extends MyViewsTabBarDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.DefaultMyViewsTabsBar_DisplayName();
diff --git a/core/src/main/java/hudson/views/DefaultViewsTabBar.java b/core/src/main/java/hudson/views/DefaultViewsTabBar.java
index 6f697f96a86e..8054a3ae1ec5 100644
--- a/core/src/main/java/hudson/views/DefaultViewsTabBar.java
+++ b/core/src/main/java/hudson/views/DefaultViewsTabBar.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -42,6 +43,7 @@ public DefaultViewsTabBar() {
@Extension @Symbol("standard")
public static class DescriptorImpl extends ViewsTabBarDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.DefaultViewsTabsBar_DisplayName();
diff --git a/core/src/main/java/hudson/views/JobColumn.java b/core/src/main/java/hudson/views/JobColumn.java
index b2ec060f09c3..026ea7e17448 100644
--- a/core/src/main/java/hudson/views/JobColumn.java
+++ b/core/src/main/java/hudson/views/JobColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.Item;
import org.jenkinsci.Symbol;
@@ -40,6 +41,7 @@ public JobColumn() {
// put this in the middle of icons and properties
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_ICON_END + 1) @Symbol("jobName")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.JobColumn_DisplayName();
diff --git a/core/src/main/java/hudson/views/LastDurationColumn.java b/core/src/main/java/hudson/views/LastDurationColumn.java
index f1d7258e5b95..60a0ddc239fa 100644
--- a/core/src/main/java/hudson/views/LastDurationColumn.java
+++ b/core/src/main/java/hudson/views/LastDurationColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -35,6 +36,7 @@ public LastDurationColumn() {
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_PROPERTIES_START - 4) @Symbol("lastDuration")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.LastDurationColumn_DisplayName();
diff --git a/core/src/main/java/hudson/views/LastFailureColumn.java b/core/src/main/java/hudson/views/LastFailureColumn.java
index c31f3f9590a0..50978c5accd2 100644
--- a/core/src/main/java/hudson/views/LastFailureColumn.java
+++ b/core/src/main/java/hudson/views/LastFailureColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -35,6 +36,7 @@ public LastFailureColumn() {
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_PROPERTIES_START - 2) @Symbol("lastFailure")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.LastFailureColumn_DisplayName();
diff --git a/core/src/main/java/hudson/views/LastStableColumn.java b/core/src/main/java/hudson/views/LastStableColumn.java
index 7dfd482eaab3..1915b6bd4c7d 100644
--- a/core/src/main/java/hudson/views/LastStableColumn.java
+++ b/core/src/main/java/hudson/views/LastStableColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -35,6 +36,7 @@ public LastStableColumn() {
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_PROPERTIES_START - 3) @Symbol("lastStable")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.LastStableColumn_DisplayName();
diff --git a/core/src/main/java/hudson/views/LastSuccessColumn.java b/core/src/main/java/hudson/views/LastSuccessColumn.java
index 98571e8e9bf3..b4a1cddafad1 100644
--- a/core/src/main/java/hudson/views/LastSuccessColumn.java
+++ b/core/src/main/java/hudson/views/LastSuccessColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -35,6 +36,7 @@ public LastSuccessColumn() {
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_PROPERTIES_START - 1) @Symbol("lastSuccess")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.LastSuccessColumn_DisplayName();
diff --git a/core/src/main/java/hudson/views/StatusColumn.java b/core/src/main/java/hudson/views/StatusColumn.java
index 9d9e92d3dfdd..83f3b79dd174 100644
--- a/core/src/main/java/hudson/views/StatusColumn.java
+++ b/core/src/main/java/hudson/views/StatusColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.StatusIcon;
import org.jenkinsci.Symbol;
@@ -41,6 +42,7 @@ public StatusColumn() {
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_ICON_START - 1) @Symbol("status")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.StatusColumn_DisplayName();
diff --git a/core/src/main/java/hudson/views/WeatherColumn.java b/core/src/main/java/hudson/views/WeatherColumn.java
index ee04f7c0f08b..ec31fc4deaf2 100644
--- a/core/src/main/java/hudson/views/WeatherColumn.java
+++ b/core/src/main/java/hudson/views/WeatherColumn.java
@@ -24,6 +24,7 @@
package hudson.views;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -35,6 +36,7 @@ public WeatherColumn() {
@Extension(ordinal = DEFAULT_COLUMNS_ORDINAL_ICON_START - 2) @Symbol("weather")
public static class DescriptorImpl extends ListViewColumnDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.WeatherColumn_DisplayName();
diff --git a/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java b/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java
index a0ada4a71d17..d3154e6db6a3 100644
--- a/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java
+++ b/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java
@@ -368,6 +368,7 @@ protected File getRootDir() {
@Extension
public static class DescriptorImpl extends FingerprintStorageDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.FileFingerprintStorage_DisplayName();
diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
index 5fa8b66c173b..eb9685f54ba0 100644
--- a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
+++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
@@ -24,6 +24,7 @@
package jenkins.management;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.diagnosis.ReverseProxySetupMonitor;
import hudson.model.AdministrativeMonitor;
@@ -62,6 +63,7 @@ public AdministrativeMonitorsDecorator() {
ignoredJenkinsRestOfUrls.add("configure");
}
+ @NonNull
@Override
public String getDisplayName() {
return Messages.AdministrativeMonitorsDecorator_DisplayName();
diff --git a/core/src/main/java/jenkins/model/BuildDiscarderProperty.java b/core/src/main/java/jenkins/model/BuildDiscarderProperty.java
index 3113445efbd6..3128a56831eb 100644
--- a/core/src/main/java/jenkins/model/BuildDiscarderProperty.java
+++ b/core/src/main/java/jenkins/model/BuildDiscarderProperty.java
@@ -24,6 +24,7 @@
package jenkins.model;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.model.Descriptor;
import hudson.model.DescriptorVisibilityFilter;
@@ -53,6 +54,7 @@ public BuildDiscarder getStrategy() {
@Symbol("buildDiscarder")
public static class DescriptorImpl extends OptionalJobPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.BuildDiscarderProperty_displayName();
diff --git a/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java b/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java
index bc7d92c8887f..57106782a7ba 100644
--- a/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java
+++ b/core/src/main/java/jenkins/model/DefaultUserCanonicalIdResolver.java
@@ -25,6 +25,7 @@
package jenkins.model;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.Functions;
import hudson.model.Descriptor;
@@ -59,6 +60,7 @@ public Descriptor getDescriptor() {
}
public static final Descriptor DESCRIPTOR = new Descriptor() {
+ @NonNull
@Override
public String getDisplayName() {
return "compute default user ID";
diff --git a/core/src/main/java/jenkins/model/IdStrategy.java b/core/src/main/java/jenkins/model/IdStrategy.java
index 34f798844e73..13cd86bd5a76 100644
--- a/core/src/main/java/jenkins/model/IdStrategy.java
+++ b/core/src/main/java/jenkins/model/IdStrategy.java
@@ -264,6 +264,7 @@ public int compare(@NonNull String id1, @NonNull String id2) {
@Extension @Symbol("caseSensitive")
public static class DescriptorImpl extends IdStrategyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.IdStrategy_CaseSensitive_DisplayName();
@@ -308,6 +309,7 @@ public int compare(@NonNull String id1, @NonNull String id2) {
@Extension
public static class DescriptorImpl extends IdStrategyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.IdStrategy_CaseSensitiveEmailAddress_DisplayName();
diff --git a/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
index 1a7abfa74fb6..e870c98f7a0f 100644
--- a/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/DefaultGlobalSettingsProvider.java
@@ -1,5 +1,6 @@
package jenkins.mvn;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.model.AbstractBuild;
@@ -26,6 +27,7 @@ public FilePath supplySettings(AbstractBuild project, TaskListener listene
@Extension(ordinal = 99) @Symbol("standard")
public static class DescriptorImpl extends GlobalSettingsProviderDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.DefaultGlobalSettingsProvider_DisplayName();
diff --git a/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java b/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
index cc476146a461..4b4d41107cf3 100644
--- a/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/DefaultSettingsProvider.java
@@ -1,5 +1,6 @@
package jenkins.mvn;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.model.AbstractBuild;
@@ -26,6 +27,7 @@ public FilePath supplySettings(AbstractBuild project, TaskListener listene
@Extension(ordinal = 99) @Symbol("standard")
public static class DescriptorImpl extends SettingsProviderDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.DefaultSettingsProvider_DisplayName();
diff --git a/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
index a6edcef0298a..a0f81e09e21c 100644
--- a/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/FilePathGlobalSettingsProvider.java
@@ -1,5 +1,6 @@
package jenkins.mvn;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.model.AbstractBuild;
@@ -41,6 +42,7 @@ public FilePath supplySettings(AbstractBuild build, TaskListener listener)
@Extension(ordinal = 10)
public static class DescriptorImpl extends GlobalSettingsProviderDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.FilePathGlobalSettingsProvider_DisplayName();
diff --git a/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java b/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
index 232705246490..1079d8bb63f1 100644
--- a/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/FilePathSettingsProvider.java
@@ -1,5 +1,6 @@
package jenkins.mvn;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.FilePath;
import hudson.model.AbstractBuild;
@@ -41,6 +42,7 @@ public FilePath supplySettings(AbstractBuild build, TaskListener listener)
@Extension(ordinal = 10) @Symbol("filePath")
public static class DescriptorImpl extends SettingsProviderDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.FilePathSettingsProvider_DisplayName();
diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java
index 5ab7fc475e25..000913120bbf 100644
--- a/core/src/main/java/jenkins/security/ApiTokenProperty.java
+++ b/core/src/main/java/jenkins/security/ApiTokenProperty.java
@@ -408,6 +408,7 @@ public void revokeToken(@NonNull String tokenUuid) throws IOException {
@Extension
@Symbol("apiToken")
public static final class DescriptorImpl extends UserPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return Messages.ApiTokenProperty_DisplayName();
diff --git a/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java b/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
index 2efe76a6f9d4..87ace6af6e94 100644
--- a/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
+++ b/core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java
@@ -193,6 +193,7 @@ private boolean shouldTrigger(Run upstreamBuild, TaskListener listener) {
@Extension @Symbol("upstream")
public static final class DescriptorImpl extends TriggerDescriptor {
+ @NonNull
@Override public String getDisplayName() {
return Messages.ReverseBuildTrigger_build_after_other_projects_are_built();
}
diff --git a/test/src/test/java/hudson/LauncherTest.java b/test/src/test/java/hudson/LauncherTest.java
index e0e0454566b5..5a4f2e9a4bfa 100644
--- a/test/src/test/java/hudson/LauncherTest.java
+++ b/test/src/test/java/hudson/LauncherTest.java
@@ -158,6 +158,7 @@ private static final class QuietShell extends Shell {
}
@Extension public static final class DescriptorImpl extends Shell.DescriptorImpl {
+ @NonNull
@Override public String getDisplayName() {
return "QuietShell";
}
@@ -174,6 +175,7 @@ private static final class QuietBatchFile extends BatchFile {
}
@Extension public static final class DescriptorImpl extends BuildStepDescriptor {
+ @NonNull
@Override public String getDisplayName() {
return "QuietBatchFile";
}
diff --git a/test/src/test/java/hudson/model/DownloadServiceTest.java b/test/src/test/java/hudson/model/DownloadServiceTest.java
index c1f38fef2b60..5468cd2eceb9 100644
--- a/test/src/test/java/hudson/model/DownloadServiceTest.java
+++ b/test/src/test/java/hudson/model/DownloadServiceTest.java
@@ -3,6 +3,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.model.DownloadService.Downloadable;
import hudson.tasks.Ant.AntInstaller;
import hudson.tasks.Maven;
@@ -98,6 +99,7 @@ protected GenericDownloadFromUrlInstaller(String id) {
}
public static final class DescriptorImpl extends DownloadFromUrlInstaller.DescriptorImpl {
+ @NonNull
@Override
public String getDisplayName() {
return "";
diff --git a/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java b/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java
index 9a30b0f5c3d8..a910f69c8cde 100644
--- a/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java
+++ b/test/src/test/java/hudson/model/FingerprintCleanupThreadTest.java
@@ -271,6 +271,7 @@ public boolean isReady() {
@Extension
public static class DescriptorImpl extends FingerprintStorageDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "TestFileFingerprintStorage";
@@ -353,6 +354,7 @@ protected Fingerprint getFingerprint(Fingerprint fp) {
@Extension
public static class DescriptorImpl extends FingerprintStorageDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "TestExternalFingerprintStorage";
diff --git a/test/src/test/java/hudson/model/JobTest.java b/test/src/test/java/hudson/model/JobTest.java
index 4d03ab278e24..f0d764be1570 100644
--- a/test/src/test/java/hudson/model/JobTest.java
+++ b/test/src/test/java/hudson/model/JobTest.java
@@ -201,6 +201,7 @@ public JobPropertyDescriptor getDescriptor() {
}
private static final class DescriptorImpl extends JobPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "";
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
index f49b4dd30ca7..152c606026c0 100644
--- a/test/src/test/java/hudson/model/QueueTest.java
+++ b/test/src/test/java/hudson/model/QueueTest.java
@@ -57,6 +57,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlFormUtil;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.xml.XmlPage;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.ExtensionList;
import hudson.Functions;
import hudson.Launcher;
@@ -1316,6 +1317,7 @@ public TopLevelItem newInstance(ItemGroup parent, String name) {
return new BrokenAffinityKeyProject(parent, name);
}
+ @NonNull
@Override
public String getDisplayName() {
return "Broken Affinity Key Project";
diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java
index dabbdda434a7..5ffaa4746ed7 100644
--- a/test/src/test/java/hudson/model/ViewTest.java
+++ b/test/src/test/java/hudson/model/ViewTest.java
@@ -56,6 +56,7 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement;
import com.gargoylesoftware.htmlunit.util.NameValuePair;
import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.ExtensionList;
import hudson.XmlFile;
import hudson.diagnosis.OldDataMonitor;
@@ -518,6 +519,7 @@ public PropertyImpl(String name) {
@TestExtension
public static class DescriptorImpl extends ViewPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Test property";
@@ -953,6 +955,7 @@ public String getId() {
return customId;
}
+ @NonNull
@Override
public String getDisplayName() {
return customDisplayName;
diff --git a/test/src/test/java/hudson/util/RobustReflectionConverterTest.java b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java
index eeffdf6a0871..529e00f32850 100644
--- a/test/src/test/java/hudson/util/RobustReflectionConverterTest.java
+++ b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java
@@ -33,6 +33,7 @@
import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.WebRequest;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.cli.CLICommandInvoker;
import hudson.diagnosis.OldDataMonitor;
import hudson.model.AbstractDescribableImpl;
@@ -115,6 +116,7 @@ private Object readResolve() throws Exception {
@TestExtension
public static class DescriptorImpl extends Descriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "AcceptOnlySpecificKeyword";
@@ -151,6 +153,7 @@ public AcceptOnlySpecificKeyword getCriticalField() {
@TestExtension
public static class DescriptorImpl extends JobPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "KeywordProperty";
diff --git a/test/src/test/java/jenkins/triggers/TriggerTest.java b/test/src/test/java/jenkins/triggers/TriggerTest.java
index 71b8e16fe8f2..03558553fa0f 100644
--- a/test/src/test/java/jenkins/triggers/TriggerTest.java
+++ b/test/src/test/java/jenkins/triggers/TriggerTest.java
@@ -90,6 +90,7 @@ public boolean isApplicable(Item item) {
return item instanceof BuildableItem;
}
+ @NonNull
@Override
public String getDisplayName() {
return "Bad";
diff --git a/test/src/test/java/lib/form/ComboBoxTest.java b/test/src/test/java/lib/form/ComboBoxTest.java
index 7f0dea860a8d..2884d118a7d6 100644
--- a/test/src/test/java/lib/form/ComboBoxTest.java
+++ b/test/src/test/java/lib/form/ComboBoxTest.java
@@ -30,6 +30,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlElementUtil;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.RelativePath;
import hudson.model.AbstractDescribableImpl;
@@ -153,6 +154,7 @@ public static class XssProperty extends OptionalJobProperty> {
@TestExtension("testEnsureXssNotPossible")
public static class DescriptorImpl extends OptionalJobProperty.OptionalJobPropertyDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "XSS Property";
diff --git a/test/src/test/java/lib/form/HeteroListTest.java b/test/src/test/java/lib/form/HeteroListTest.java
index 071b7dd55df3..c2c5b93b9f50 100644
--- a/test/src/test/java/lib/form/HeteroListTest.java
+++ b/test/src/test/java/lib/form/HeteroListTest.java
@@ -37,6 +37,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLAnchorElement;
import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.ExtensionList;
import hudson.model.Describable;
import hudson.model.Descriptor;
@@ -217,6 +218,7 @@ public Descriptor getDescriptor() {
public static class DynamicDisplayNameDescriptor extends Descriptor {
public String displayName = "NotYetDefined";
+ @NonNull
@Override
public String getDisplayName() {
return displayName;
@@ -258,6 +260,7 @@ public Xss(String name, String home, List> properties)
public static class DescriptorImpl extends ToolDescriptor {
private Xss[] installations = new Xss[0];
+ @NonNull
@Override
public String getDisplayName() {
return "XSS: 
";
diff --git a/test/src/test/java/lib/form/SecretTextareaTest.java b/test/src/test/java/lib/form/SecretTextareaTest.java
index 802cc0d4270f..ba980b235eaf 100644
--- a/test/src/test/java/lib/form/SecretTextareaTest.java
+++ b/test/src/test/java/lib/form/SecretTextareaTest.java
@@ -31,6 +31,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlHiddenInput;
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.model.AbstractProject;
import hudson.model.Project;
import hudson.tasks.BuildStepDescriptor;
@@ -160,6 +161,7 @@ public void setDescription(String description) {
@TestExtension
public static class DescriptorImpl extends BuildStepDescriptor {
+ @NonNull
@Override
public String getDisplayName() {
return "Test Secret";
From 741b6cc57c929d168f3a6393a7f936893fccafbc Mon Sep 17 00:00:00 2001
From: Vincent Latombe
Date: Tue, 31 May 2022 23:00:57 +0200
Subject: [PATCH 14/64] [JENKINS-68640] Fix z-index of #bottom-sticker vs.
#top-sticker (#6613)
---
war/src/main/less/base/style.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index dbd7484802d7..d587a3ee448b 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -469,7 +469,7 @@ div.behavior-loading {
bottom: -1px;
margin-left: -2rem;
width: calc(100% + 4rem); /* it needs to occupy the entire width or else the underlying content will see through */
- z-index: 999;
+ z-index: 998; /* behind top-sticker */
}
.bottom-sticker-inner {
From fe0488918f1cb348fc010ec583e74e26ff183576 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 1 Jun 2022 08:01:46 +0100
Subject: [PATCH 15/64] Update font stack to use 'system-ui' (#6614)
---
war/src/main/less/abstracts/theme.less | 2 +-
war/src/main/less/styles.less | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/theme.less
index 35a80e748d26..6d5cdf05b242 100644
--- a/war/src/main/less/abstracts/theme.less
+++ b/war/src/main/less/abstracts/theme.less
@@ -1,6 +1,6 @@
:root, .app-theme-picker__picker[data-theme=none] {
// Font related properties
- --font-family-sans: -apple-system, blinkmacsystemfont, "Segoe UI", roboto, "Noto Sans", oxygen, ubuntu, cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ --font-family-sans: system-ui, "Segoe UI", roboto, "Noto Sans", oxygen, ubuntu, cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
--font-family-mono: ui-monospace, SFMono-Regular, SF Mono, JetBrainsMono, Consolas, monospace;
--font-size-base: 1rem; // 16px
--font-size-sm: 0.875rem; // 14px
diff --git a/war/src/main/less/styles.less b/war/src/main/less/styles.less
index e42688bbc720..07e8270b7d49 100644
--- a/war/src/main/less/styles.less
+++ b/war/src/main/less/styles.less
@@ -8,7 +8,7 @@ html {
// The downside is that the page does not resize with the browser's font size,
// only with the zoom level.
font-size: 16px !important;
- letter-spacing: -0.011em;
+ letter-spacing: -0.016em;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
From 738cd6e4740d2e4e94a78bd03df15d06f3747106 Mon Sep 17 00:00:00 2001
From: Vincent Latombe
Date: Wed, 1 Jun 2022 10:22:08 +0200
Subject: [PATCH 16/64] [JENKINS-68542] Store inbound cookie key in connection
state (#6576)
---
core/src/main/java/hudson/cli/CLIAction.java | 2 +-
.../java/hudson/slaves/SlaveComputer.java | 2 +-
.../java/jenkins/agents/WebSocketAgents.java | 13 ++++++++++--
.../java/jenkins/websocket/WebSocketEcho.java | 5 +++--
.../jenkins/websocket/WebSocketSession.java | 21 ++++++++++---------
pom.xml | 2 +-
6 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java
index d42e974452a2..31d4700e4cb1 100644
--- a/core/src/main/java/hudson/cli/CLIAction.java
+++ b/core/src/main/java/hudson/cli/CLIAction.java
@@ -136,7 +136,7 @@ public void close() throws IOException {
}
}
- private void doClose() {
+ private void doClose() throws IOException {
close();
}
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index a2e7d9195822..0f8b9255357b 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -921,7 +921,7 @@ private void closeChannel() {
if (c != null) {
try {
c.close();
- } catch (IOException e) {
+ } catch (Exception e) {
logger.log(Level.SEVERE, "Failed to terminate channel to " + getDisplayName(), e);
}
Listeners.notify(ComputerListener.class, true, l -> l.onOffline(this, offlineCause));
diff --git a/core/src/main/java/jenkins/agents/WebSocketAgents.java b/core/src/main/java/jenkins/agents/WebSocketAgents.java
index 4c4451b974fe..f3953106dadf 100644
--- a/core/src/main/java/jenkins/agents/WebSocketAgents.java
+++ b/core/src/main/java/jenkins/agents/WebSocketAgents.java
@@ -27,6 +27,7 @@
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Extension;
import hudson.ExtensionList;
+import hudson.Util;
import hudson.model.Computer;
import hudson.model.InvisibleAction;
import hudson.model.UnprotectedRootAction;
@@ -89,16 +90,24 @@ public HttpResponse doIndex(StaplerRequest req, StaplerResponse rsp) throws IOEx
state.setRemoteEndpointDescription(req.getRemoteAddr());
state.fireBeforeProperties();
LOGGER.fine(() -> "connecting " + agent);
- // TODO or just pass all request headers?
Map properties = new HashMap<>();
properties.put(JnlpConnectionState.CLIENT_NAME_KEY, agent);
properties.put(JnlpConnectionState.SECRET_KEY, secret);
+ String unsafeCookie = req.getHeader(Engine.WEBSOCKET_COOKIE_HEADER);
+ String cookie;
+ if (unsafeCookie != null) {
+ // This will blow up if the client sent us a malformed cookie.
+ cookie = Util.toHexString(Util.fromHexString(unsafeCookie));
+ } else {
+ cookie = JnlpAgentReceiver.generateCookie();
+ }
+ properties.put(JnlpConnectionState.COOKIE_KEY, cookie);
state.fireAfterProperties(Collections.unmodifiableMap(properties));
Capability remoteCapability = Capability.fromASCII(remoteCapabilityStr);
LOGGER.fine(() -> "received " + remoteCapability);
rsp.setHeader(Capability.KEY, new Capability().toASCII());
rsp.setHeader(Engine.REMOTING_MINIMUM_VERSION_HEADER, RemotingVersionInfo.getMinimumSupportedVersion().toString());
- rsp.setHeader(JnlpConnectionState.COOKIE_KEY, JnlpAgentReceiver.generateCookie()); // TODO figure out what this is for, if anything
+ rsp.setHeader(Engine.WEBSOCKET_COOKIE_HEADER, cookie);
return WebSockets.upgrade(new Session(state, agent, remoteCapability));
}
diff --git a/core/src/main/java/jenkins/websocket/WebSocketEcho.java b/core/src/main/java/jenkins/websocket/WebSocketEcho.java
index 6b370bba5f69..b1576690ba8b 100644
--- a/core/src/main/java/jenkins/websocket/WebSocketEcho.java
+++ b/core/src/main/java/jenkins/websocket/WebSocketEcho.java
@@ -27,6 +27,7 @@
import hudson.Extension;
import hudson.model.InvisibleAction;
import hudson.model.RootAction;
+import java.io.IOException;
import java.nio.ByteBuffer;
import jenkins.model.Jenkins;
import org.kohsuke.accmod.Restricted;
@@ -46,12 +47,12 @@ public HttpResponse doIndex() {
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
return WebSockets.upgrade(new WebSocketSession() {
@Override
- protected void text(String message) {
+ protected void text(String message) throws IOException {
sendText("hello " + message);
}
@Override
- protected void binary(byte[] payload, int offset, int len) {
+ protected void binary(byte[] payload, int offset, int len) throws IOException {
ByteBuffer data = ByteBuffer.allocate(len);
for (int i = 0; i < len; i++) {
byte b = payload[offset + i];
diff --git a/core/src/main/java/jenkins/websocket/WebSocketSession.java b/core/src/main/java/jenkins/websocket/WebSocketSession.java
index 4eb36ed4e167..341be5ea71c5 100644
--- a/core/src/main/java/jenkins/websocket/WebSocketSession.java
+++ b/core/src/main/java/jenkins/websocket/WebSocketSession.java
@@ -24,6 +24,7 @@
package jenkins.websocket;
+import java.io.IOException;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
import java.util.concurrent.Future;
@@ -114,45 +115,45 @@ protected void error(Throwable cause) {
LOGGER.log(Level.WARNING, "unhandled WebSocket service error", cause);
}
- protected void binary(byte[] payload, int offset, int len) {
+ protected void binary(byte[] payload, int offset, int len) throws IOException {
LOGGER.warning("unexpected binary frame");
}
- protected void text(String message) {
+ protected void text(String message) throws IOException {
LOGGER.warning("unexpected text frame");
}
@SuppressWarnings("unchecked")
- protected final Future sendBinary(ByteBuffer data) {
+ protected final Future sendBinary(ByteBuffer data) throws IOException {
try {
return (Future) remoteEndpoint.getClass().getMethod("sendBytesByFuture", ByteBuffer.class).invoke(remoteEndpoint, data);
} catch (Exception x) {
- throw new RuntimeException(x);
+ throw new IOException(x);
}
}
- protected final void sendBinary(ByteBuffer partialByte, boolean isLast) {
+ protected final void sendBinary(ByteBuffer partialByte, boolean isLast) throws IOException {
try {
remoteEndpoint.getClass().getMethod("sendPartialBytes", ByteBuffer.class, boolean.class).invoke(remoteEndpoint, partialByte, isLast);
} catch (Exception x) {
- throw new RuntimeException(x);
+ throw new IOException(x);
}
}
@SuppressWarnings("unchecked")
- protected final Future sendText(String text) {
+ protected final Future sendText(String text) throws IOException {
try {
return (Future) remoteEndpoint.getClass().getMethod("sendStringByFuture", String.class).invoke(remoteEndpoint, text);
} catch (Exception x) {
- throw new RuntimeException(x);
+ throw new IOException(x);
}
}
- protected final void close() {
+ protected final void close() throws IOException {
try {
session.getClass().getMethod("close").invoke(session);
} catch (Exception x) {
- throw new RuntimeException(x);
+ throw new IOException(x);
}
}
diff --git a/pom.xml b/pom.xml
index 19ad1290b764..e1026dfcf32c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@ THE SOFTWARE.
https://www.jenkins.io/changelog
- 4.14
+ 3025.vf64a_a_3da_6b_55
3.14
From 98b31467e1373c762b826b8875c15398c5ec167d Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Wed, 1 Jun 2022 08:54:55 +0000
Subject: [PATCH 17/64] [maven-release-plugin] prepare release jenkins-2.350
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 4 ++--
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index a2929a173b77..b5c182a888b9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.350
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 2bfaf2dd6a86..6b34b9df85dc 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.350
cli
diff --git a/core/pom.xml b/core/pom.xml
index 27554bf94680..df726a01fccf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.350
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 9f27c8d11cf0..d2510e487c81 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.350
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index 19ad1290b764..1049d69d637b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.350
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- ${scmTag}
+ jenkins-2.350
https://github.com/jenkinsci/jenkins
diff --git a/test/pom.xml b/test/pom.xml
index 883edac759f0..7bf2108e6bac 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.350
jenkins-test
diff --git a/war/pom.xml b/war/pom.xml
index dfc597a0ae46..229f997d4fa5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.350
jenkins-war
From f742e180eb9a2fbce735a6025f4dab814006ceb3 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Wed, 1 Jun 2022 08:55:16 +0000
Subject: [PATCH 18/64] [maven-release-plugin] prepare for next development
iteration
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 6 +++---
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index b5c182a888b9..a2929a173b77 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.350
+ ${revision}${changelist}
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 6b34b9df85dc..2bfaf2dd6a86 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.350
+ ${revision}${changelist}
cli
diff --git a/core/pom.xml b/core/pom.xml
index df726a01fccf..27554bf94680 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.350
+ ${revision}${changelist}
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index d2510e487c81..9f27c8d11cf0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.350
+ ${revision}${changelist}
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index 1049d69d637b..8f922fe53412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.350
+ ${revision}${changelist}
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- jenkins-2.350
+ ${scmTag}
https://github.com/jenkinsci/jenkins
@@ -71,7 +71,7 @@ THE SOFTWARE.
- 2.350
+ 2.351
-SNAPSHOT
${number}
+
Date: Thu, 2 Jun 2022 23:47:51 +0200
Subject: [PATCH 21/64] Optional property can now have an inline help (#6615)
---
core/src/main/resources/lib/form/optionalProperty.jelly | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/src/main/resources/lib/form/optionalProperty.jelly b/core/src/main/resources/lib/form/optionalProperty.jelly
index 1afe8e5f538b..5d646235fdef 100644
--- a/core/src/main/resources/lib/form/optionalProperty.jelly
+++ b/core/src/main/resources/lib/form/optionalProperty.jelly
@@ -33,12 +33,13 @@ THE SOFTWARE.
and the presence of the value.
+
1.27
1.23
5.8.2
- 4.6.0
+ 4.6.1
2.22.5
From c63a8cee6757136433c3d1320a05c8721c11bc6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:31:32 -0700
Subject: [PATCH 23/64] Bump `cloudbees-folder` from 6.722.v8165b_a_cf25e9 to
6.729.v2b_9d1a_74d673 (#6622)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
test/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/pom.xml b/test/pom.xml
index 13a768775bf2..8c2ab093c5fe 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -145,7 +145,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
cloudbees-folder
- 6.722.v8165b_a_cf25e9
+ 6.729.v2b_9d1a_74d673
test
From 5b4434c16f85b95e4d83caf7250b58a98d3e6913 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:31:51 -0700
Subject: [PATCH 24/64] Bump Spotless from 2.22.5 to 2.22.6 (#6623)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a975a7e75c7c..3e278982eea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@ THE SOFTWARE.
1.23
5.8.2
4.6.1
- 2.22.5
+ 2.22.6
2.22.2
From b650de6960c8ba99780fc6f653dcf4b9f7a877a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:32:12 -0700
Subject: [PATCH 25/64] Bump `jenkins-test-harness` from 1752.v86627a_c48d91 to
1753.v45c760e2400f (#6624)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
test/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/pom.xml b/test/pom.xml
index 8c2ab093c5fe..3bb7f0e85dca 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -85,7 +85,7 @@ THE SOFTWARE.
${project.groupId}
jenkins-test-harness
- 1752.v86627a_c48d91
+ 1753.v45c760e2400f
test
From 295485eeaeec856f295c38d999c6fb3c656f234c Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 7 Jun 2022 19:15:18 +0000
Subject: [PATCH 26/64] [maven-release-plugin] prepare release jenkins-2.351
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 4 ++--
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index a2929a173b77..749b3703c065 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.351
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 2bfaf2dd6a86..8d737930bfb6 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.351
cli
diff --git a/core/pom.xml b/core/pom.xml
index 27554bf94680..10abe04f57ae 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.351
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 9f27c8d11cf0..f2d3b1b9ad8e 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.351
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index 3e278982eea6..b0233d780a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.351
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- ${scmTag}
+ jenkins-2.351
https://github.com/jenkinsci/jenkins
diff --git a/test/pom.xml b/test/pom.xml
index 3bb7f0e85dca..649e0fb8c85c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.351
jenkins-test
diff --git a/war/pom.xml b/war/pom.xml
index dfc597a0ae46..24201e2b8c9a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.351
jenkins-war
From ceddca397270e7600a8f38c15bff1116865111cb Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 7 Jun 2022 19:15:40 +0000
Subject: [PATCH 27/64] [maven-release-plugin] prepare for next development
iteration
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 6 +++---
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 749b3703c065..a2929a173b77 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.351
+ ${revision}${changelist}
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 8d737930bfb6..2bfaf2dd6a86 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.351
+ ${revision}${changelist}
cli
diff --git a/core/pom.xml b/core/pom.xml
index 10abe04f57ae..27554bf94680 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.351
+ ${revision}${changelist}
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index f2d3b1b9ad8e..9f27c8d11cf0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.351
+ ${revision}${changelist}
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index b0233d780a53..bce2ac2c0f0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.351
+ ${revision}${changelist}
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- jenkins-2.351
+ ${scmTag}
https://github.com/jenkinsci/jenkins
@@ -71,7 +71,7 @@ THE SOFTWARE.
- 2.351
+ 2.352
-SNAPSHOT
clean install
- -DskipTests -Danimal.sniffer.skip=false javadoc:javadoc deploy
+ -DskipTests -Danimal.sniffer.skip=false -Dspotbugs.skip -Dmaven.checkstyle.skip -Dspotless.check.skip generate-resources javadoc:javadoc deploy
false
true
jenkins-@{project.version}
From 929e2d5e5abcffc833e74a5346494789c2bf2c51 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 8 Jun 2022 16:28:06 +0100
Subject: [PATCH 35/64] Update mixins.less
---
war/src/main/less/abstracts/mixins.less | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/war/src/main/less/abstracts/mixins.less b/war/src/main/less/abstracts/mixins.less
index d51d0025294a..f6a147ba8dca 100644
--- a/war/src/main/less/abstracts/mixins.less
+++ b/war/src/main/less/abstracts/mixins.less
@@ -90,4 +90,10 @@
box-shadow: 0 0 0 5px var(--longhorn-box-shadow--focus);
}
}
+
+ &:focus-visible {
+ &::after {
+ box-shadow: 0 0 0 5px var(--text-color);
+ }
+ }
}
From 68f5425a7b67b5f13a9b14007c81dd752c71cae7 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 8 Jun 2022 16:40:41 +0100
Subject: [PATCH 36/64] Update theme.less
---
war/src/main/less/abstracts/theme.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/theme.less
index b19f127eb1dd..63d37e8c7d8b 100644
--- a/war/src/main/less/abstracts/theme.less
+++ b/war/src/main/less/abstracts/theme.less
@@ -14,7 +14,7 @@
// Color palette
--white: #fff;
--very-light-grey: #f8f8f8;
- --light-grey: #f2f2f2;
+ --light-grey: hsl(240, 0.2, 0.965);
--medium-grey: #9ba7af;
--dark-grey: #4d545d;
--black: hsl(240, 0.2, 0.1);
From adb1028f7c63d295e83620a54344f9495b0053e4 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Wed, 8 Jun 2022 17:35:50 +0000
Subject: [PATCH 37/64] [maven-release-plugin] prepare release jenkins-2.354
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 4 ++--
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index a2929a173b77..90e52b379879 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.354
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 2bfaf2dd6a86..1e7bfdf8d9ad 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.354
cli
diff --git a/core/pom.xml b/core/pom.xml
index 27554bf94680..3a0c7d738135 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.354
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 9f27c8d11cf0..035abb0b0c87 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.354
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index efd241cbbd6d..7d073653a025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.354
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- ${scmTag}
+ jenkins-2.354
https://github.com/jenkinsci/jenkins
diff --git a/test/pom.xml b/test/pom.xml
index 3bb7f0e85dca..5b0bfe3ce618 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.354
jenkins-test
diff --git a/war/pom.xml b/war/pom.xml
index dfc597a0ae46..e00db507ec6c 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.354
jenkins-war
From 3d2692776360d36819fda9e8deb9723521698e76 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Wed, 8 Jun 2022 17:36:13 +0000
Subject: [PATCH 38/64] [maven-release-plugin] prepare for next development
iteration
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 6 +++---
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 90e52b379879..a2929a173b77 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.354
+ ${revision}${changelist}
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 1e7bfdf8d9ad..2bfaf2dd6a86 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.354
+ ${revision}${changelist}
cli
diff --git a/core/pom.xml b/core/pom.xml
index 3a0c7d738135..27554bf94680 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.354
+ ${revision}${changelist}
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 035abb0b0c87..9f27c8d11cf0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.354
+ ${revision}${changelist}
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index 7d073653a025..d0efa5fad27d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.354
+ ${revision}${changelist}
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- jenkins-2.354
+ ${scmTag}
https://github.com/jenkinsci/jenkins
@@ -71,7 +71,7 @@ THE SOFTWARE.
- 2.354
+ 2.355
-SNAPSHOT
@@ -109,8 +108,9 @@ THE SOFTWARE.
-
-
diff --git a/core/src/main/resources/lib/form/select/select.js b/core/src/main/resources/lib/form/select/select.js
index 09a4bc385ac7..5e6eeb123f15 100644
--- a/core/src/main/resources/lib/form/select/select.js
+++ b/core/src/main/resources/lib/form/select/select.js
@@ -11,12 +11,12 @@ function updateListBox(listBox,url,config) {
// form entry using tables-to-divs markup.
function getStatusElement() {
function getStatusForTabularForms() {
- return findFollowingTR(listBox, "validation-error-area").firstElementChild.nextSibling;
+ return listBox.parentNode.querySelector(".validation-error-area");
}
function getStatusForDivBasedForms() {
var settingMain = listBox.closest('.setting-main')
if (!settingMain) {
- console.warn("Couldn't find the expected parent element (.setting-main) for element", listBox)
+ console.warn("Couldn't find the expected validation element (.validation-error-area) for element", listBox.parentNode)
return;
}
diff --git a/core/src/main/resources/lib/form/validateButton.jelly b/core/src/main/resources/lib/form/validateButton.jelly
index ba8f19252703..ff98731b5d48 100644
--- a/core/src/main/resources/lib/form/validateButton.jelly
+++ b/core/src/main/resources/lib/form/validateButton.jelly
@@ -51,16 +51,18 @@ THE SOFTWARE.
- domNodes = htmlPage.getDocumentElement().querySelectorAll("*");
- assertThat(domNodes, hasSize(5));
+ assertThat(domNodes, hasSize(4));
assertEquals("head", domNodes.get(0).getNodeName());
assertEquals("body", domNodes.get(1).getNodeName());
assertEquals("div", domNodes.get(2).getNodeName());
- assertEquals("img", domNodes.get(3).getNodeName());
- assertEquals("a", domNodes.get(4).getNodeName());
+ assertEquals("a", domNodes.get(3).getNodeName());
// only: ">
// the first double quote was escaped during creation (with the backslash)
String unquotedLabel = Label.parseExpression(label).getName();
- HtmlAnchor anchor = (HtmlAnchor) domNodes.get(4);
+ HtmlAnchor anchor = (HtmlAnchor) domNodes.get(3);
assertThat(anchor.getHrefAttribute(), containsString(Util.rawEncode(unquotedLabel)));
assertThat(responseContent, containsString("ok"));
diff --git a/test/src/test/java/lib/form/NumberTest.java b/test/src/test/java/lib/form/NumberTest.java
index 0bef86dbc26f..d12840495522 100644
--- a/test/src/test/java/lib/form/NumberTest.java
+++ b/test/src/test/java/lib/form/NumberTest.java
@@ -177,7 +177,7 @@ private String typeValueAndGetErrorMessage(HtmlInput input, String value) throws
input.reset(); // Remove the value that already in the
input.type(value); // Type value to
input.fireEvent(Event.TYPE_CHANGE); // The error message is triggered by change event
- return input.getParentNode().getNextSibling().getChildNodes().get(1).getChildNodes().get(0).getTextContent();
+ return input.getParentNode().getNextSibling().getTextContent();
}
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index d587a3ee448b..042597244d19 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -542,64 +542,6 @@ div.behavior-loading {
padding: 0;
}
-
-/* ======================== error/warning message (mainly in the form.) Use them on block elements ======================== */
-.error {
- color: #c00;
- font-weight: bold;
- padding-left: 20px;
- min-height: 16px;
- line-height: 16px;
- background-image: url("../../images/svgs/error.svg");
- background-position: left top;
- background-repeat: no-repeat;
- background-size: 16px 16px;
-}
-
-.error-inline {
- color: #c00;
- font-weight: bold;
-}
-
-.warning {
- color: #c4a000;
- font-weight: bold;
- padding-left: 20px;
- min-height: 16px;
- line-height: 16px;
- background-image: url("../../images/svgs/warning.svg");
- background-position: left top;
- background-repeat: no-repeat;
- background-size: 16px 16px;
-}
-
-.warning-inline {
- color: #c4a000;
- font-weight: bold;
-}
-
-.info {
- position: relative;
- color: var(--text-color);
- font-weight: bold;
- min-height: 16px;
- padding-left: 30px;
-
- &::before {
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- width: 20px;
- background: currentColor;
- mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='ionicon' viewBox='0 0 512 512'%3E%3Ctitle%3EArrow Forward%3C/title%3E%3Cpath fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='32' d='M268 112l144 144-144 144M392 256H100'/%3E%3C/svg%3E");
- mask-position: center;
- mask-size: contain;
- mask-repeat: no-repeat;
- }
-}
-
.icon16x16 {
width: 16px;
height: 16px;
diff --git a/war/src/main/less/form/validation.less b/war/src/main/less/form/validation.less
new file mode 100644
index 000000000000..3d2a18c04d82
--- /dev/null
+++ b/war/src/main/less/form/validation.less
@@ -0,0 +1,84 @@
+.validation-error-area {
+ transition: var(--standard-transition);
+ opacity: 0;
+ height: 0;
+ overflow: hidden;
+}
+
+.validation-error-area--visible {
+ margin-top: 0.75rem;
+ opacity: 1;
+
+ & > * {
+ animation: animate-validation-error-area var(--standard-transition);
+ }
+}
+
+@keyframes animate-validation-error-area {
+ from {
+ opacity: 0;
+ }
+ to {
+ opacity: 1;
+ }
+}
+
+.error,
+.warning,
+.info {
+ position: relative;
+ padding-left: calc(22px + 0.4rem);
+ font-weight: 500;
+
+ &::before {
+ content: "";
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ width: 22px;
+ height: 22px;
+ background-color: currentColor;
+ mask-position: top center;
+ mask-repeat: no-repeat;
+ mask-size: contain;
+ }
+}
+
+.ok {
+ color: var(--text-color-secondary);
+}
+
+.error {
+ color: var(--red);
+
+ &::before {
+ mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='512' height='512' viewBox='0 0 512 512'%3E%3Ctitle%3Eionicons-v5-a%3C/title%3E%3Cpath d='M256,48C141.31,48,48,141.31,48,256s93.31,208,208,208,208-93.31,208-208S370.69,48,256,48Zm0,319.91a20,20,0,1,1,20-20A20,20,0,0,1,256,367.91Zm21.72-201.15-5.74,122a16,16,0,0,1-32,0l-5.74-121.94v-.05a21.74,21.74,0,1,1,43.44,0Z'/%3E%3C/svg%3E");
+ }
+}
+
+.error-inline {
+ color: var(--red);
+ font-weight: 500;
+}
+
+.warning {
+ color: var(--orange);
+
+ &::before {
+ mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='512' height='512' viewBox='0 0 512 512'%3E%3Ctitle%3Eionicons-v5-r%3C/title%3E%3Cpath d='M449.07,399.08,278.64,82.58c-12.08-22.44-44.26-22.44-56.35,0L51.87,399.08A32,32,0,0,0,80,446.25H420.89A32,32,0,0,0,449.07,399.08Zm-198.6-1.83a20,20,0,1,1,20-20A20,20,0,0,1,250.47,397.25ZM272.19,196.1l-5.74,122a16,16,0,0,1-32,0l-5.74-121.95v0a21.73,21.73,0,0,1,21.5-22.69h.21a21.74,21.74,0,0,1,21.73,22.7Z'/%3E%3C/svg%3E");
+ }
+}
+
+.warning-inline {
+ color: var(--orange);
+ font-weight: 500;
+}
+
+.info {
+ color: var(--text-color);
+
+ &::before {
+ mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='ionicon' viewBox='0 0 512 512'%3E%3Ctitle%3EArrow Forward%3C/title%3E%3Cpath fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='32' d='M268 112l144 144-144 144M392 256H100'/%3E%3C/svg%3E");
+ }
+}
diff --git a/war/src/main/less/modules/buttons-temp.less b/war/src/main/less/modules/buttons-temp.less
index dc032fd11ca3..610a30464b99 100644
--- a/war/src/main/less/modules/buttons-temp.less
+++ b/war/src/main/less/modules/buttons-temp.less
@@ -131,3 +131,19 @@ each(@variants, {
}
}
});
+
+.jenkins-validate-button__container {
+ &__status {
+ .validation-error-area {
+ min-height: 36px !important;
+ }
+ }
+
+ .validation-error-area--visible {
+ margin-top: 0;
+ }
+
+ & > span {
+ float: right;
+ }
+}
diff --git a/war/src/main/less/styles.less b/war/src/main/less/styles.less
index 07e8270b7d49..016485215580 100644
--- a/war/src/main/less/styles.less
+++ b/war/src/main/less/styles.less
@@ -32,6 +32,7 @@ html {
@import './form/search';
@import './form/select';
@import './form/toggle-switch';
+@import './form/validation';
@import './modules/app-bar';
@import './modules/badges';
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 1e94eb6f928e..c3aebaaa8b2e 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -232,7 +232,7 @@ var FormChecker = {
this.sendRequest(next.url, {
method : next.method,
onComplete : function(x) {
- applyErrorMessage(next.target, x);
+ updateValidationArea(next.target, x.responseText);
FormChecker.inProgress--;
FormChecker.schedule();
layoutUpdateCallback.call();
@@ -500,16 +500,53 @@ var tooltip;
// Behavior rules
//========================================================
// using tag names in CSS selector makes the processing faster
+
+
+/**
+ * Updates the validation area for a form element
+ * @param {HTMLElement} validationArea The validation area for a given form element
+ * @param {string} content The content to update the validation area with
+ */
+function updateValidationArea(validationArea, content) {
+ validationArea.classList.add("validation-error-area--visible");
+
+ if (content === "") {
+ validationArea.classList.remove("validation-error-area--visible");
+ validationArea.style.height = "0px";
+ validationArea.innerHTML = content;
+ } else {
+ // Only change content if different, causes an unnecessary animation otherwise
+ if (validationArea.innerHTML !== content) {
+ validationArea.innerHTML = content;
+ validationArea.style.height = validationArea.children[0].offsetHeight + "px";
+
+ // Only include the notice in the validation-error-area, move all other elements out
+ if (validationArea.children.length > 1) {
+ Array.from(validationArea.children).slice(1).forEach((element) => {
+ validationArea.after(element);
+ })
+ }
+
+ Behaviour.applySubtree(validationArea);
+ // For errors with additional details, apply the subtree to the expandable details pane
+ if (validationArea.nextElementSibling) {
+ Behaviour.applySubtree(validationArea.nextElementSibling);
+ }
+ }
+ }
+}
+
function registerValidator(e) {
// Retrieve the validation error area
- var tr = findFollowingTR(e, "validation-error-area");
+ var tr = e.closest(".jenkins-form-item").querySelector(".validation-error-area");
if (!tr) {
- console.warn("Couldn't find the expected parent element (.setting-main) for element", e)
+ console.warn("Couldn't find the expected validation element (.validation-error-area) for element",
+ e.closest(".jenkins-form-item"))
return;
}
// find the validation-error-area
- e.targetElement = tr.firstElementChild.nextSibling;
+ e.targetElement = tr;
e.targetUrl = function() {
var url = this.getAttribute("checkUrl");
@@ -545,19 +582,13 @@ function registerValidator(e) {
}
var checker = function() {
- var target = this.targetElement;
+ const validationArea = this.targetElement;
FormChecker.sendRequest(this.targetUrl(), {
method : method,
- onComplete : function(x) {
- if (x.status == 200) {
- // All FormValidation responses are 200
- target.innerHTML = x.responseText;
- } else {
- // Content is taken from FormValidation#_errorWithMarkup
- // TODO Add i18n support
- target.innerHTML = " implements ExtensionPoint {
/**
diff --git a/core/src/main/java/jenkins/security/ImpersonatingExecutorService.java b/core/src/main/java/jenkins/security/ImpersonatingExecutorService.java
index daf2cc6b0f43..d535f05f756d 100644
--- a/core/src/main/java/jenkins/security/ImpersonatingExecutorService.java
+++ b/core/src/main/java/jenkins/security/ImpersonatingExecutorService.java
@@ -24,6 +24,7 @@
package jenkins.security;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.security.ACL;
import hudson.security.ACLContext;
import java.util.concurrent.Callable;
@@ -36,6 +37,7 @@
* @see SecurityContextExecutorService
* @since 2.51
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public final class ImpersonatingExecutorService extends InterceptingExecutorService {
private final Authentication authentication;
diff --git a/core/src/main/java/jenkins/security/ImpersonatingScheduledExecutorService.java b/core/src/main/java/jenkins/security/ImpersonatingScheduledExecutorService.java
index 788806869520..adf482d1cff5 100644
--- a/core/src/main/java/jenkins/security/ImpersonatingScheduledExecutorService.java
+++ b/core/src/main/java/jenkins/security/ImpersonatingScheduledExecutorService.java
@@ -24,6 +24,7 @@
package jenkins.security;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.security.ACL;
import hudson.security.ACLContext;
import java.util.concurrent.Callable;
@@ -35,6 +36,7 @@
* Variant of {@link ImpersonatingExecutorService} for scheduled services.
* @since 2.51
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public final class ImpersonatingScheduledExecutorService extends InterceptingScheduledExecutorService {
private final Authentication authentication;
diff --git a/core/src/main/java/jenkins/security/SecurityContextExecutorService.java b/core/src/main/java/jenkins/security/SecurityContextExecutorService.java
index e2dfe2b9452e..f464ef8e6863 100644
--- a/core/src/main/java/jenkins/security/SecurityContextExecutorService.java
+++ b/core/src/main/java/jenkins/security/SecurityContextExecutorService.java
@@ -27,6 +27,7 @@
import static org.springframework.security.core.context.SecurityContextHolder.getContext;
import static org.springframework.security.core.context.SecurityContextHolder.setContext;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import jenkins.util.InterceptingExecutorService;
@@ -43,6 +44,7 @@
* @author Kohsuke Kawaguchi
* @since 1.561
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public class SecurityContextExecutorService extends InterceptingExecutorService {
public SecurityContextExecutorService(ExecutorService service) {
diff --git a/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java b/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java
index 6347842856f1..3e7dd9f0f3ef 100644
--- a/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java
+++ b/core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java
@@ -44,6 +44,7 @@
* @author Kohsuke Kawaguchi
* @see AtmostOneThreadExecutor
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public class AtmostOneTaskExecutor {
private static final Logger LOGGER = Logger.getLogger(AtmostOneTaskExecutor.class.getName());
diff --git a/core/src/main/java/jenkins/util/ContextResettingExecutorService.java b/core/src/main/java/jenkins/util/ContextResettingExecutorService.java
index 8492719491ea..bbfa5e772da9 100644
--- a/core/src/main/java/jenkins/util/ContextResettingExecutorService.java
+++ b/core/src/main/java/jenkins/util/ContextResettingExecutorService.java
@@ -1,5 +1,6 @@
package jenkins.util;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -11,6 +12,7 @@
*
* @author Kohsuke Kawaguchi
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public class ContextResettingExecutorService extends InterceptingExecutorService {
public ContextResettingExecutorService(ExecutorService base) {
super(base);
diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java
index 42ef0b76861a..b71482da2d24 100644
--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
+++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
@@ -25,6 +25,7 @@
package jenkins.util;
import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.model.AbstractItem;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
@@ -73,6 +74,7 @@
* {@code ui-samples-plugin} demonstrates all this.
* @since 1.484
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_THROWABLE", justification = "TODO needs triage")
public abstract class ProgressiveRendering {
private static final Logger LOG = Logger.getLogger(ProgressiveRendering.class.getName());
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java
index 1eaf27beac4d..7b8d5f5afb2f 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/AbstractUserDetailsAuthenticationProvider.java
@@ -24,6 +24,7 @@
package org.acegisecurity.providers.dao;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.acegisecurity.AcegiSecurityException;
import org.acegisecurity.Authentication;
import org.acegisecurity.AuthenticationException;
@@ -35,6 +36,7 @@
* @deprecated use {@link org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider}
*/
@Deprecated
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_RUNTIMEEXCEPTION", justification = "TODO needs triage")
public abstract class AbstractUserDetailsAuthenticationProvider implements AuthenticationProvider {
private final org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider delegate =
diff --git a/pom.xml b/pom.xml
index d0efa5fad27d..90f7f0cbfd18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci
jenkins
- 1.74
+ 1.76
diff --git a/src/spotbugs/spotbugs-excludes.xml b/src/spotbugs/spotbugs-excludes.xml
index d848c9bc6a45..1e6be9807dbd 100644
--- a/src/spotbugs/spotbugs-excludes.xml
+++ b/src/spotbugs/spotbugs-excludes.xml
@@ -573,6 +573,194 @@
+
+
+
+
+
+
+
+
+
+
+
Date: Fri, 10 Jun 2022 10:30:20 -0700
Subject: [PATCH 43/64] Preserve dumpstream on Maven failure (#6641)
---
Jenkinsfile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8016e9d91363..05f5fbf2398c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,9 +61,13 @@ for (i = 0; i < buildTypes.size(); i++) {
'clean',
'install',
]
- infra.runMaven(mavenOptions, jdk)
- if (isUnix()) {
- sh 'git add . && git diff --exit-code HEAD'
+ try {
+ infra.runMaven(mavenOptions, jdk)
+ if (isUnix()) {
+ sh 'git add . && git diff --exit-code HEAD'
+ }
+ } finally {
+ archiveArtifacts allowEmptyArchive: true, artifacts: '**/target/surefire-reports/*.dumpstream'
}
}
}
@@ -71,7 +75,6 @@ for (i = 0; i < buildTypes.size(); i++) {
// Once we've built, archive the artifacts and the test results.
stage("${buildType} Publishing") {
- archiveArtifacts allowEmptyArchive: true, artifacts: '**/target/surefire-reports/*.dumpstream'
if (!fileExists('core/target/surefire-reports/TEST-jenkins.Junit4TestsRanTest.xml')) {
error 'JUnit 4 tests are no longer being run for the core package'
}
From bea72075778d5315efa08308cea8dae5e47d81c5 Mon Sep 17 00:00:00 2001
From: Jesse Glick
Date: Fri, 10 Jun 2022 17:10:50 -0400
Subject: [PATCH 44/64] Simplify contributing instructions to recommend
`-Pquick-build`
---
CONTRIBUTING.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8eb9822ccd8e..ef8cf80541d1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ You can read a description of the [building and debugging process here].
If you want simply to build the `jenkins.war` file as fast as possible without tests, run:
```sh
-mvn -am -pl war,bom -DskipTests -Dspotbugs.skip -Dspotless.check.skip clean install
+mvn -am -pl war,bom -Pquick-build clean install
```
The WAR file will be created in `war/target/jenkins.war`.
@@ -220,4 +220,4 @@ just submit a pull request.
[Jenkins Pipeline]: https://www.jenkins.io/doc/book/pipeline/
[Jenkinsfile]: ./Jenkinsfile
[download Maven here]: https://maven.apache.org/download.cgi
-[GitHub pull request]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
\ No newline at end of file
+[GitHub pull request]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
From ae16c3074953ebffe814e55128987e2c4d372857 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Sat, 11 Jun 2022 08:42:02 -0500
Subject: [PATCH 45/64] Add gitpod integration (#6590)
Co-authored-by: Victor Nogueira
Co-authored-by: Alexander Brandes
Co-authored-by: Jesse Glick
---
.gitpod.yml | 27 +++++++++++++++++++++++++++
.gitpod/Dockerfile | 4 ++++
CONTRIBUTING.md | 10 ++++++++++
3 files changed, 41 insertions(+)
create mode 100644 .gitpod.yml
create mode 100644 .gitpod/Dockerfile
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000000..d3bedadf1f9b
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,27 @@
+tasks:
+ - init: |
+ mvn -am -pl war,bom -P quick-build clean install
+ command: |
+ mvn -pl war jetty:run -Dhost=0.0.0.0
+ name: Run
+ - command: gp await-port 8080 && gp url 8080 && gp preview $(gp url 8080)/jenkins/
+ name: Preview
+
+github:
+ prebuilds:
+ pullRequestsFromForks: true
+ addBadge: true
+
+jetbrains:
+ intellij:
+ plugins:
+ - Stapler plugin for IntelliJ IDEA
+ prebuilds:
+ version: stable
+
+vscode:
+ extensions:
+ - vscjava.vscode-java-pack
+
+image:
+ file: .gitpod/Dockerfile
diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile
new file mode 100644
index 000000000000..e3c88317008f
--- /dev/null
+++ b/.gitpod/Dockerfile
@@ -0,0 +1,4 @@
+FROM gitpod/workspace-full
+
+RUN brew install gh && \
+ bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install maven 3.8.4 && sdk default maven 3.8.4"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ef8cf80541d1..fb32776fb370 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,6 +62,16 @@ On another terminal, move to the war folder and start a [webpack](https://webpac
cd war; yarn start
```
+### Gitpod
+
+You can open this project as a [Gitpod workspace](https://www.gitpod.io/) which comes pre-configured with all the tools you will need.
+You can use IntelliJ IDEA (preferred) or VS Code (alternate) in the browser.
+
+[](https://gitpod.io/#https://github.com/jenkinsci/jenkins)
+
+If you prefer using IntelliJ IDEA, you can setup Gitpod integration with JetBrains Gateway using the instructions on [gitpod.io](https://www.gitpod.io/docs/ides-and-editors/intellij),
+which will open the workspace in IntelliJ IDEA using JetBrains Gateway.
+
## Testing changes
Jenkins core includes unit and functional tests as a part of the repository.
From d86beed83b120c403ae2e501536f9d4ac2858f74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Jun 2022 11:48:48 -0700
Subject: [PATCH 46/64] Bump Spotless Maven Plugin from 2.22.6 to 2.22.7
(#6647)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 90f7f0cbfd18..776a1dda77c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@ THE SOFTWARE.
1.23
5.8.2
4.6.1
- 2.22.6
+ 2.22.7
2.22.2
From c3193d91deb1a89f6f6bfe0b968a3b55fb28f713 Mon Sep 17 00:00:00 2001
From: Alexander Brandes
Date: Sun, 12 Jun 2022 17:20:53 +0200
Subject: [PATCH 47/64] chore: Compress and adjust IDEA svg (#6653)
---
.idea/icon.svg | 82 +-------------------------------------------------
1 file changed, 1 insertion(+), 81 deletions(-)
diff --git a/.idea/icon.svg b/.idea/icon.svg
index 8dd8fec29266..44161638ba48 100644
--- a/.idea/icon.svg
+++ b/.idea/icon.svg
@@ -1,81 +1 @@
-
-
-
+
From 393ec80794450b46d80106a7d934cf3e1b98c635 Mon Sep 17 00:00:00 2001
From: Langer0416 <71805759+Langer0416@users.noreply.github.com>
Date: Sun, 12 Jun 2022 13:46:53 -0700
Subject: [PATCH 48/64] [JENKINS-68735] Missing sidepanel for user
configuration if password is empty (#6650)
---
.../hudson/model/AbstractModelObject/error.jelly | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly
index d5522dca3251..40e3eb4a03c1 100644
--- a/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly
@@ -24,11 +24,15 @@ THE SOFTWARE.
-
+
+
+
@@ -39,7 +43,7 @@ THE SOFTWARE.
-
+
+
+
+
+
+
+
+
-
-
*/
DomNodeListAn internal error occurred during form field validation (HTTP " + x.status + "). Please reload the page and if the problem persists, ask the administrator for help.
";
- }
- Behaviour.applySubtree(target);
+ onComplete: function({status, responseText}) {
+ // TODO Add i18n support
+ const errorMessage = `An internal error occurred during form field validation (HTTP ${status}). Please reload the page and if the problem persists, ask the administrator for help.
`;
+ updateValidationArea(validationArea, status === 200 ? responseText : errorMessage);
}
});
}
@@ -584,22 +615,25 @@ function registerValidator(e) {
}
function registerRegexpValidator(e,regexp,message) {
- var tr = findFollowingTR(e, "validation-error-area");
+ var tr = e.closest(".jenkins-form-item").querySelector( ".validation-error-area");
if (!tr) {
- console.warn("Couldn't find the expected parent element (.setting-main) for element", e)
+ console.warn("Couldn't find the expected parent element (.setting-main) for element",
+ e.closest(".jenkins-form-item"))
return;
}
// find the validation-error-area
- e.targetElement = tr.firstElementChild.nextSibling;
+ e.targetElement = tr;
var checkMessage = e.getAttribute('checkMessage');
if (checkMessage) message = checkMessage;
var oldOnchange = e.onchange;
e.onchange = function() {
var set = oldOnchange != null ? oldOnchange.call(this) : false;
if (this.value.match(regexp)) {
- if (!set) this.targetElement.innerHTML = "";
+ if (!set) {
+ updateValidationArea(this.targetElement, ``)
+ }
} else {
- this.targetElement.innerHTML = "" + message + "
";
+ updateValidationArea(this.targetElement, `${message}
`);
set = true;
}
return set;
@@ -613,13 +647,14 @@ function registerRegexpValidator(e,regexp,message) {
* @param e Input element
*/
function registerMinMaxValidator(e) {
- var tr = findFollowingTR(e, "validation-error-area");
+ var tr = e.closest(".jenkins-form-item").querySelector( ".validation-error-area");
if (!tr) {
- console.warn("Couldn't find the expected parent element (.setting-main) for element", e)
+ console.warn("Couldn't find the expected parent element (.setting-main) for element",
+ e.closest(".jenkins-form-item"))
return;
}
// find the validation-error-area
- e.targetElement = tr.firstElementChild.nextSibling;
+ e.targetElement = tr;
var checkMessage = e.getAttribute('checkMessage');
if (checkMessage) message = checkMessage;
var oldOnchange = e.onchange;
@@ -638,29 +673,35 @@ function registerMinMaxValidator(e) {
if (min <= max) { // Add the validator if min <= max
if (parseInt(min) > parseInt(this.value) || parseInt(this.value) > parseInt(max)) { // The value is out of range
- this.targetElement.innerHTML = "This value should be between " + min + " and " + max + "
";
+ updateValidationArea(this.targetElement, `This value should be between ${min} and ${max}
`);
set = true;
} else {
- if (!set) this.targetElement.innerHTML = ""; // The value is valid
+ if (!set) {
+ updateValidationArea(this.targetElement, ``)
+ }
}
}
} else if ((min !== null && isInteger(min)) && (max === null || !isInteger(max))) { // There is only 'min' available
if (parseInt(min) > parseInt(this.value)) {
- this.targetElement.innerHTML = "This value should be larger than " + min + "
";
+ updateValidationArea(this.targetElement, `This value should be larger than ${min}
`);
set = true;
} else {
- if (!set) this.targetElement.innerHTML = "";
+ if (!set) {
+ updateValidationArea(this.targetElement, ``)
+ }
}
} else if ((min === null || !isInteger(min)) && (max !== null && isInteger(max))) { // There is only 'max' available
if (parseInt(max) < parseInt(this.value)) {
- this.targetElement.innerHTML = "This value should be less than " + max + "
";
+ updateValidationArea(this.targetElement, `This value should be less than ${max}
`);
set = true;
} else {
- if (!set) this.targetElement.innerHTML = "";
+ if (!set) {
+ updateValidationArea(this.targetElement, ``)
+ }
}
}
}
@@ -2324,15 +2365,16 @@ function validateButton(checkUrl,paramList,button) {
}
});
- var spinner = $(button).up("DIV").next();
- var target = spinner.next();
+ var spinner = button.up("DIV").children[0];
+ var target = spinner.next().next();
spinner.style.display="block";
new Ajax.Request(checkUrl, {
parameters: parameters,
onComplete: function(rsp) {
spinner.style.display="none";
- applyErrorMessage(target, rsp);
+ target.innerHTML = ``;
+ updateValidationArea(target.children[0], rsp.responseText);
layoutUpdateCallback.call();
var s = rsp.getResponseHeader("script");
try {
@@ -2344,26 +2386,6 @@ function validateButton(checkUrl,paramList,button) {
});
}
-function applyErrorMessage(elt, rsp) {
- if (rsp.status == 200) {
- elt.innerHTML = rsp.responseText;
- } else {
- var id = 'valerr' + (iota++);
- elt.innerHTML = 'ERROR';
- var error = document.getElementById('error-description'); // cf. oops.jelly
- if (error) {
- var div = document.getElementById(id);
- while (div.firstElementChild) {
- div.removeChild(div.firstElementChild);
- }
- div.appendChild(error);
- }
- }
- Behaviour.applySubtree(elt);
-}
-
// create a combobox.
// @param idOrField
// ID of the element that becomes a combobox, or the field itself.
From 13d572989206124655a5aa9034ebff68fe9c92e2 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 9 Jun 2022 10:03:01 +0100
Subject: [PATCH 40/64] Move from px to rem
---
war/src/main/less/abstracts/mixins.less | 6 +++---
war/src/main/less/modules/section.less | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/war/src/main/less/abstracts/mixins.less b/war/src/main/less/abstracts/mixins.less
index f6a147ba8dca..7f1625863e9d 100644
--- a/war/src/main/less/abstracts/mixins.less
+++ b/war/src/main/less/abstracts/mixins.less
@@ -67,7 +67,7 @@
}
&::after {
- box-shadow: 0 0 0 10px transparent;
+ box-shadow: 0 0 0 0.66rem transparent;
}
&:hover,
@@ -87,13 +87,13 @@
}
&::after {
- box-shadow: 0 0 0 5px var(--longhorn-box-shadow--focus);
+ box-shadow: 0 0 0 0.33rem var(--longhorn-box-shadow--focus);
}
}
&:focus-visible {
&::after {
- box-shadow: 0 0 0 5px var(--text-color);
+ box-shadow: 0 0 0 0.33rem var(--text-color);
}
}
}
diff --git a/war/src/main/less/modules/section.less b/war/src/main/less/modules/section.less
index ed62dc93b82e..fa9fccfb95e8 100644
--- a/war/src/main/less/modules/section.less
+++ b/war/src/main/less/modules/section.less
@@ -2,7 +2,6 @@
border-top: 2px solid var(--panel-border-color);
padding: var(--section-padding) 0 0 0;
max-width: 1800px;
- margin-bottom: 24px;
&:first-of-type {
border-top: none;
@@ -135,7 +134,7 @@
color: var(--text-color-secondary);
font-weight: 500;
line-height: 1.6;
- margin: 0 10px 0 0;
+ margin: 0 0.66rem 0 0;
font-size: 0.925rem;
}
}
From d1f42acfd5edb6659d800dd78eb4412f4ae66909 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Fri, 10 Jun 2022 11:13:58 +0100
Subject: [PATCH 41/64] Update table.less
---
war/src/main/less/modules/table.less | 58 +++++++++++-----------------
1 file changed, 22 insertions(+), 36 deletions(-)
diff --git a/war/src/main/less/modules/table.less b/war/src/main/less/modules/table.less
index 730f377b40ab..51d03810e578 100644
--- a/war/src/main/less/modules/table.less
+++ b/war/src/main/less/modules/table.less
@@ -181,15 +181,14 @@
}
&__button, .sortheader, &__link {
+ .longhorn();
align-items: center;
justify-content: center;
appearance: none;
- position: relative;
outline: none;
border: none;
margin: 0;
padding: 0;
- z-index: 0;
cursor: pointer;
color: inherit;
font-weight: inherit;
@@ -201,45 +200,11 @@
&::before,
&::after {
- content: "";
- position: absolute;
top: -7px;
left: -10px;
bottom: -7px;
right: -10px;
border-radius: 6px;
- z-index: -1;
- transition: var(--standard-transition);
- }
-
- &::before {
- background: var(--text-color);
- opacity: 0;
- }
-
- &::after {
- opacity: 0.05;
- box-shadow: 0 0 0 10px transparent;
- }
-
- &:hover {
- &::before {
- opacity: 0.05 !important;
- border-radius: 6px;
- background: var(--text-color);
- }
- }
-
- &:focus, &:active {
- &::before {
- opacity: 0.1 !important;
- border-radius: 6px;
- background: var(--text-color);
- }
-
- &::after {
- box-shadow: 0 0 0 5px var(--text-color);
- }
}
}
@@ -261,6 +226,27 @@
left: -8px;
bottom: -5px;
right: -8px;
+ box-shadow: 0 0 0 10px currentColor;
+ opacity: 0;
+ }
+
+ &:hover {
+ &::before {
+ background: currentColor;
+ border-radius: 6px;
+ }
+ }
+
+ &:active,
+ &:focus {
+ &::before {
+ background: currentColor;
+ border-radius: 6px;
+ }
+ &::after {
+ box-shadow: 0 0 0 5px currentColor;
+ opacity: 0.025;
+ }
}
}
}
From e036d3af2e21410a0996927601809a254d0505f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jun 2022 07:58:06 -0700
Subject: [PATCH 42/64] Bump parent POM from 1.74 to 1.76 (#6642)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
core/src/main/java/hudson/PluginManager.java | 1 +
.../hudson/cli/declarative/CLIRegisterer.java | 7 +
.../main/java/hudson/model/AbstractItem.java | 1 +
core/src/main/java/hudson/model/Executor.java | 7 +
.../java/hudson/model/ItemGroupMixIn.java | 2 +
core/src/main/java/hudson/model/Queue.java | 1 +
.../java/hudson/model/ResourceController.java | 6 +
.../main/java/hudson/model/UpdateSite.java | 1 +
.../java/hudson/triggers/SafeTimerTask.java | 2 +
.../java/hudson/util/InterceptingProxy.java | 2 +
.../util/RobustReflectionConverter.java | 2 +
core/src/main/java/jenkins/model/Jenkins.java | 1 +
core/src/main/java/jenkins/model/Nodes.java | 2 +
.../jenkins/model/TransientActionFactory.java | 2 +
.../ImpersonatingExecutorService.java | 2 +
...ImpersonatingScheduledExecutorService.java | 2 +
.../SecurityContextExecutorService.java | 2 +
.../jenkins/util/AtmostOneTaskExecutor.java | 1 +
.../util/ContextResettingExecutorService.java | 2 +
.../jenkins/util/ProgressiveRendering.java | 2 +
...ractUserDetailsAuthenticationProvider.java | 2 +
pom.xml | 2 +-
src/spotbugs/spotbugs-excludes.xml | 188 ++++++++++++++++++
23 files changed, 239 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index c3cd3a750e6d..2fce8ae5a52a 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -187,6 +187,7 @@
* @author Kohsuke Kawaguchi
*/
@ExportedBean
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public abstract class PluginManager extends AbstractModelObject implements OnMaster, StaplerOverridable, StaplerProxy {
/** Custom plugin manager system property or context param. */
public static final String CUSTOM_PLUGIN_MANAGER = PluginManager.class.getName() + ".className";
diff --git a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
index 8b2f2348c577..5fdf42672fbf 100644
--- a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
+++ b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
@@ -27,6 +27,7 @@
import static java.util.logging.Level.SEVERE;
import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.AbortException;
import hudson.Extension;
import hudson.ExtensionComponent;
@@ -71,6 +72,12 @@
* @author Kohsuke Kawaguchi
*/
@Extension
+@SuppressFBWarnings(
+ value = {
+ "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION",
+ "THROWS_METHOD_THROWS_RUNTIMEEXCEPTION"
+ },
+ justification = "TODO needs triage")
public class CLIRegisterer extends ExtensionFinder {
@Override
public ExtensionComponentSet refresh() throws ExtensionRefreshException {
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index bc96c1b08dcf..2fbc1521de3f 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -110,6 +110,7 @@
// Item doesn't necessarily have to be Actionable, but
// Java doesn't let multiple inheritance.
@ExportedBean
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_THROWABLE", justification = "TODO needs triage")
public abstract class AbstractItem extends Actionable implements Item, HttpDeletable, AccessControlled, DescriptorByNameOwner, StaplerProxy {
private static final Logger LOGGER = Logger.getLogger(AbstractItem.class.getName());
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
index e7b14b72aebf..7ffc181dd791 100644
--- a/core/src/main/java/hudson/model/Executor.java
+++ b/core/src/main/java/hudson/model/Executor.java
@@ -32,6 +32,7 @@
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.FilePath;
import hudson.Functions;
import hudson.Util;
@@ -89,6 +90,12 @@
* @author Kohsuke Kawaguchi
*/
@ExportedBean
+@SuppressFBWarnings(
+ value = {
+ "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION",
+ "THROWS_METHOD_THROWS_CLAUSE_THROWABLE"
+ },
+ justification = "TODO needs triage")
public class Executor extends Thread implements ModelObject {
protected final @NonNull Computer owner;
private final Queue queue;
diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 748a13cc6ec4..e9a526ebbe6c 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -24,6 +24,7 @@
package hudson.model;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Util;
import hudson.XmlFile;
import hudson.model.listeners.ItemListener;
@@ -61,6 +62,7 @@
* @author Kohsuke Kawaguchi
* @see ViewGroupMixIn
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_THROWABLE", justification = "TODO needs triage")
public abstract class ItemGroupMixIn {
/**
* {@link ItemGroup} for which we are working.
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 50ad97232bd5..982c74c22380 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -171,6 +171,7 @@
* @see QueueTaskDispatcher
*/
@ExportedBean
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public class Queue extends ResourceController implements Saveable {
/**
diff --git a/core/src/main/java/hudson/model/ResourceController.java b/core/src/main/java/hudson/model/ResourceController.java
index a3702ab79e61..1516272f1dcc 100644
--- a/core/src/main/java/hudson/model/ResourceController.java
+++ b/core/src/main/java/hudson/model/ResourceController.java
@@ -39,6 +39,12 @@
* Controls mutual exclusion of {@link ResourceList}.
* @author Kohsuke Kawaguchi
*/
+@SuppressFBWarnings(
+ value = {
+ "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION",
+ "THROWS_METHOD_THROWS_CLAUSE_THROWABLE"
+ },
+ justification = "TODO needs triage")
public class ResourceController {
/**
* {@link ResourceList}s that are used by activities that are in progress.
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 389e3cb3890f..76c14164981c 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -104,6 +104,7 @@
* @since 1.333
*/
@ExportedBean
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public class UpdateSite {
/**
* What's the time stamp of data file?
diff --git a/core/src/main/java/hudson/triggers/SafeTimerTask.java b/core/src/main/java/hudson/triggers/SafeTimerTask.java
index db07c96867df..5a261d0e9a2e 100644
--- a/core/src/main/java/hudson/triggers/SafeTimerTask.java
+++ b/core/src/main/java/hudson/triggers/SafeTimerTask.java
@@ -24,6 +24,7 @@
package hudson.triggers;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.model.AperiodicWork;
import hudson.model.AsyncAperiodicWork;
import hudson.model.AsyncPeriodicWork;
@@ -47,6 +48,7 @@
* @author Kohsuke Kawaguchi
* @since 1.124
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public abstract class SafeTimerTask extends TimerTask {
/**
diff --git a/core/src/main/java/hudson/util/InterceptingProxy.java b/core/src/main/java/hudson/util/InterceptingProxy.java
index 3ab7ebb0b318..af368ac5bf5e 100644
--- a/core/src/main/java/hudson/util/InterceptingProxy.java
+++ b/core/src/main/java/hudson/util/InterceptingProxy.java
@@ -1,5 +1,6 @@
package hudson.util;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -10,6 +11,7 @@
*
* @author Kohsuke Kawaguchi
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_THROWABLE", justification = "TODO needs triage")
public abstract class InterceptingProxy {
/**
* Intercepts every method call.
diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java
index d1bc500003e1..d7ce1ab5594f 100644
--- a/core/src/main/java/hudson/util/RobustReflectionConverter.java
+++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java
@@ -44,6 +44,7 @@
import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.security.InputManipulationException;
import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.diagnosis.OldDataMonitor;
import hudson.model.Saveable;
import hudson.security.ACL;
@@ -77,6 +78,7 @@
*
*
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_RUNTIMEEXCEPTION", justification = "TODO needs triage")
@SuppressWarnings({"rawtypes", "unchecked"})
public class RobustReflectionConverter implements Converter {
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 3aa50e0882a9..511ee7a610eb 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -337,6 +337,7 @@
* @author Kohsuke Kawaguchi
*/
@ExportedBean
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLevelItemGroup, StaplerProxy, StaplerFallback,
ModifiableViewGroup, AccessControlled, DescriptorByNameOwner,
ModelObjectWithContextMenu, ModelObjectWithChildren, OnMaster {
diff --git a/core/src/main/java/jenkins/model/Nodes.java b/core/src/main/java/jenkins/model/Nodes.java
index c8ff0e283e9a..f39377e1bcf0 100644
--- a/core/src/main/java/jenkins/model/Nodes.java
+++ b/core/src/main/java/jenkins/model/Nodes.java
@@ -26,6 +26,7 @@
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.BulkChange;
import hudson.Util;
import hudson.XmlFile;
@@ -61,6 +62,7 @@
* @since 1.607
*/
@Restricted(NoExternalUse.class) // for now, we may make it public later
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public class Nodes implements Saveable {
/**
diff --git a/core/src/main/java/jenkins/model/TransientActionFactory.java b/core/src/main/java/jenkins/model/TransientActionFactory.java
index abcd32d71693..21ecc499b9c4 100644
--- a/core/src/main/java/jenkins/model/TransientActionFactory.java
+++ b/core/src/main/java/jenkins/model/TransientActionFactory.java
@@ -28,6 +28,7 @@
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.ExtensionList;
import hudson.ExtensionListListener;
import hudson.ExtensionPoint;
@@ -48,6 +49,7 @@
* @see Actionable#getAllActions
* @since 1.548
*/
+@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION", justification = "TODO needs triage")
public abstract class TransientActionFactory${%Error}
${message}
From 56a03a5b1382a268cd8ca1229a2394791f50b82f Mon Sep 17 00:00:00 2001
From: Basil Crow
Date: Sun, 12 Jun 2022 16:55:47 -0700
Subject: [PATCH 49/64] Upgrade Surefire from 2.22.2 to 3.0.0-M7 (#6652)
---
.mvn/jvm.config | 2 +-
pom.xml | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
index e93a5b43ee1c..f0106d148540 100644
--- a/.mvn/jvm.config
+++ b/.mvn/jvm.config
@@ -1 +1 @@
--Xmx800m
+-Xmx1100m
diff --git a/pom.xml b/pom.xml
index 776a1dda77c8..04a02264892e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,10 +103,6 @@ THE SOFTWARE.
5.8.2
4.6.1
2.22.7
-
-
- 2.22.2
- 2.22.2
From 65fcda13509d0185cfab1016efd83c5fe8e91cb7 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Mon, 13 Jun 2022 21:30:10 +0200
Subject: [PATCH 50/64] Revert "[JENKINS-68735] Missing sidepanel for user
configuration if password is empty (#6650)" (#6654)
This reverts commit 393ec80794450b46d80106a7d934cf3e1b98c635.
---
.../hudson/model/AbstractModelObject/error.jelly | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly
index 40e3eb4a03c1..d5522dca3251 100644
--- a/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/error.jelly
@@ -24,15 +24,11 @@ THE SOFTWARE.
-
-
-
-
+
@@ -43,7 +39,7 @@ THE SOFTWARE.
-
+
${%Error}
${message}
From d43d0b51dd18bca980f7d384ec4a353a2a66b818 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 14 Jun 2022 12:52:57 +0000
Subject: [PATCH 51/64] [maven-release-plugin] prepare release jenkins-2.355
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 4 ++--
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index a2929a173b77..7d2fbaacc3a1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.355
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 2bfaf2dd6a86..3ede421b866e 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.355
cli
diff --git a/core/pom.xml b/core/pom.xml
index 27554bf94680..bab7826bdb88 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.355
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 9f27c8d11cf0..d5ac8a2b6fd0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.355
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index 04a02264892e..a31de388f4e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.355
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- ${scmTag}
+ jenkins-2.355
https://github.com/jenkinsci/jenkins
diff --git a/test/pom.xml b/test/pom.xml
index 3bb7f0e85dca..66cc33bc4227 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.355
jenkins-test
diff --git a/war/pom.xml b/war/pom.xml
index dfc597a0ae46..6cde5ecb6037 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.355
jenkins-war
From 1c271f5e167656d3abbe0fb20837f60459187043 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 14 Jun 2022 12:59:31 +0000
Subject: [PATCH 52/64] [maven-release-plugin] prepare for next development
iteration
---
bom/pom.xml | 2 +-
cli/pom.xml | 2 +-
core/pom.xml | 2 +-
coverage/pom.xml | 2 +-
pom.xml | 6 +++---
test/pom.xml | 2 +-
war/pom.xml | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 7d2fbaacc3a1..a2929a173b77 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.355
+ ${revision}${changelist}
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 3ede421b866e..2bfaf2dd6a86 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.355
+ ${revision}${changelist}
cli
diff --git a/core/pom.xml b/core/pom.xml
index bab7826bdb88..27554bf94680 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.355
+ ${revision}${changelist}
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index d5ac8a2b6fd0..9f27c8d11cf0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.355
+ ${revision}${changelist}
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index a31de388f4e6..31b24c5f66c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.355
+ ${revision}${changelist}
pom
Jenkins main module
@@ -61,7 +61,7 @@ THE SOFTWARE.
scm:git:https://github.com/jenkinsci/jenkins.git
scm:git:git@github.com:jenkinsci/jenkins.git
- jenkins-2.355
+ ${scmTag}
https://github.com/jenkinsci/jenkins
@@ -71,7 +71,7 @@ THE SOFTWARE.
- 2.355
+ 2.356
-SNAPSHOT
- 3025.vf64a_a_3da_6b_55
+ 3028.va_a_436db_35078
3.14
From 69c1633e1e5c7f8f2aa5840f128427b71545536a Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:00:06 +0100
Subject: [PATCH 60/64] Update style.less
---
war/src/main/less/base/style.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index 042597244d19..40d856440608 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -1076,7 +1076,7 @@ table.fingerprint-in-build td {
margin-bottom: calc(var(--section-padding) / 3);
&:last-of-type {
- margin-bottom: 0;
+ margin-bottom: var(--section-padding);
}
}
From e57bc28553bfd42fa1101332bc2e168fca99bb81 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:29:15 +0100
Subject: [PATCH 61/64] Update theme.less
---
war/src/main/less/abstracts/theme.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/theme.less
index 1e71be68744a..8a39b0fa1165 100644
--- a/war/src/main/less/abstracts/theme.less
+++ b/war/src/main/less/abstracts/theme.less
@@ -20,7 +20,7 @@
--black: hsl(240, 0.2, 0.1);
// branding
- --primary: #024cb6;
+ --primary: hsl(210, 100%, 40%);
--secondary: hsl(240, 0.1, 0.5);
--success: var(--green);
--danger: var(--red);
From 0996e759d6879c4f304603d08a0465dad49dbc10 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:32:52 +0100
Subject: [PATCH 62/64] Update theme.less
---
war/src/main/less/abstracts/theme.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/theme.less
index 8a39b0fa1165..bcdfa8ff17af 100644
--- a/war/src/main/less/abstracts/theme.less
+++ b/war/src/main/less/abstracts/theme.less
@@ -20,7 +20,7 @@
--black: hsl(240, 0.2, 0.1);
// branding
- --primary: hsl(210, 100%, 40%);
+ --primary: hsl(210, 100%, 38%);
--secondary: hsl(240, 0.1, 0.5);
--success: var(--green);
--danger: var(--red);
From c78dfd6b509821a23a0d1416f14b4d98048510fe Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:33:47 +0100
Subject: [PATCH 63/64] Update theme.less
---
war/src/main/less/abstracts/theme.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/theme.less
index bcdfa8ff17af..7866d158de8e 100644
--- a/war/src/main/less/abstracts/theme.less
+++ b/war/src/main/less/abstracts/theme.less
@@ -20,7 +20,7 @@
--black: hsl(240, 0.2, 0.1);
// branding
- --primary: hsl(210, 100%, 38%);
+ --primary: hsl(212, 100%, 41%);
--secondary: hsl(240, 0.1, 0.5);
--success: var(--green);
--danger: var(--red);
From c9e2823d4a688fcdd1450d682a425e59142678a0 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:35:37 +0100
Subject: [PATCH 64/64] Update colors
---
war/src/main/less/abstracts/theme.less | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/theme.less
index 7866d158de8e..49642fda7719 100644
--- a/war/src/main/less/abstracts/theme.less
+++ b/war/src/main/less/abstracts/theme.less
@@ -333,12 +333,12 @@
blue: #007aff;
brown: #a2845e;
cyan: #32ade6;
- green: #1c9146;
+ green: #1ea64b;
indigo: #5856d6;
orange: #fe820a;
pink: #fb0f45;
purple: #af52de;
- red: #df001c;
+ red: #e6001f;
yellow: #ffcc00;
}