From 68aed4cb09e1fcc1080826bc900faa08be71eab9 Mon Sep 17 00:00:00 2001 From: Waldyr Date: Mon, 4 Apr 2016 02:33:23 -0300 Subject: [PATCH 1/7] Add pt-BR translation in usage statistics --- .../help-usageStatisticsCollected.html | 3 --- .../help-usageStatisticsCollected_pt_BR.html | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_pt_BR.html diff --git a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html index 2ec5cf132a..dbea3f8b11 100644 --- a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html +++ b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html @@ -18,7 +18,4 @@ (except information inherently revealed by HTTP, such as the IP address). Tabulated data of these usage statistics submissions will be shared with the community. -

- You can read - the discussion of this mechanism in the community, and you are welcome to add your voice here. diff --git a/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_pt_BR.html b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_pt_BR.html new file mode 100644 index 0000000000..bde77e44f1 --- /dev/null +++ b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected_pt_BR.html @@ -0,0 +1,20 @@ +

+ Saber como Jenkins é utilizado é uma tremenda ajuda guiando-nos no desenvolvimento, especificamente para + projetos de código livre onde os usuários são inerentemente difíceis de rastrear. Ao ativar esta opção, + Jenkins periodicamente enviará informações sobre o seu uso. + +

+ Especificamente, as informações enviadas serão: + +

+ +

+ Essas informaçãos não contem nada o identifique ou nos permita contatá-lo + (exceto pelas informações reveladas via HTTP, tal como Endereço IP). + Dados das estatísticas de uso submetidas são compartilhados com a comunidade. +

From 29f197069a5b5154dff19d7edde0d800716efa6f Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Tue, 5 Apr 2016 19:19:02 +0200 Subject: [PATCH 2/7] Update changelog.html --- changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 09c7d9b4eb..910693ef0b 100644 --- a/changelog.html +++ b/changelog.html @@ -68,7 +68,7 @@ Upcoming changes Advertise the correct JNLP port when using the system property override. (pull 2189)
  • - Workflow runs not reliably started after restart when using Build after other projects are built. + Pipeline runs not reliably started after restart when using Build after other projects are built. (issue 33971)
  • Prevent badges in build history sidepanel widget from overlapping page contents. From 84fa59a87c6886d4f1efd86f5df6f21520c3f918 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Tue, 5 Apr 2016 11:03:08 -0700 Subject: [PATCH 3/7] Do not use '_' as an identifier Eliminates Java 8 warnings: (use of '_' as an identifier might not be supported in releases after Java SE 8) --- core/src/test/java/hudson/BulkChangeTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/hudson/BulkChangeTest.java b/core/src/test/java/hudson/BulkChangeTest.java index 7fe79c8383..7e93dc4e09 100644 --- a/core/src/test/java/hudson/BulkChangeTest.java +++ b/core/src/test/java/hudson/BulkChangeTest.java @@ -98,10 +98,10 @@ public class BulkChangeTest { @Test public void nestedBulkChange() throws Exception { Point pt = new Point(); - Point _ = new Point(); + Point pt2 = new Point(); BulkChange bc1 = new BulkChange(pt); try { - BulkChange bc2 = new BulkChange(_); + BulkChange bc2 = new BulkChange(pt2); try { BulkChange bc3 = new BulkChange(pt); try { From 552d8a6b953c1759700a09937bba744dd25f44bc Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Tue, 5 Apr 2016 12:35:30 -0700 Subject: [PATCH 4/7] Fix href tags Eliminates errors with Java 8 and "mvn javadoc:test-javadoc" such as: [ERROR] jenkins/core/src/test/java/hudson/model/ItemsTest.java:12: error: unknown attribute: hef [ERROR] * @author: Nicolas De Loof --- core/src/main/java/hudson/search/SearchResult.java | 2 +- core/src/test/java/hudson/model/ItemsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/search/SearchResult.java b/core/src/main/java/hudson/search/SearchResult.java index 927fced648..2d6cdb1d65 100644 --- a/core/src/main/java/hudson/search/SearchResult.java +++ b/core/src/main/java/hudson/search/SearchResult.java @@ -3,7 +3,7 @@ package hudson.search; import java.util.List; /** - * @author Nicolas De Loof + * @author Nicolas De Loof */ public interface SearchResult extends List { diff --git a/core/src/test/java/hudson/model/ItemsTest.java b/core/src/test/java/hudson/model/ItemsTest.java index fbccf4cba6..756788119d 100644 --- a/core/src/test/java/hudson/model/ItemsTest.java +++ b/core/src/test/java/hudson/model/ItemsTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.*; /** - * @author: Nicolas De Loof + * @author: Nicolas De Loof */ public class ItemsTest { From 5ebf6b8bde83543a10dc21ef0dfd74872f20421e Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Wed, 6 Apr 2016 14:12:33 +0200 Subject: [PATCH 5/7] [JENKINS-21486] Follow-up Display of shortName of disabled plugin is enough. Fix copy-paste error in the message for disabled dependencies --- core/src/main/java/hudson/PluginWrapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index 00e203a2e6..adabb8f24c 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -573,7 +573,7 @@ public class PluginWrapper implements Comparable, ModelObject { obsoleteDependencies.add(dependency.getShortName() + "(" + dependency.getVersion() + " < " + d.version + ")"); } } else { - disabledDependencies.add(d.toString()); + disabledDependencies.add(d.shortName); } } @@ -600,7 +600,7 @@ public class PluginWrapper implements Comparable, ModelObject { if (!disabledDependencies.isEmpty()) { boolean plural = disabledDependencies.size() > 1; messageBuilder.append(plural ? "Dependencies " : "Dependency ") - .append(Util.join(missingDependencies, ", ")) + .append(Util.join(disabledDependencies, ", ")) .append(" ").append(plural ? "are" : "is") .append(" disabled. "); } From 754fcf990631892a8ed4bc8c632fb3eca195a36c Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Wed, 6 Apr 2016 14:18:29 +0200 Subject: [PATCH 6/7] Display the required version back. --- core/src/main/java/hudson/PluginWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index adabb8f24c..b78c19f59e 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -573,7 +573,7 @@ public class PluginWrapper implements Comparable, ModelObject { obsoleteDependencies.add(dependency.getShortName() + "(" + dependency.getVersion() + " < " + d.version + ")"); } } else { - disabledDependencies.add(d.shortName); + disabledDependencies.add(d.toString()); } } From 575c1af489a43a6bc1846ca46864e5d4931e47e3 Mon Sep 17 00:00:00 2001 From: "Ing. Pavel Janousek" Date: Wed, 6 Apr 2016 13:44:33 +0200 Subject: [PATCH 7/7] [JENKINS-33942] Fixed NPE when non-exists run requested --- core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java index c7767a796e..1863e5a22e 100644 --- a/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java +++ b/core/src/main/java/hudson/cli/SetBuildDescriptionCommand.java @@ -28,6 +28,9 @@ public class SetBuildDescriptionCommand extends CLICommand implements Serializab protected int run() throws Exception { Run run = job.getBuildByNumber(number); + if (run == null) + throw new IllegalArgumentException("No such build #"+number); + run.checkPermission(Run.UPDATE); if ("=".equals(description)) {