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. diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index e5ca24513d..8388278dbe 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -590,7 +590,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. "); } 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)) { 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/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html b/core/src/main/resources/hudson/model/UsageStatistics/help-usageStatisticsCollected.html index 2c65a8fc06..37b1e5cc65 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: + +

      +
    • A versão do seu Jenkins +
    • Para cada master e cada slave, o tipo de Sistema Operacional, e número de executores +
    • Os plugins instalados e suas versões +
    • Número de jobs por tipo de job no seu Jenkins +
    + +

    + 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. +

    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 { 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 {