Commit Graph
32590 Commits
Author SHA1 Message Date
Oleg Nenashev a41fcd560d Fix the failing test (a new one for CLI access would be useful) 2015-09-21 20:28:32 +03:00
Daniel Beck a41b72b015 Merge pull request #1812 from aldaris/changelogurl
Make changelog URL a build parameter
2015-09-21 16:24:29 +02:00
Daniel Beck 092e9913a2 Merge pull request #1758 from daniel-beck/plugin-categories
Add new plugin labels to clean up Plugin Manager
2015-09-21 16:22:18 +02:00
Oleg Nenashev 9e439d462c [FIXED SECURITY-192] - Require Jenkins.READ permissions to access CLI pages 2015-09-21 13:46:29 +03:00
Oleg Nenashev ecab74af20 Do not print stacktraces 2015-09-21 13:45:21 +03:00
Kohsuke Kawaguchi 0178a2e835 updated changelog for release 2015-09-20 12:06:04 -07:00
Kohsuke Kawaguchi 3839ddfe1f [maven-release-plugin] prepare for next development iteration 2015-09-20 11:59:39 -07:00
Kohsuke Kawaguchi 4e3e2a6bb0 [maven-release-plugin] prepare release jenkins-1.630 jenkins-1.630 2015-09-20 11:59:38 -07:00
Oleg Nenashev ddfe4d2077 Merge pull request #1832 from oleg-nenashev/windows-slave-installer-1.5
[JENKINS-10547, JENKINS-22685] Update windows-slave-installer dependency to 1.5
2015-09-18 18:44:01 +03:00
Oleg Nenashev 22d9db09d5 Update windows-slave-installer dependency to 1.5.1
Jenkins issues: JENKINS-10547, JENKINS-22685

Changes in winsw:
* https://github.com/kohsuke/winsw/issues?q=milestone%3Awinsw-1.17
* kohsuke/winsw@2bf9e85

Changes in the module:
* https://github.com/jenkinsci/windows-slave-installer-module/commit/a4d2121812fe9fe1b38bbe9d2cb57b9cd5435a0d
* https://github.com/jenkinsci/windows-slave-installer-module/commit/3fbc8434aba05d5d36f52f345d9d0176e98459be
2015-09-18 17:11:30 +03:00
Kohsuke Kawaguchi d86a88ab04 Windows installer improvement 2015-09-17 16:32:12 -07:00
Jesse Glick 89c9707daa Merge pull request #1828 from deadmoose/unprotected_urls
Improve readability of Jenkins.getTarget()
2015-09-17 14:40:10 -04:00
Jesse Glick 43f4b2b570 Merge pull request #1826 from jglick/ClosedByInterruptException
[JENKINS-30395] Occasional ClosedByInterruptException
2015-09-17 14:28:01 -04:00
Vojtech Juranek 1716bf4c3a Add changelog record for PR #1803 2015-09-17 20:03:39 +02:00
Vojtech Juranek 8f29260b17 [FIXED JENKINS-29507] Make JenkinsRule useable on systems without glibc 2015-09-17 19:56:51 +02:00
Stephen Connolly 63e6ac6d64 Oops forgot to convert the @since TODOs after merge 2015-09-17 09:57:41 +01:00
tfennelly 6f24966777 Added a fuzzy search for when search terms are not used
Easier for users - nothing to learn
2015-09-16 12:12:57 +01:00
tfennelly a305e3dc93 Merge branch 'master' into JENKINS-26445-pagination-search
* master: (256 commits)
  Noting #1817
  Noting #1825
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.629
  [JENKINS-30139] Oleg wants to keep the data accessible so we have to go for immutable
  [JENKINS-30139] Forgot to change this one
  [JENKINS-30139] Add @Restricted to prevent external use of internal data
  [JENKINS-30139] Switch from a big fat lock to a concurrent collection
  [JENKINS-30374] Update obsolete help message
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.628
  noting merge of PR#1816 - use slf4j interceptors
  Manage commons-logging and log4j as provided, include slf4j adapters for tests.
  Exclude commons-logging and log4j in dangerous scopes compile and runtime in plugins as well.
  Only exclude commons-logging and log4j in dangerous scopes compile and runtime.
  Reintroduce enforcer rules as suggested by @jtnord.
  Document allBuilds for Job remote access API
  Include slf4j-jdk14 during tests.
  ...

Conflicts:
	war/src/main/webapp/scripts/hudson-behavior.js
2015-09-16 09:34:46 +01:00
Daniel Beck 4ea5246b86 Noting #1817 2015-09-15 23:24:38 +02:00
Daniel Beck 72dc7c9bd7 Noting #1825 2015-09-15 23:19:09 +02:00
David Hoover 9f5f292f3f Improve readability of Jenkins.getTarget()
The ~dozen inlined options and braceless conditional weren't the easiest
to read, especially with the one compound statement in there. Took me a
minute to convince myself that operator precedence & associativity
really made that work as intended.

