Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 55d3487158 [maven-release-plugin] prepare for next development iteration 2017-07-10 07:23:24 -07:00
Kohsuke Kawaguchi a0118d359c [maven-release-plugin] prepare release jenkins-2.69 jenkins-2.69 2017-07-10 07:23:23 -07:00
Nikolas Falco cf0183d1ed [JENKINS-14807] Fix path separator when EnvVars overrides variable like
PATH+XYZ

The getEnvironment(Node, TaskListener) now returns an environment setup
correctly with the platform value of the computer node where the job is
executed.
2017-07-10 13:51:30 +02:00
Oleg Nenashev c064d88a3b [JENKINS-34914] - Prevent NPE in Jenkins#getRootURL() when the nstance is not fully loaded 2017-07-09 11:56:40 +02:00
Jesse Glick 00956ff9da [JENKINS-39738, JENKINS-43668] - Pick up SSHD module including sshd-core 1.6.0 (#2853)
* Pick up SSHD module including sshd-core 1.4.0.

* [FIXED JENKINS-39738] Picking up https://github.com/jenkinsci/sshd-module/commit/bb6963453086edef4e600abb2740182cd2f4ade0

* Picking up Apache SSHD 1.6.0 & Jenkins sshd module 2.0.
2017-07-08 01:01:01 +02:00
Jesse Glick 42076d9123 Merge branch 'security-stable-2.60' into security-master 2017-07-05 14:07:15 -04:00
Jesse Glick a9b8ccfa7c Merge branch 'stable-2.60' 2017-07-05 14:07:10 -04:00
Jesse Glick ed6304fb6c Merge branch 'stable-2.46' into stable-2.60 2017-07-05 14:06:47 -04:00
Jesse Glick b9663bf09a Merge (-s ours) stable-2.60 into master 2017-07-05 13:59:21 -04:00
Oleg Nenashev db5b482909 [FIXED JENKINS-44764, JENKINS-44894] - Update Extras Executable War from 1.34 to 1.35.1 (#2917)
* [FIXED JENKINS-44764, JENKINS-44894] - Update Extras Executable War from 1.34 to 1.35

* Pick version with a system property name fix, noticed by @daniel-beck

(cherry picked from commit cb3f713122)
2017-07-04 10:04:12 +02:00
Oleg Nenashev 2f20efbee9 Merge pull request #2914 from jglick/FilePath.list
[JENKINS-44942] - FilePath.list() & .listDirectories() null safety

(cherry picked from commit a5dc255d21)
2017-07-04 09:59:21 +02:00
Daniel Beck 2888032917 [FIX JENKINS-44769] Don't access response when called from CLI
(cherry picked from commit 83671af504)
2017-07-04 09:51:57 +02:00
Daniel Beck 92a3e42068 Merge pull request #2908 from jglick/cleanUp
[JENKINS-44589] Adding some missing calls to cleanUp

(cherry picked from commit 0ec25081ee)
2017-07-04 09:50:59 +02:00
Oliver Gondža 65a34e11a9 Restrict new API member 2017-07-04 09:48:22 +02:00
Andres Rodriguez 65def10f5a [JENKINS-44608] Don't check for monitor activation if it is disabled
(cherry picked from commit ce07ccbcd7)
2017-07-04 09:29:29 +02:00
Kseniia Nenasheva 8c4aae0b95 [FIXED JENKINS-44523] - Do not submit form when pressing Enter in the… (#2902)
* [FIXED JENKINS-44523] - Do not submit form when pressing Enter in the PM filter field.

* Fix indenting

(cherry picked from commit 36e7945640)
2017-07-04 09:24:28 +02:00
Oleg Nenashev beb63a2f59 Merge pull request #2927 from daniel-beck/JENKINS-9283-docs
Document timezone specification and provide full list

(cherry picked from commit 26fc2a9650)
2017-07-04 09:19:29 +02:00
Kohsuke Kawaguchi 2145dbf9f9 [maven-release-plugin] prepare release jenkins-2.68 jenkins-2.68 2017-07-02 18:16:31 -07:00
Kohsuke Kawaguchi 64e8ea3d75 [maven-release-plugin] prepare for next development iteration 2017-07-02 18:16:31 -07:00
Oleg Nenashev cc1615b9ef Merge pull request #2931 from jglick/ReloadConfigurationCommand
[JENKINS-45256] The reload-configuration CLI command ought to wait until the reload is finished
2017-07-01 12:50:41 +02:00
Oleg Nenashev 26fc2a9650 Merge pull request #2927 from daniel-beck/JENKINS-9283-docs
Document timezone specification and provide full list
2017-07-01 08:13:12 +02:00
Oleg Nenashev bcf55ecd7f [JENKINS-43496] - Add handling of the null Node#createComputer() result. (#2922)
* [JENKINS-43496] - Add handling of the null Node#createComputer() result.

it is a follow-up to https://github.com/jenkinsci/jenkins/pull/2836#discussion_r110604865

De-facto many Cloud plugins return `null` in `Node#createLauncher()`, but it has never been documented.
In order to prevent possible API misusages in the future, I have added annotations and fixed handling of the extension point in `AbstractCIBase#updateComputer()` which may fail in the case of `null` or `RuntimeException` in the Node implementation.

* [JENKINS-43496] - Use ProtectedExternally to protect Node#createComputer()

* [JENKINS-43496] - Remove the erroneous Nonnull annotation after the feedback from @jglick

* [JENKINS-43496] - Fix typos noticed by @daniel-beck
2017-07-01 08:11:16 +02:00
Oleg Nenashev e7cdd6517c [JENKINS-39370] - Update Remoting in Jenkins core to 3.10 (#2886)
* Update Remoting in Jenkins core to 3.8

* JENKINS-39370 - Introduce support of Work Directories in remoting (opt-in).
* PR 129 - Allow configuring java.util.logging settings via a property file (-loggingConfig or JUL system property). See the Logging page for more details.
* JENKINS-37567 - Change of the code signing certificate

More info: https://github.com/jenkinsci/remoting/blob/master/CHANGELOG.md#38

* [JENKINS-39370] - Add direct tests for JNLP Launcher start with -workDir

* Pick Remoting 3.9

* Improve error message of LauncherTest#remoteKill()

* Update Remoting to 3.10
2017-07-01 07:54:48 +02:00
Oliver Gondža b7ec53423e Merge pull request #2897 from olivergondza/JENKINS-44361
[FIXED JENKINS-44361] Follow HTTP redirects while initiating CLI connection
2017-06-29 20:15:57 +02:00
Daniel Beck c906a181ad s/timezone/time zone 2017-06-29 14:37:19 +02:00
Oleg Nenashev 9b4b9ff80c Merge pull request #2929 from jglick/user.name.escaped
[INFRA-1032] ${user.name} might contain metacharacters
2017-06-28 14:00:58 +02:00
Stephen Connolly 31a2bc1c30 Merge branch 'master' into jenkins-21017 2017-06-27 09:57:13 +01:00
Jesse Glick 4a4bdc981f The reload-configuration CLI command ought to wait until the reload is finished. 2017-06-26 18:10:28 -04:00
Ksenia Nenasheva 676b2ff814 Tabulation 2017-06-27 00:04:04 +02:00
Ksenia Nenasheva b4be11ce5a Remove Enable Security checkbox in the Global Security configuration 2017-06-26 23:45:47 +02:00
Jesse Glick 7b69fe5be6 [INFRA-1032] ${user.name} might contain metacharacters. 2017-06-26 15:19:27 -04:00
Daniel Beck 9635b7241f Add list of supported time zone IDs, rephrase some of the doc 2017-06-26 18:29:39 +02:00
Oleg Nenashev f6176bc19d [JENKINS-9283] - Don't accept invalid timezones, add form validation 2017-06-26 18:03:39 +02:00
Oleg Nenashev b171bc6053 [JENKINS-9283] - Document timezones support in help pages 2017-06-26 18:03:39 +02:00
Oleg Nenashev 78a42d5a4a [JENKINS-38527] - Prevent NullPointerException in Slave#createLauncher() and add cause diagnostics (#2923)
* [JENKINS-38527] - Prevent NullPointerException in Slave#createLauncher() and add cause diagnostics

The original issue comes from the isUnix() unboxing, but we can also get into an issue later if we pass a null Channel instance to the logic.
This change adds some diagnostics which discovers potential root causes of such potential NPEs due to the race conditions with Computer reconnection

* [JENKINS-38527] - Also handle cases when Channel#isClosingOrClosed() as @stephenc suggested
2017-06-26 11:02:52 +02:00
Kohsuke Kawaguchi 006fd89469 [maven-release-plugin] prepare for next development iteration 2017-06-25 18:05:46 -07:00
Kohsuke Kawaguchi 3fbd941c2a [maven-release-plugin] prepare release jenkins-2.67 jenkins-2.67 2017-06-25 18:05:46 -07:00
Daniel Beck fe4d739bd1 Merge pull request #2924 from jglick/annotation-indexer-1.12
annotation-indexer 1.12
2017-06-24 22:00:25 +02:00
Daniel Beck 4515a07518 Merge pull request #2895 from abayer/jenkins-34464
[JENKINS-34464] Switch ReverseBuildTrigger.threshold to DataBoundSetter
2017-06-24 21:59:58 +02:00
Daniel Beck 2b8b189979 Merge pull request #2921 from jenkinsci/pr-template-update
Simplify the pull-request template
2017-06-24 21:59:09 +02:00
Oleg Nenashev 095310afdd Annotate and document methods of hudson.Launcher (#2920)
* Annotate and document methods of hudson.Launcher

* Fix newly introduced FindBugs issues in hudson.Launcher

* Remove brackets from FilePath#createLauncher() to avoid the merge conflict
2017-06-24 19:17:11 +02:00
Kohsuke Kawaguchi 4ee8195154 [maven-release-plugin] prepare for next development iteration 2017-06-22 07:14:42 -07:00
Kohsuke Kawaguchi adbd903f93 [maven-release-plugin] prepare release jenkins-2.60.1 jenkins-2.60.1 2017-06-22 07:14:42 -07:00
Oleg Nenashev a0b02b6bcd Merge pull request #2896 from oleg-nenashev/bug/JENKINS-44103-UI
[JENKINS-44103] - Cleanup usages of the "JNLP" term in TcpSlaveAgentListener
2017-06-22 13:18:37 +02:00
Oleg Nenashev 3dc9c483d4 Address comment from @daniel-beck 2017-06-22 09:16:38 +02:00
Jesse Glick 6b44ccbfdb annotation-indexer 1.12 2017-06-21 15:20:27 -04:00
Oliver Gondža 662df37426 Resolving the redirect is OK to fail 2017-06-19 13:22:25 +02:00
Oliver Gondža d9cb39f95f Use authorization to resolve redirect 2017-06-19 12:52:18 +02:00
Oliver Gondža 749ca07380 Do not timeout the test when cli invocation fails 2017-06-19 12:51:22 +02:00
Oliver Gondža 552d2835cc Address review comment 2017-06-19 09:34:44 +02:00