Commit Graph
32590 Commits
Author SHA1 Message Date
Baptiste Mathus a172d11760 Bump to latest 1.50 parent pom release
As 1.51 is upcoming, main goal here is to get an intermediate release
with 1.50 in case we have data in case things go wrong with one or another
and more quickly figure if this is likely to be coming from 1.50 or 1.51.
2018-12-01 23:12:05 +01:00
Oleg Nenashev 055b913a75 Merge pull request #3774 from batmat/pluginManager-Nonnull
Document that Jenkins.getPluginManager() is not nullable
2018-11-30 08:13:09 +01:00
Josh Soref 86b218ebb6 Add periods to sentences 2018-11-29 22:03:35 -05:00
Josh Soref af6e6672d5 Improve Fingerprint Check English 2018-11-28 23:49:24 -05:00
Oleg Nenashev 1639560f2b Merge pull request #3775 from jsoref/slave-deprecated-2.2
Adding @Deprecated to Slave/DumbSlave constructors
2018-11-27 21:19:40 +01:00
Oliver Gondža 9ba1f32a91 Bump ATH version to one that support Selenium 3 2018-11-27 13:23:21 +01:00
Josh Soref a90331177c Adding @Deprecated to Slave/DumbSlave constructors
These constructors were deprecated a long time ago, but the annotation was not added...
2018-11-26 15:27:03 -05:00
Daniel Beck 0a1bcceddb Merge commit 'd2a0cef28e62dd8acc68bf6a3fc201741dc16217' into security-master 2018-11-26 12:54:08 +01:00
Daniel Beck b0e1db3096 Merge commit 'd2a0cef28e62dd8acc68bf6a3fc201741dc16217' of https://github.com/jenkinsci/jenkins 2018-11-26 12:52:13 +01:00
Baptiste Mathus 7b22268b55 Document that Jenkins.getPluginManager() is not nullable 2018-11-26 11:17:13 +01:00
Kohsuke Kawaguchi d2a0cef28e [maven-release-plugin] prepare for next development iteration 2018-11-25 14:14:26 -08:00
Kohsuke Kawaguchi fbeccd60de [maven-release-plugin] prepare release jenkins-2.153 jenkins-2.153 2018-11-25 14:13:59 -08:00
Oleg Nenashev 68af8c83c1 [JENKINS-45318] - Update the SSHD module from 2.4 to 2.5 2018-11-25 14:59:59 +01:00
Mark Waite 217b293421 [JENKINS-52282] Add isJavaWebStartSupported to JNLPLauncher (#3766)
* [JENKINS-52282] Add isJavaWebStartSupported to JNLPLauncher

Seems cleaner to use JNLPLauncher than to use Functions.  Narrows the
scope of the method so that callers know it is specific to
JNLPLauncher.

* Include hyperlink to jenkins.io Java Web Start redirect page
2018-11-24 21:22:43 +01:00
charanbir b0d1501c35 [JENKINS-45318] - Add dependancy on net.i2p.crypto to Jenkins CLI (#3764)
* JENKINS-45318 Add dependancy on net.i2p.crypto inside sshd module

* JENKINS-45318 Add dependancy on net.i2p.crypto inside sshd module

* [JENKINS-45318] - Add reference to the ticket
2018-11-24 10:40:18 +01:00
Oleg Nenashev 1a9a05d3e9 Merge pull request #3771 from Inetov/fix_translation
some fixes in russian translation
2018-11-24 10:39:57 +01:00
Oleg Nenashev b6b7656076 Merge pull request #3768 from MRamonLeon/JENKINS-54731
[JENKINS-54731] Fix checkUpdateAttempts system property
2018-11-23 17:21:00 +01:00
Oleg Nenashev 95c8b21407 Merge pull request #3769 from MRamonLeon/JENKINS-54459-fix-flaky-retriertest
[JENKINS-54459] Fix flaky on delay test
2018-11-23 17:20:45 +01:00
Daniel Beck 9494748f93 Add missing dependency on cloudbees-folder in test
This got lost in the upmerge due a bad merge after test
was split up into multiple modules
2018-11-23 15:29:38 +01:00
Inetov 6aa9aa3081 some fixes in russian translation 2018-11-23 13:37:49 +03:00
Daniel Beck dfa84afa43 Merge branch 'security-stable-2.150' into security-master 2018-11-23 00:21:56 +01:00
Daniel Beck 896356a038 Merge commit '8d429ff13b2013ff0b390d59f9c8a7674e6d24a1' into security-master 2018-11-23 00:19:45 +01:00
Daniel Beck 1c50cb10ee Merge branch 'stable-2.150' 2018-11-23 00:09:32 +01:00
Daniel Beck fa155d596e Merge commit '8d429ff13b2013ff0b390d59f9c8a7674e6d24a1' of https://github.com/jenkinsci/jenkins 2018-11-23 00:09:27 +01:00
Daniel Beck 2044726716 Merge branch 'security-stable-2.138' into security-stable-2.150 2018-11-23 00:07:50 +01:00
Daniel Beck 79384efd22 Merge branch 'stable-2.150' into security-stable-2.150 2018-11-23 00:07:37 +01:00
Daniel Beck af455a6291 Merge branch 'stable-2.150' of https://github.com/jenkinsci/jenkins into stable-2.150 2018-11-22 22:13:24 +01:00
Wadeck Follonier 7bae6dd6ef [SECURITY-1072] Make ApiTokenStats work 2018-11-22 11:57:29 +01:00
Daniel Beck db5defdf2f Merge branch 'security-stable-2.150' into security-master 2018-11-21 15:42:46 +01:00
Daniel Beck 90b6d47af7 Merge branch 'security-stable-2.138' into security-stable-2.150 2018-11-21 15:38:34 +01:00
Daniel Beck 3353e66082 Merge branch 'security-stable-2.121' into security-stable-2.138 2018-11-21 15:36:25 +01:00
Daniel Beck 19698a8262 Merge branch 'security-stable-2.107' into security-stable-2.121 2018-11-21 15:33:15 +01:00
Daniel BeckandWadeck Follonier 47f38d714c [SECURITY-595]
Co-Authored-By: Wadeck Follonier <wadeck.follonier@gmail.com>
2018-11-21 15:09:49 +01:00
Daniel Beck 9c7c4d930f Merge branch 'security-stable-2.150' into security-master 2018-11-21 14:28:24 +01:00
Daniel Beck 69eacee964 Merge branch 'security-stable-2.138' into security-stable-2.150 2018-11-21 14:25:44 +01:00
Daniel Beck 23ea44f9ae Merge branch 'security-stable-2.121' into security-stable-2.138 2018-11-21 14:22:28 +01:00
Daniel Beck 748e2f326e Merge branch 'security-stable-2.107' into security-stable-2.121 2018-11-21 13:52:38 +01:00
Denis Shvedchenko 73afa0ca78 [SECURITY-1193] 2018-11-21 13:47:24 +01:00
Jeff Thompson 4ed66e5838 [SECURITY-1072] 2018-11-21 13:46:31 +01:00
Wadeck Follonier c19cc70568 [SECURITY-904] 2018-11-21 13:41:15 +01:00
M Ramon Leon 978f001beb [JENKINS-54459] Fix flaky on delay test
Sometimes the execution last exactly SLEEP milliseconds so it becomes
a failure.
2018-11-21 09:58:27 +01:00
Jesse Glick a972c43982 Merge pull request #3757 from jglick/generateConsoleAnnotationScriptAndStylesheet
[JENKINS-38719] Console note/annotator script.js URLs must include SESSION_HASH

(cherry picked from commit 0331d47d60)
2018-11-21 09:49:48 +01:00
Francisco Fernández 27618374de [JENKINS-54310] java.io.IOException: Stream is closed when the CLI has not read entirely the input (#3708)
* [JENKINS-54310] read the input at once

* [JENKINS-54310] reading as String

* [JENKINS-54310] Change the approach for those CLI that open a shell

(cherry picked from commit f6ef70a8d4)
2018-11-21 09:30:20 +01:00
Daniel Beck a3bf6f932f Merge (-s ours) stable-2.150 into master 2018-11-20 21:33:10 +01:00
Daniel Beck 586eb176b0 Merge master into security-master 2018-11-20 21:33:10 +01:00
Daniel Beck 7bdefbed29 Merge (-s ours) stable-2.138 into stable-2.150 2018-11-20 21:33:09 +01:00
Daniel Beck 377bc7f9b5 Merge branch 'security-stable-2.138' into security-master 2018-11-20 21:22:58 +01:00
Daniel Beck b7b580bda3 Merge branch 'stable-2.138' 2018-11-20 21:15:58 +01:00
M Ramon Leon b1e8c6565c [JENKINS-54731] Fix checkUpdateAttempts system property
Rename hudson.PluginManager.CHECK_UPDATE_ATTEMPTS system property to
hudson.PluginManager.checkUpdateAttempts
2018-11-20 18:12:37 +01:00
Stephen Connolly 389c5a7e60 Merge pull request #3269 from stephenc/jenkins-45235
[FIXED JENKINS-45235] When multiple update sites publish different versions, allow those versions to be seen
2018-11-19 13:35:21 +00:00