I *think* those strings could drop their slashes and be combined with
the other loop (e.g. go over
Sets.concat(ALWAYS_READABLE_PATHS, getUnprotectedRootActions()), but
without spending more time confirming that, I'm leaving the behavior
exactly the same as it was before.
2015-09-15 10:51:58 -07:00
Stephen Connolly 806f529d8f [JENKINS-30139] Oleg wants to keep the data accessible so we have to go for immutable
(cherry picked from commit e947174433)
jenkins-1.625.1-rc1
2015-09-15 19:08:40 +02:00
Stephen Connolly 52b265b186 [JENKINS-30139] Forgot to change this one
(cherry picked from commit 67cce20291)
2015-09-15 19:08:40 +02:00
Stephen Connolly 108f2c4b23 [JENKINS-30139] Add @Restricted to prevent external use of internal data
(cherry picked from commit 9a57858a92)
2015-09-15 19:08:40 +02:00
Stephen Connolly d68bbfcf86 [JENKINS-30139] Switch from a big fat lock to a concurrent collection
(cherry picked from commit 2c5deeb6c0)
2015-09-15 19:08:40 +02:00
Kohsuke Kawaguchi a00c3a7e0e updated changelog for release 2015-09-15 00:15:32 -07:00
Kohsuke Kawaguchi 16f2877729 [maven-release-plugin] prepare for next development iteration 2015-09-15 00:08:56 -07:00
Kohsuke Kawaguchi b757e28ba9 [maven-release-plugin] prepare release jenkins-1.629 jenkins-1.629 2015-09-15 00:08:56 -07:00
Stephen Connolly e94e459ec4 Merge pull request #1825 from stephenc/jenkins-30139
[JENKINS-30139] Switch from a big fat lock to a concurrent collection
2015-09-11 17:13:41 +01:00
Stephen Connolly e947174433 [JENKINS-30139] Oleg wants to keep the data accessible so we have to go for immutable 2015-09-11 09:25:56 +01:00
Jesse Glick aaa71d4feb [FIXED JENKINS-30395] Occasional ClosedByInterruptException. 2015-09-10 18:10:57 -04:00
Jesse Glick f9a80d4dae Merge pull request #1824 from swashbuck1r/patch-1
[JENKINS-30374] Update obsolete help message
2015-09-10 17:31:42 -04:00
Stephen Connolly 67cce20291 [JENKINS-30139] Forgot to change this one 2015-09-10 15:54:10 +01:00
James Nord f1b47c8a00 [JENKINS-30057] compiler tweaks and address review comments
(cherry picked from commit d72d7b83ba)
2015-09-10 16:32:43 +02:00
Jesse Glick 2ec26c8ac6 Merge pull request #1802 from jpederzolli/master
[FIXED JENKINS-29989] Update RunIdMigrator to properly handle matrix and Maven jobs
(cherry picked from commit 3d7878ff76)
2015-09-10 16:23:44 +02:00
James Nord 0181650be1 [JENKINS-30057] NodeProperties should be owned by the corresponding Saveable.
Node objects are owned by the Nodes class not by Jenkins so NodeProperties
and anything modifiying them needs to be updated.  Also modifying Nodes
requires a lock on the Queue so use this lock not Jenkins to prevent the
deadlock observed in JENKINS-30057

(cherry picked from commit 06f690dbb9)
2015-09-10 16:20:01 +02:00
Oliver Gondža 8af3ab5ae8 Towards 1.625.1 2015-09-10 16:14:42 +02:00
Stephen Connolly 9a57858a92 [JENKINS-30139] Add @Restricted to prevent external use of internal data 2015-09-10 14:49:57 +01:00
Oleg Nenashev f22db8a7fa Update the implementation and tests according to comments from @stephenc 2015-09-10 16:47:08 +03:00
Oleg Nenashev 5431e39721 [SECURITY-195] - Throw the MalformedURLException if the request includes the relative addressing 2015-09-10 16:46:59 +03:00
Oleg Nenashev 1002ada4dd [SECURITY-195] - Direct unit test for the issue 2015-09-10 16:46:52 +03:00
Stephen Connolly 2c5deeb6c0 [JENKINS-30139] Switch from a big fat lock to a concurrent collection 2015-09-10 14:25:04 +01:00
Jesse Glick fc7beaa44c Merge branch 'security-stable-1.609' into security-master 2015-09-09 15:41:44 -04:00
Jesse Glick fc517765d7 Merge branch 'security-stable-1.596' into security-stable-1.609
Conflicts:
	cli/pom.xml
	core/pom.xml
	debian/debian/changelog
	plugins/pom.xml
	pom.xml
	test/pom.xml
	war/pom.xml
2015-09-09 15:40:09 -04:00
Jesse Glick a88f2d9fbe Merge branch 'security-stable-1.580' into security-stable-1.596 2015-09-09 15:15:48 -04:00
Jesse Glick 3eea078e83 Merge branch 'stable-1.596' into security-stable-1.596
Conflicts:
	cli/pom.xml
	core/pom.xml
	debian/debian/changelog
	plugins/pom.xml
	pom.xml
	test/pom.xml
	war/pom.xml
2015-09-09 15:15:01 -04:00
Oleg Nenashev f53802bb82 [SECURITY-169] - Convert crumb issuer salt to the confidential key 2015-09-09 14:51:59 -04:00
Jesse Glick 412d853300 Merge (-s ours) branch 'security-stable-1.609' into security-master 2015-09-09 14:49:48 -04:00
Jesse Glick 3537831a42 Merge (-s ours) branch 'stable-1.609' into master 2015-09-09 14:49:25 -04:00
Jesse Glick 21f81428dd Merge (-s ours) branch 'security-stable-1.596' into security-stable-1.609 2015-09-09 14:48:50 -04:00