Merge branch 'master' of https://github.com/jenkinsci/jenkins into pl…

…ugin-dev

core/pom.xml

@@ -646,7 +646,6 @@ THE SOFTWARE.
         <plugin>
          <groupId>org.codehaus.mojo</groupId>
          <artifactId>build-helper-maven-plugin</artifactId>
-         <version>1.7</version>
          <executions>
              <execution>
                  <id>add-source</id>

core/src/main/java/jenkins/model/GlobalConfiguration.java

@@ -25,7 +25,7 @@
  * properties defined in your GlobalConfiguration subclass, here are two possibilities:
  * <ul><li>@{@link javax.inject.Inject} into your other {@link hudson.Extension}s (so this does <i>not</i> work
  * for classes not annotated with {@link hudson.Extension})</li>
- * <li>access it via a call to {@code GlobalConfiguration.all().get(<your GlobalConfiguration subclass>.class)}</li></ul>
+ * <li>access it via a call to {@code ExtensionList.lookupSingleton(<your GlobalConfiguration subclass>.class)}</li></ul>
  *
  * <p>
  * While an implementation might store its actual configuration data in various ways,

core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties

@@ -1,4 +1,25 @@
-# This file is under the MIT License by authors
+# The MIT License
+#
+# Copyright (c) 2013-2018, Sun Microsystems, Inc., Kohsuke Kawaguchi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Poczekaj prosz\u0119, a\u017C Jenkins b\u0119dzie gotowy do pracy
 Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Twoja przegl\u0105darka automatycznie prze\u0142aduje stron\u0119, kiedy Jenkins b\u0119dzie gotowy.
+Starting\ Jenkins=Uruchamianie Jenkinsa

core/src/main/resources/jenkins/install/SetupWizard/setupWizardConfigureInstance_pl.properties

@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright (c) 2018, Damian Szczepanik
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Jenkins\ URL=URL Jenkinsa
+Instance\ Configuration=Konfiguracja instancji

core/src/main/resources/jenkins/install/pluginSetupWizard.properties

@@ -1,3 +1,25 @@
+# The MIT License
+#
+# Copyright (c) 2016-2018, Sun Microsystems, Inc., Kohsuke Kawaguchi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
 installWizard_welcomePanel_title=Getting Started
 installWizard_welcomePanel_banner=Customize Jenkins
 installWizard_welcomePanel_message=Plugins extend Jenkins with additional features to support many different needs.
@@ -13,6 +35,7 @@ For information about installing Jenkins without an internet connection, see the
 <a href="https://jenkins.io/redirect/offline-installation" target="_blank">Offline Jenkins Installation Documentation</a>. <br/><br/> \
 You may choose to continue by configuring a proxy or skipping plugin installation. \
 </p>
+installWizard_error_title=Error
 installWizard_error_header=An error occurred
 installWizard_error_message=An error occurred during installation:
 installWizard_error_connection=Unable to connect to Jenkins

core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties

@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2017, Damian Szczepanik
+# Copyright (c) 2017-2018, Damian Szczepanik
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -46,6 +46,7 @@ installWizard_installCustom_pluginListDesc=Zauwa\u017C, \u017Ce poni\u017Cej nie
 installWizard_goBack=Wr\u00F3\u0107
 installWizard_goInstall=Instaluj
 installWizard_error_connection=Nie uda\u0142o si\u0119 po\u0142\u0105czy\u0107 z Jenkinsem
+installWizard_error_title=B\u0142\u0105d
 installWizard_error_header=Wyst\u0105pi\u0142 b\u0142\u0105d
 installWizard_installingConsole_dependencyIndicatorNote=** - zale\u017Cno\u015Bci wymagane
 installWizard_retry=Pon\u00F3w
@@ -60,6 +61,9 @@ Aby uzyska\u0107 wi\u0119cej informacji o instalowaniu Jenkinsa bez dost\u0119pu
 <a href="https://jenkins.io/redirect/offline-installation" target="_blank">Offline Jenkins Installation Documentation</a>. <br/><br/> \
 Mo\u017Cesz kontynuowa\u0107 konfiguruj\u0105c proxy lub pomin\u0105\u0107 instalacje wtyczek.\
 </p>
+installWizard_configureInstance_title=Konfiguracja instancji
+installWizard_saveConfigureInstance=Zapisz i zako\u0144cz
+installWizard_skipConfigureInstance=Nie teraz
 installWizard_configureProxy_label=Konfiguruj proxy
 installWizard_skipPluginInstallations=Pomi\u0144 instalacje wtyczek
 installWizard_configureProxy_save=Zapisz i kontynuuj

core/src/main/resources/jenkins/model/Jenkins/login_pl.properties

@@ -1,8 +1,29 @@
-# This file is under the MIT License by authors
+# The MIT License
+#
+# Copyright (c) 2013-2018, Sun Microsystems, Inc., Kohsuke Kawaguchi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 Password=Has\u0142o
 Remember\ me\ on\ this\ computer=Zapami\u0119taj mnie na tym komputerze
 User=Login
 login=Zaloguj
 signUp=<a href="signup">Za\u0142\u00F3\u017C konto</a> je\u015Bli nie jeste\u015B jeszcze uczestnikiem.
 
+signIn=Rejestracja

core/src/test/java/hudson/scheduler/CronTabTest.java

@@ -29,6 +29,7 @@
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
@@ -199,7 +200,7 @@ public void testFloor4() throws Exception {
     }
 
     /**
-     * Humans can't easily see difference in two {@link Calendar}s, do help the diagnosis by using {@link DateFormat}. 
+     * Humans can't easily see difference in two {@link Calendar}s, do help the diagnosis by using {@link DateFormat}.
      */
     private void compare(Calendar expected, Calendar actual) {
         DateFormat f = DateFormat.getDateTimeInstance();
@@ -307,7 +308,9 @@ public int next(int n) {
         CronTabList tabs = CronTabList.create("TZ=Australia/Sydney\nH * * * *\nH * * * *", Hash.from("seed"));
         List<Integer> times = new ArrayList<Integer>();
         for (int i = 0; i < 60; i++) {
-            if (tabs.check(new GregorianCalendar(2013, 3, 3, 11, i, 0))) {
+            GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+            calendar.set(2013, Calendar.APRIL, 3, 11, i, 0);
+            if (tabs.check(calendar)) {
                 times.add(i);
             }
         }

pom.xml

@@ -76,7 +76,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.157</revision>
+    <revision>2.158</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is actually incorrect,

war/src/main/js/templates/errorPanel.hbs

@@ -1,5 +1,5 @@
 <div class="modal-header">
-	<h4 class="modal-title">Error</h4>
+	<h4 class="modal-title">{{translations.installWizard_error_title}}</h4>
 </div>
 <div class="modal-body">
 	<div class="container error-container" id="error-message">