From f254f5d876521ad1068912e161ea0a49cc9e59d9 Mon Sep 17 00:00:00 2001 From: Abhyudaya Sharma Date: Fri, 21 Dec 2018 21:57:21 +0530 Subject: [PATCH 1/8] Fix build on Windows 10 --- core/src/test/java/hudson/scheduler/CronTabTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java index 66894c3546428..545f457a9be54 100644 --- a/core/src/test/java/hudson/scheduler/CronTabTest.java +++ b/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 times = new ArrayList(); for (int i = 0; i < 60; i++) { - if (tabs.check(new GregorianCalendar(2013, 3, 3, 11, i, 0))) { + GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("Australia/Sydney")); + calendar.set(2013, Calendar.APRIL, 3, 11, i, 0); + if (tabs.check(calendar)) { times.add(i); } } From 756ce57ac77d7a7a2524a2b47b470d912a294976 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Fri, 28 Dec 2018 11:14:40 +0530 Subject: [PATCH 2/8] Use UTC instead of "Australia/Sydney" Co-Authored-By: AbhyudayaSharma <11471599+AbhyudayaSharma@users.noreply.github.com> --- core/src/test/java/hudson/scheduler/CronTabTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java index 545f457a9be54..65115091a716c 100644 --- a/core/src/test/java/hudson/scheduler/CronTabTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabTest.java @@ -308,7 +308,7 @@ public int next(int n) { CronTabList tabs = CronTabList.create("TZ=Australia/Sydney\nH * * * *\nH * * * *", Hash.from("seed")); List times = new ArrayList(); for (int i = 0; i < 60; i++) { - GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("Australia/Sydney")); + GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC")); calendar.set(2013, Calendar.APRIL, 3, 11, i, 0); if (tabs.check(calendar)) { times.add(i); From 1f41576449abeae08053f726effb01bb7fe48aff Mon Sep 17 00:00:00 2001 From: Damian Szczepanik Date: Fri, 21 Dec 2018 00:10:09 +0100 Subject: [PATCH 3/8] Adds Polish translations - Provides translations mostly for SetupWizard - Makes title of error panel translatable ### Proposed changelog entries ### Submitter checklist - [ ] JIRA issue is well described - [ ] Changelog entry appropriate for the audience affected by the change (users or developer, depending on the change). - [ ] Appropriate autotests or explanation to why this change has no tests - [ ] For dependency updates: links to external changelogs and, if possible, full diffs ### Desired reviewers @batmat --- .../util/HudsonIsLoading/index_pl.properties | 23 +++++++++++++++++- ...setupWizardConfigureInstance_pl.properties | 24 +++++++++++++++++++ .../install/pluginSetupWizard.properties | 23 ++++++++++++++++++ .../install/pluginSetupWizard_pl.properties | 6 ++++- .../jenkins/model/Jenkins/login_pl.properties | 23 +++++++++++++++++- war/src/main/js/templates/errorPanel.hbs | 2 +- 6 files changed, 97 insertions(+), 4 deletions(-) create mode 100644 core/src/main/resources/jenkins/install/SetupWizard/setupWizardConfigureInstance_pl.properties diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties index f97f2f86474d5..e5fbb2fb5e44c 100644 --- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties +++ b/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 diff --git a/core/src/main/resources/jenkins/install/SetupWizard/setupWizardConfigureInstance_pl.properties b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardConfigureInstance_pl.properties new file mode 100644 index 0000000000000..a12767f701db2 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties index 1a682d15d652e..6dc6e00099a48 100644 --- a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties +++ b/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 Offline Jenkins Installation Documentation.

\ You may choose to continue by configuring a proxy or skipping plugin installation. \

+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 diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties index e94da4e1c811a..bbcdb392d2571 100644 --- a/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties +++ b/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 Offline Jenkins Installation Documentation.

\ Mo\u017Cesz kontynuowa\u0107 konfiguruj\u0105c proxy lub pomin\u0105\u0107 instalacje wtyczek.\

+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 diff --git a/core/src/main/resources/jenkins/model/Jenkins/login_pl.properties b/core/src/main/resources/jenkins/model/Jenkins/login_pl.properties index f353e83663fbb..a9039c6c40736 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/login_pl.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/login_pl.properties @@ -1,4 +1,24 @@ -# 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 @@ -6,3 +26,4 @@ User=Login login=Zaloguj signUp=Za\u0142\u00F3\u017C konto je\u015Bli nie jeste\u015B jeszcze uczestnikiem. +signIn=Rejestracja diff --git a/war/src/main/js/templates/errorPanel.hbs b/war/src/main/js/templates/errorPanel.hbs index 42cb0a69f184e..78c496db22640 100644 --- a/war/src/main/js/templates/errorPanel.hbs +++ b/war/src/main/js/templates/errorPanel.hbs @@ -1,5 +1,5 @@
-

Error

+

{{translations.installWizard_error_title}}

From c11733dd861f3fc135e40e180eab5a0e6cfcebc4 Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Thu, 3 Jan 2019 11:34:00 +0100 Subject: [PATCH 4/8] Update to latest version to support M2E See https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/jenkinsci-users/FjzMrudsfb0/2oWXs9mZDAAJ where we see Eclipse import fails. See https://github.com/mojohaus/build-helper-maven-plugin/issues/43 And https://github.com/mojohaus/build-helper-maven-plugin/commit/f6d1fea90ccf7d9ef03e4587ac440d645f4c9898 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index f8fb4b82df9af..bc30c94f06fcf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -646,7 +646,7 @@ THE SOFTWARE. org.codehaus.mojo build-helper-maven-plugin - 1.7 + 3.0.0 add-source From 677fcd5258dbdd243c1c0f63e10f462ac7ba5c10 Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Thu, 3 Jan 2019 17:09:31 +0100 Subject: [PATCH 5/8] Remove override to inherit 3.0.0 from parent pom --- core/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index bc30c94f06fcf..3f1d559fa222f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -646,7 +646,6 @@ THE SOFTWARE. org.codehaus.mojo build-helper-maven-plugin - 3.0.0 add-source From 3a849e8b3d76bd0d260318a1ec524fd1ba98266b Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 4 Jan 2019 15:01:48 -0500 Subject: [PATCH 6/8] Suggest ExtensionList.lookupSingleton --- core/src/main/java/jenkins/model/GlobalConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/jenkins/model/GlobalConfiguration.java b/core/src/main/java/jenkins/model/GlobalConfiguration.java index 76320768b0d5c..4a261cbed5d81 100644 --- a/core/src/main/java/jenkins/model/GlobalConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalConfiguration.java @@ -25,7 +25,7 @@ * properties defined in your GlobalConfiguration subclass, here are two possibilities: *
  • @{@link javax.inject.Inject} into your other {@link hudson.Extension}s (so this does not work * for classes not annotated with {@link hudson.Extension})
    • - *
  • access it via a call to {@code GlobalConfiguration.all().get(.class)}
+ *
  • access it via a call to {@code ExtensionList.lookupSingleton(.class)}
    • * *

    * While an implementation might store its actual configuration data in various ways, From e82436fe31abd5892d1c6d1d3e5bd442031c831b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 6 Jan 2019 14:39:39 -0800 Subject: [PATCH 7/8] [maven-release-plugin] prepare release jenkins-2.157 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 4 ++-- test-jdk8/pom.xml | 2 +- test-pom/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 0a5aa6a5c328e..4a0e095304310 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.157 cli diff --git a/core/pom.xml b/core/pom.xml index 3f1d559fa222f..1a7b98924021b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.157 jenkins-core diff --git a/pom.xml b/pom.xml index 155ff0e9e447a..69dd99ea68a1c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.157 pom Jenkins main module @@ -60,7 +60,7 @@ THE SOFTWARE. scm:git:git://github.com/jenkinsci/jenkins.git scm:git:ssh://git@github.com/jenkinsci/jenkins.git https://github.com/jenkinsci/jenkins - ${scmTag} + jenkins-2.157 diff --git a/test-jdk8/pom.xml b/test-jdk8/pom.xml index 70c4870837b66..6ea2fb9a358dc 100644 --- a/test-jdk8/pom.xml +++ b/test-jdk8/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-test-parent - ${revision}${changelist} + 2.157 ../test-pom diff --git a/test-pom/pom.xml b/test-pom/pom.xml index 2cc12fad52107..dbe4ce1d90197 100644 --- a/test-pom/pom.xml +++ b/test-pom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.157 jenkins-test-parent diff --git a/test/pom.xml b/test/pom.xml index 4c5abecc6f4f7..39330102dc39a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-test-parent - ${revision}${changelist} + 2.157 ../test-pom diff --git a/war/pom.xml b/war/pom.xml index 6ed9553904b64..20d6ed3f068e5 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.157 jenkins-war From 78bad9afb80f9a59783724851f49636dfdb40e22 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 6 Jan 2019 14:39:58 -0800 Subject: [PATCH 8/8] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 6 +++--- test-jdk8/pom.xml | 2 +- test-pom/pom.xml | 2 +- test/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 4a0e095304310..0a5aa6a5c328e 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.157 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index 1a7b98924021b..3f1d559fa222f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.157 + ${revision}${changelist} jenkins-core diff --git a/pom.xml b/pom.xml index 69dd99ea68a1c..fdc5425bc4388 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.157 + ${revision}${changelist} pom Jenkins main module @@ -60,7 +60,7 @@ THE SOFTWARE. scm:git:git://github.com/jenkinsci/jenkins.git scm:git:ssh://git@github.com/jenkinsci/jenkins.git https://github.com/jenkinsci/jenkins - jenkins-2.157 + ${scmTag} @@ -76,7 +76,7 @@ THE SOFTWARE. - 2.157 + 2.158 -SNAPSHOT