Commit Graph
32590 Commits
Author SHA1 Message Date
Jesse Glick 5d981855f1 Correctly compute plugin name when multiple sources are passed. 2016-12-20 20:18:14 -05:00
Jesse Glick c05e052385 Merge branch 'security-stable-2.32' into security-master 2016-12-20 15:24:26 -05:00
Jesse Glick 78f440db32 Merge branch 'security-stable-2.19' into security-stable-2.32 2016-12-20 15:22:59 -05:00
Jesse Glick f39c6b7b80 Merge branch 'security-stable-2.7' into security-stable-2.19 2016-12-20 15:21:13 -05:00
Jesse Glick 2cdabc1dec Merge branch 'security-stable-1.651' into security-stable-2.7 2016-12-20 15:20:24 -05:00
Jesse Glick 92839acc4b Merge branch 'security-stable-1.642' into security-stable-1.651 2016-12-20 15:19:11 -05:00
Jesse Glick 733e7a454d Merge branch 'security-stable-1.625' into security-stable-1.642 2016-12-20 15:18:25 -05:00
Jesse Glick 767a919b5d Merge pull request #83 from jenkinsci-cert/SECURITY-354
[SECURITY-354] Using jBCrypt 0.4
2016-12-20 15:16:46 -05:00
Jesse Glick 6efcf6c2ac Merge pull request #85 from jenkinsci-cert/security-371-staplerproxy
[SECURITY-371] Secure all administrative monitors
2016-12-20 15:16:05 -05:00
Jesse Glick 09cfbc9cd5 Merge pull request #86 from jenkinsci-cert/SECURITY-380
[FIX SECURITY-380] Don't optimize permission check in getItems()
2016-12-20 15:12:04 -05:00
Jesse Glick 87c867a3c2 Merge branch 'master' of github.com:jenkinsci-cert/jenkins 2016-12-20 15:10:23 -05:00
Jesse Glick 73dada6b6b Merge branch 'stable-2.32' 2016-12-20 15:08:12 -05:00
Jesse Glick 706aa7ad95 Merge branch 'stable-2.19' into stable-2.32 2016-12-20 15:07:59 -05:00
Jesse Glick 4753091384 Merge branch 'stable-2.19' of git://github.com/jenkinsci/jenkins into stable-2.19 2016-12-20 15:06:12 -05:00
Jesse Glick 32f5a4f229 Merge (-s ours) stable-2.32 into master 2016-12-20 15:01:42 -05:00
Jesse Glick 56f158694a Merge (-s ours) stable-2.19 into stable-2.32 2016-12-20 15:00:08 -05:00
Jesse Glick 0e3f66f583 Added test coverage for various ConsoleNote deserialization scenarios. 2016-12-20 11:24:12 -05:00
Jesse Glick 2d7e0d96b0 Deleting claimed ability in Javadoc which is no longer supportable. 2016-12-20 10:34:02 -05:00
Jesse Glick be28bbd955 Existing tests caught some mistakes. 2016-12-20 10:26:25 -05:00
Jesse Glick c3af3becb7 Making tests fail more meaningfully. 2016-12-20 10:11:00 -05:00
Daniel Beck a26b4038bc Merge pull request #2672 from olivergondza/revert-english-correct-translation
Remove polish trnaslation that sneaked into english one
2016-12-19 19:35:03 +01:00
Oliver Gondža a655611f76 Remove polish trnaslation that sneaked into english one 2016-12-19 13:34:08 +01:00
Oleg Nenashev ca8aa7748a Changelog: fix the wrong link to JENKINS-39971 in 2.37 2016-12-19 09:20:36 +01:00
Kohsuke Kawaguchi 50c5a12a91 updated changelog for release 2016-12-18 17:56:57 -08:00
Kohsuke Kawaguchi 3a3f32da9d [maven-release-plugin] prepare for next development iteration 2016-12-18 17:49:48 -08:00
Kohsuke Kawaguchi e67560843f [maven-release-plugin] prepare release jenkins-2.37 jenkins-2.37 2016-12-18 17:49:48 -08:00
Oleg Nenashev 49a123c7e5 Changelog: Noting #2671 and #2665 towards 2.37 2016-12-17 22:33:00 +01:00
Oleg Nenashev ef588be4f2 Update Jenkins remoting to 3.3 (#2671)
* JENKINS-25218 - Hardening of FifoBuffer operation logic. The change improves the original fix in `remoting-2.54`.
* JENKINS-39547 - Corrupt agent JAR cache causes agents to malfunction.

Improvements:

* JENKINS-40491 - Improve diagnostincs of the preliminary FifoBuffer termination.
* ProxyException now retains any suppressed exceptions.
2016-12-17 22:10:53 +01:00
Stephen Connolly 673cc13ffb Merge pull request #2665 from stephenc/jenkins-40252
[FIXED JENKINS-40252] Add an Iterable<T> that returns all items unsorted
2016-12-16 23:54:25 +00:00
Oleg Nenashev 1c1e9d5d64 Changelog: updates towards 2.37
Noting #2668, #2664, #2663, #2662, #2661, #2667, #2666, #2652, #2643, #2591, #2658, #2645, #2660, #2603
2016-12-17 00:29:06 +01:00
bpedersen2 8634965a4f [JENKINS-39971] Always display the recheck button in the Plugin Manager (#2668)
The re-check updatecenter button should be visible even if there are
currently no pending updates.
2016-12-16 22:53:20 +01:00
Oleg Nenashev a0262d2fec [JENKINS-40435] - Use BulkChange when processing config changes in Job#doConfigSubmit. (#2664)
When an empty Freestyle job config gets submitted in the default configuration of Jenkins 2.35, the data is being saved to the disk *8 times*. All of them happen in this code: https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Job.java#L1227-L1246

* setDisplayName
* Project#getBuildWrappersList().rebuild (onModified handler)
* Project#getBuilderList().rebuild (onModified handler)
* Project#getPublisherList().rebuild (onModified handler)
* AbstractProject#makeDisabled
* AbstractProject#setScm
* AbstractProject#triggers.replaceBy
* final save()

There is not so much sense to save partial configurations to the disk due to the risk of data inconsistency there. This change just wraps the config submission section of the job into the BulkChange clause.
2016-12-16 22:52:31 +01:00
Markus Winter a1258c0009 [JENKINS-40365] add Node#getNodeProperty methods (#2663)
* [JENKINS-40365] add getNodeProperty methods

* implement getNodeProperty in DummySlave

* implement getNodeProperty in Node

avoid binary imcompatible change
dded javadoc

* revert Slave.jar to original

* fix formatting

* more formatting
2016-12-16 22:52:09 +01:00
Oleg Nenashev ef8ddd8a48 [FIXED JENKINS-40362] - Update SSHD Module to 1.9 (#2662) 2016-12-16 22:51:21 +01:00
Daniel Beck 7bb4a592d4 [FIX JENKINS-39433] Make URI encoding check into admin monitor (#2661) 2016-12-16 22:50:37 +01:00
Andrew Bayer 17b98d6246 Responding to review comments. 2016-12-16 13:44:36 -05:00
Andrew Bayer 8126525582 [SECURITY-371] Ensure admin access for all AdministrativeMonitor actions. 2016-12-16 13:36:47 -05:00
Daniel Beck 159192ff41 Merge pull request #2667 from oleg-nenashev/bug/JENKINS-40489
[FIXED JENKINS-40489] - Fix Jenkins initialization stage names
2016-12-16 02:15:31 +01:00
Daniel Beck 4e424e5a33 Merge pull request #2666 from olivergondza/cli-warning
Do not report -noCertificateCheck warning on STDOUT
2016-12-16 02:14:34 +01:00
Stephen Connolly 6ce8cafcdd Oleg wanted Javadoc commend 2016-12-15 23:13:50 +00:00
Oleg Nenashev 9c23a30e67 [FIXED JENKINS-40489] - Fix Jenkins initialization stage names 2016-12-16 00:03:06 +01:00
Bryson Gibbons 0060335b8c [JENKINS-32797] Break the catch clause contents of Jenkins.getTarget(… (#2652)
* [JENKINS-32797] Break the catch clause contents of Jenkins.getTarget() out into a separate, publicly accessible function.

This will allow plugins (particularly authentication plugins that override the normal authentication process) to determine if authentication is not required for a particular path by calling isPathUnprotected(restOfPath).

* Add @since TODO to comment

* Change name of function to something that is accurate and clear

isPathUnprotected is misleading, and the Javadoc was worse. isSubjectToMandatoryReadPermissionCheck is a much better name, and the return value is reversed to match the name,
2016-12-15 23:49:13 +01:00
Damian Szczepanik bd6a7d6751 Polish translations (added new, removed outdated) (#2643) 2016-12-15 23:43:55 +01:00
Oliver Gondža 59291a63c7 Do not report -noCertificateCheck warning on STDOUT 2016-12-15 16:22:24 +01:00
Stephen Connolly 16254cb8ba [JENKINS-40252] Switch to allItems where traversal order is not important
- Also switch in cases where we have a subset that is likely significantly smaller and hence quicker to sort
2016-12-15 10:35:00 +00:00
Pavel Janousek 15e6987419 [JENKINS-38903] Split Exception handling for node provision and adding to Jenkins (#2591)
* [JENKINS-38903] Split Exception handling for node provision and adding to Jenkins

* Defined new static helper methods that ensure exceptions are not propagated

* Added onCommit and onRollback signals to CloudProvisioningListener

Added the new signals to be able to notify the state after Jenkins.addNode(Node)
All Listener's calls moved to an exception-tolerant static helpers

* Added @Nonnull annotation
Changed the method signature CloudProvisioningListener.onRollback()

* Re-throw Error in the fireOnXXX()
Removed re-thrown Throwable in the main try/catch block
	(an instance of the Error is handled separately)

* Handling of Error changed

* Fixed Error instance handling in NodeProvisioner.fireOnFailure()
2016-12-15 11:34:12 +01:00
Stephen Connolly ab849a3054 [JENKINS-40252] Expose utility comparator singletons 2016-12-15 10:33:04 +00:00
kbrowder 37806a53c8 [FIXED JENKINS-40286] - Delegate JnlpMac computation to SlaveComputers if possible (#2658)
[FIXED JENKINS-40286] - Delegate JnlpMac computation to SlaveComputers if possible
2016-12-15 11:31:29 +01:00
Stephen Connolly 52ea389a5e [JENKINS-40252] Address code review comments 2016-12-15 10:25:04 +00:00
andrealaura f042bf2215 [FIX JENKINS-40053]: Use english as default-locale ResourceBundleUtilTest#test_unknown_locale (#2650)
* [FIX JENKINS-40053]: Use english as default-locale, so the ResourceBundleUtilTest runs also on systems with other default os locales.

* [FIX JENKINS-40053]: Cleanup Locale after test to avoid impact on other tests.

*  [FIX JENKINS-40053]: Use english as default-locale only in the required test method.

* [FIX JENKINS-40053]: Cleanup unused imports.
2016-12-15 08:25:23 +01:00