OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,590 Commits 55 Branches 1,942 Tags
1e646ff7ee52ecbbca3d7957b65fb4edfd39d653
Commit Graph
32590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Glick e1d622fe9d Merge (-s ours) stable-2.73 into master 2017-09-06 14:46:14 -04:00
Jesse Glick 329ca378f5 Merge (-s ours) stable-2.60 into stable-2.73 2017-09-06 14:44:59 -04:00
Jesse Glick 6211e8b6ec Merge branch 'master' of git://github.com/jenkinsci/jenkins 2017-09-06 14:43:35 -04:00
Jesse Glick 3d8e9b8de3 Merge branch 'stable-2.60' of git://github.com/jenkinsci/jenkins into stable-2.60 2017-09-06 14:41:25 -04:00
Baptiste Mathus 2c1876fa18 Bump to 1.39 release 2017-09-06 16:34:44 +02:00
Jesse Glick 68f5585999 Merge pull request #2959 from jglick/lambdas 
Using RestartableJenkinsRule.then
 2017-09-05 18:41:40 -07:00
Jesse Glick 810a21534d [JENKINS-46659] Suppressing failing CLIActionTest.interleavedStdio. 2017-09-05 19:05:19 -04:00
Jesse Glick b979b26fb9 Merge branch 'master' into lambdas 2017-09-05 18:49:21 -04:00
liketic bde6413f5d [Fix JENKINS-46161] Add javadoc and annotation CheckForNull 2017-09-05 20:29:49 +08:00
Johan Sigfred Abildskov 980dcc5deb Update manage_da.properties, fix typo 
There was a simple typo. Andministrer is not a word in danish, while administrer is.
 2017-09-05 12:58:44 +02:00
liketic d2ae25cc06 [Fix JENKINS-46161] Make ReverseBuildTrigger#getUpstreamProjects null-safe 2017-09-05 18:54:10 +08:00
Oleg Nenashev dfd44ec955 [JENKINS-46282] - Update WinSW from 2.1.0 to 2.1.2 (#2987) 
* [JENKINS-46282] - Update WinSW from 2.1.0 to 2.1.2

Fixes [JENKINS-46282](https://issues.jenkins-ci.org/browse/JENKINS-46282), which impacts the default installation.
Also updates Parent POM in the module

Full list of fixes:

- JENKINS-46282 - Runaway Process Killer extension was not using the stopTimeoutMs parameter
- [WinSW Issue #206](https://github.com/kohsuke/winsw/issues/206) - Prevent printing of log entries in the `status` command
- [WinSW Issue #218](https://github.com/kohsuke/winsw/issues/218) - Prevent hanging of the stop executable when its logs are not being drained do the parent process

Full Diff: https://github.com/kohsuke/winsw/compare/winsw-v2.1.0...winsw-v2.1.2

* [JENKINS-46282] - Pick the released version of Windows Agent Installer

(cherry picked from commit 100202cf03)
 2017-09-04 15:57:40 +02:00
bale836 593f707eaa [JENKINS-46288] - Fix ProxyConfiguration validation for NTLM authentication (#2984) 
/**
     * Constructor.
     * @param userName The user name.  This should not include the domain to authenticate with.
     * For example: "user" is correct whereas "DOMAIN\\user" is not.
     * @param password The password.
     * @param host The host the authentication request is originating from.  Essentially, the
     * computer name for this machine.
     * @param domain The domain to authenticate within.
     */

(cherry picked from commit ccb3e4cd50)
 2017-09-04 15:54:41 +02:00
Andrew Bayer 66e199dcff [FIXED JENKINS-45909] ReverseBuildTrigger.upstreamProjects should be null safe 
(cherry picked from commit f8dd58425f)
 2017-09-04 15:51:33 +02:00
Andrew Bayer 69d8fe47ff [FIXED JENKINS-46082] API will include culprits again. 
(cherry picked from commit a975f7227e)
 2017-09-04 15:50:35 +02:00
Kohsuke Kawaguchi 5b8ea4fe45 [maven-release-plugin] prepare for next development iteration 2017-09-03 23:46:01 -07:00
Kohsuke Kawaguchi fd03488ee3 [maven-release-plugin] prepare release jenkins-2.77 jenkins-2.77 2017-09-03 23:46:00 -07:00
Daniel Beck 5552fa546c Merge pull request #2999 from ndeloof/java8default 
rely on java8 default methods to avoid code duplication
 2017-09-02 19:43:50 -07:00
Kseniia Nenasheva 757fbe41fa [FIXED JENKINS-41637] Users with discover permission get broken UI when renaming job to inaccessible one (#2910) 
* [JENKINS-41637] - Add new check that new job name isn't used

* Fixed bugs

* Address comment

* [JENKINS-41637] - Address comments

* Add logging

* Address comment
 2017-09-02 19:01:05 -07:00
Josiah Haswell 33799df36c [FIXED JENKINS-31068] Monitor does not detect when Tomcat URL encoding parameter rejects forward slashes in URL (#2977) 
* Fixing JENKINS-31068

* backing out changes--they don't fully work

* Saving progress so that I can revert to an earlier version for tests

* So, pretty exhaustive testing yields that these modifications have the same behavior as the previous versions

* [FIX JENKINS-31068] Adding wiki reference to error message.  Adding trailing slash to URL

* [FIX JENKINS-31068] It looks like different versions of Tomcat and Apache HTTP handle this case differently. Really, the best we can do is check to see if the test method was not hit and passed correctly--if we hit it, we get more information on the configuration error.  If we don't, we just refer them to a general wiki page
 2017-09-02 18:58:15 -07:00
Bernhard Grünewaldt 3bc9c86556 Rss Bar and Legend Link (Job List Footer) Added Classes and IDs to enable easy styling for external themes (#2989) 
* ui classes to enable easy styling

* fix align right html to css

* move css to style.css

* Revert "move css to style.css"

This reverts commit f26162a0f3.

* move css to style.css (without unrelated spaces changed)

* remove ids and use classes
 2017-09-02 18:50:17 -07:00
Jesse Glick a032c59e06 [JENKINS-45892] Enhanced diagnostics (#2997) 
* [JENKINS-45892] Enhanced diagnostics.

* Refined fix which should avoid a needless warning when called from MultiBranchProject.onLoad.
 2017-09-02 18:42:04 -07:00
Nicolas De Loof 30a927fd8c rely on java8 default methods to avoid code duplication 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2017-09-02 14:14:38 -07:00
Oleg Nenashev 4d60ca6de6 Merge pull request #2996 from rtyler/update-center-https 
Default the built-in Jenkins Update Center URL to https://updates.jenkins.io
 2017-09-02 13:33:28 -07:00
hplatou 0efdf8fb4f [JENKINS-13153] - Use directory from env:BASE when writing jenkins.copies (#2992) 
[JENKINS-13153] - Use directory from env:BASE when writing jenkins.copies
 2017-09-02 12:08:11 -07:00
Baptiste Mathus f420038bba [JENKINS-46603] Remove overrides to inherit upgraded versions 2017-09-02 02:58:12 +02:00
Baptiste Mathus 08a07fc69e [JENKINS-46603] Verify https://github.com/jenkinsci/pom/pull/16 2017-09-02 02:30:20 +02:00
R. Tyler Croy c709b1932c Default the built-in Jenkins Update Center URL to https://updates.jenkins.io 
Now that we're using JDK8, we can rely on our Let's Encrypt-based certificates
on *.jenkins.io

Live from Jenkins World!

Signed-off-by: M. Allan <max.allan@surevine.com>
Signed-off-by: R. Tyler Croy <tyler@monkeypox.org>
 2017-09-01 10:18:51 -07:00
Oleg Nenashev 69828cd85c Upgrade Remoting to 3.11 (#2988) 
* Use ClassFilter.appendDefaultFilter.

* FindBugs

* Update Jenkins Remoting to 3.11, fix reported FindBugs issues

(cherry picked from commit dc8000cc1e)
 2017-09-01 15:46:06 +02:00
istrangiu 6f537669d6 JENKINS-42854: Added description field to the 'Computer' api 2017-08-30 17:11:28 +01:00
Kohsuke Kawaguchi 8189c2cd9a [maven-release-plugin] prepare for next development iteration 2017-08-27 17:56:12 -07:00
Kohsuke Kawaguchi 7b8ddc1973 [maven-release-plugin] prepare release jenkins-2.76 jenkins-2.76 2017-08-27 17:56:12 -07:00
Oleg Nenashev dc8000cc1e Upgrade Remoting to 3.11 (#2988) 
* Use ClassFilter.appendDefaultFilter.

* FindBugs

* Update Jenkins Remoting to 3.11, fix reported FindBugs issues
 2017-08-25 22:34:27 +02:00
Jesse Glick b3e2ed8a37 [JENKINS-29537] Merged #2993: amended EnvironmentContributingAction signature. 2017-08-25 14:28:24 -04:00
Oleg Nenashev 12a949ea01 Update to Jenkins Parent POM 1.38 (#2985) 
* Update to Jenkins Parent POM 1.39

* Pick the released version of Jenkins POM
 2017-08-25 16:04:09 +02:00
godfath3r 4d2100d084 [JENKINS-42376] - Add executor name on Unexpected exception. (#2970) 
* Add executor name on Unexpected exception.

* Add a colon after job name

(cherry picked from commit 86c28ea056)
 2017-08-24 09:01:42 +02:00
Josiah Haswell 9a8fdb9ac3 [FIX JENKINS-43848] - Lack of cache-invalidation headers results in stale item list (#2973) 
* Saving progress for review

* Adding licenses

* Adding integration test for headers

* Removing proposal for refactoring to method objects

* Removing whitespace changeswq

* Fixing test

(cherry picked from commit 34bf393255)
 2017-08-24 08:56:19 +02:00
Oliver Gondža c01a597f47 Towards 2.73.1 2017-08-23 12:54:59 +02:00
Oleg Nenashev 862de86129 Merge pull request #2983 from alshopov/master 
Bulgarian translation
 2017-08-22 11:55:49 +02:00
Akbashev Alexander c60735a124 [JENKINS-29537] EnvironmentContributingAction compatible with Workflow (#2975) 
* [JENKINS-29537] EnvironmentContributingAction compatible with Workflow

+ Adds new method with default implementation in EnvironmentContributingAction to support Runs
+ Marks AbstractBuild as deprecated
+ Adds default implementation for deprecated method for backward
compatiblity.

* Tiny improvements in javadoc
 2017-08-22 10:33:10 +02:00
Kohsuke Kawaguchi 8c580ddd86 [maven-release-plugin] prepare for next development iteration 2017-08-21 07:44:04 -07:00
Kohsuke Kawaguchi 5fcccf79fa [maven-release-plugin] prepare release jenkins-2.75 jenkins-2.75 2017-08-21 07:44:04 -07:00
Alexander Shopov 252564aa69 Bulgarian translation of HTML files 2017-08-20 12:37:16 +02:00
Alexander Shopov b90f067e1b Bulgarian translation of properies files 2017-08-20 12:24:07 +02:00
Oleg Nenashev 100202cf03 [JENKINS-46282] - Update WinSW from 2.1.0 to 2.1.2 (#2987) 
* [JENKINS-46282] - Update WinSW from 2.1.0 to 2.1.2

Fixes [JENKINS-46282](https://issues.jenkins-ci.org/browse/JENKINS-46282), which impacts the default installation.
Also updates Parent POM in the module

Full list of fixes:

- JENKINS-46282 - Runaway Process Killer extension was not using the stopTimeoutMs parameter
- [WinSW Issue #206](https://github.com/kohsuke/winsw/issues/206) - Prevent printing of log entries in the `status` command
- [WinSW Issue #218](https://github.com/kohsuke/winsw/issues/218) - Prevent hanging of the stop executable when its logs are not being drained do the parent process

Full Diff: https://github.com/kohsuke/winsw/compare/winsw-v2.1.0...winsw-v2.1.2

* [JENKINS-46282] - Pick the released version of Windows Agent Installer
 2017-08-19 21:50:17 +02:00
Oleg Nenashev efdd52e9e7 [JENKINS-45841] - Disable JNLP/JNLP2/CLI protocols on new installations (#2950) 
* [JENKINS-45841] - Disable JNLP/JNLP2/CLI protocols in the Setup Wizard

* [JENKINS-45841] - Implement deprecation data model for Agent protocols.

WiP

* [JENKINS-45841] - DeprecationCause is YAGNI, extend UI and document deprecated protocols

* [JENKINS-45841] - Fix the layouts

* [JENKINS-45841] - Add administrative monitor for deprecated protocols

* [JENKINS-45841] - Added Initializer check, polished the warning message

* [JENKINS-45841] - Add tests

* [JENKINS-45841] - Replace JNLP protocol links by jenkins.io redirects

* [JENKINS-45841] - Address comments from @jglick

* [JENKINS-45841] - Initializer checks status when Jenkins instance is not ready
 2017-08-19 18:23:31 +02:00
Oleg Nenashev d8ef4be53e Merge pull request #2981 from joyyc/master 
Just get rid of excess semicolons in h.m.Run
 2017-08-19 18:20:53 +02:00
bale836 ccb3e4cd50 [JENKINS-46288] - Fix ProxyConfiguration validation for NTLM authentication (#2984) 
/**
     * Constructor.
     * @param userName The user name.  This should not include the domain to authenticate with.
     * For example: "user" is correct whereas "DOMAIN\\user" is not.
     * @param password The password.
     * @param host The host the authentication request is originating from.  Essentially, the
     * computer name for this machine.
     * @param domain The domain to authenticate within.
     */
 2017-08-19 15:28:48 +02:00
Kohsuke Kawaguchi 73ce3d74de [maven-release-plugin] prepare for next development iteration 2017-08-16 18:36:21 -07:00
Kohsuke Kawaguchi 81e52b83d5 [maven-release-plugin] prepare release jenkins-2.60.3 jenkins-2.60.3 2017-08-16 18:36:20 -07:00