Commit Graph
3590 Commits
Author SHA1 Message Date
Jesse Glick 1c6a92faff Can now use @Issue with String[]. 2017-01-23 14:26:57 -05:00
Jesse Glick 06327a2db6 Merge branch 'security-stable-2.32' into security-master 2017-01-23 14:26:10 -05:00
Jesse Glick e80e2db968 Merge commit 'e663b315ee8fc024dcab4cfa6821430a89a48cc3' into security-master 2017-01-23 14:25:47 -05:00
Jesse Glick 8622eea246 Merge branch 'security-stable-2.19' into security-stable-2.32 2017-01-23 13:43:20 -05:00
Jesse Glick f03e4620c7 Merge branch 'stable-2.32' into security-stable-2.32 2017-01-23 13:40:36 -05:00
Jesse Glick f18535449a Merge branch 'security-stable-2.7' into security-stable-2.19 2017-01-23 13:39:52 -05:00
Jesse Glick 40976187b0 encryptedValueStaysTheSameAfterRoundtrip was failing in Jenkins 2 since the sidepanel is no longer displayed on the configuration screen. 2017-01-23 13:37:17 -05:00
Jesse Glick 057d4ed986 Merge branch 'security-stable-1.651' into security-stable-2.7 2017-01-23 13:36:07 -05:00
Jesse Glick 1b76edd987 Compilable against Servlet 3.1. 2017-01-23 13:32:04 -05:00
Jesse Glick 9534bb0c93 Merge branch 'security-stable-1.642' into security-stable-1.651 2017-01-23 13:31:56 -05:00
Jesse Glick 2f5ee61ab9 Merge branch 'security-stable-1.625' into security-stable-1.642 2017-01-23 13:12:54 -05:00
Jesse Glick e6aa166246 Merge pull request #105 from jenkinsci-cert/SECURITY-304-t3
[SECURITY-304] Encrypt new secrets with CBC and random IV instead of ECB
2017-01-23 12:55:54 -05:00
Jesse Glick a814154695 Merge pull request #101 from jenkinsci-cert/security-383-simpler
[SECURITY-383] Additional XStream2-specific class blacklisting
2017-01-23 12:55:54 -05:00
Jesse Glick 3cd946cbef Merge pull request #80 from jenkinsci-cert/SECURITY-362
[SECURITY-362] Do not persist User in OfflineCause.UserCause
2017-01-23 12:55:54 -05:00
Daniel Beck e04da4a2c2 [FIX JENKINS-40894] Restore unstableReturn in readResolve
(cherry picked from commit 93467c3f4b)
2017-01-18 15:52:49 +01:00
Kohsuke Kawaguchi 98109f10de [maven-release-plugin] prepare for next development iteration 2017-01-15 21:23:07 -08:00
Kohsuke Kawaguchi 0c13742be0 [maven-release-plugin] prepare release jenkins-2.41 2017-01-15 21:23:07 -08:00
Kohsuke Kawaguchi dd3dc92df2 Fixed a regression in 9fbcb99ded
The test was not updated to reflect the URL change. This is blocking a
release.
2017-01-15 20:30:05 -08:00
Jesse Glick 15128c602e Merge pull request #91 from jenkinsci-cert/SECURITY-382
[SECURITY-382] Sign console notes with a MAC
2017-01-11 19:12:08 -05:00
Victor fc12b2cc1a [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step (#2638)
* [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step

* [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step

* [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step

* [FIX JENKINS-39268] Changed order in which properties are appended to command line: properties appended later win in case of conflicts

* [FIX JENKINS-39268] More precise messages in some assertions

* [FIX JENKINS-39268] Cleanup unused imports

* [FIX JENKINS-39268] Added functional tests for Maven task.

(cherry picked from commit 138ce3d8d1)
2017-01-11 15:03:53 +01:00
Daniel Beck 7831263d4c [JENKINS-40494] Process warnings from update sites (#2680)
* [FIX JENKINS-40494] Process warnings from update sites

* [JENKINS-40494] Address review comments

* [JENKINS-40494] Add warnings to available/update plugin manager tabs

* [JENKINS-40494] Add tests

* [JENKINS-40494] Address review feedback
2017-01-11 09:41:37 +01:00
Daniel Beck 93467c3f4b [FIX JENKINS-40894] Restore unstableReturn in readResolve 2017-01-11 00:51:26 +01:00
Jesse Glick f7e39fd809 Merge branch 'security-stable-2.32' into security-master 2017-01-10 17:29:14 -05:00
Jesse Glick a223df6b0f Merge branch 'security-stable-2.19' into security-stable-2.32 2017-01-10 17:28:53 -05:00
Jesse Glick 24606893aa Merge branch 'security-stable-2.7' into security-stable-2.19 2017-01-10 17:28:37 -05:00
Jesse Glick 63cdfbff90 Merge branch 'security-stable-1.651' into security-stable-2.7 2017-01-10 17:28:24 -05:00
Jesse Glick f94f261669 Merge branch 'security-stable-1.642' into security-stable-1.651 2017-01-10 17:26:50 -05:00
Jesse Glick bc267ce3ad Merge branch 'security-stable-1.625' into security-stable-1.642 2017-01-10 17:26:26 -05:00
Jesse Glick 414ff7e30a Merge pull request #89 from jenkinsci-cert/SECURITY-358
[SECURITY-358] Restrict access to metadata used by WorkflowRun
2017-01-10 17:26:00 -05:00
Daniel Beck f2a46b8e7b Merge pull request #2696 from daniel-beck/JENKINS-7874
[FIX JENKINS-7874] Autocomplete admin links only when admin
2017-01-10 17:44:41 +01:00
Jesse Glick d1779cd96c Merge branch 'master' into security-master 2017-01-09 09:51:36 -05:00
Kohsuke Kawaguchi 906f2e78a2 [maven-release-plugin] prepare for next development iteration 2017-01-08 18:28:12 -08:00
Kohsuke Kawaguchi bf209a4b40 [maven-release-plugin] prepare release jenkins-2.40 2017-01-08 18:28:12 -08:00
Daniel Beck c252a76402 [JENKINS-40494] Process warnings from update sites (#2680)
* [FIX JENKINS-40494] Process warnings from update sites

* [JENKINS-40494] Address review comments

* [JENKINS-40494] Add warnings to available/update plugin manager tabs

* [JENKINS-40494] Add tests

* [JENKINS-40494] Address review feedback
2017-01-08 22:27:08 +01:00
Jesse Glick a5a0ac2295 Merge branch 'security-stable-2.32' into security-master 2017-01-05 16:12:58 -05:00
Jesse Glick d341da7a86 Merge branch 'security-stable-2.19' into security-stable-2.32 2017-01-05 16:12:44 -05:00
Jesse Glick 1461ff448d Merge branch 'security-stable-2.7' into security-stable-2.19 2017-01-05 16:12:33 -05:00
Jesse Glick 3cd63e212a Merge branch 'security-stable-1.651' into security-stable-2.7 2017-01-05 16:12:22 -05:00
Jesse Glick 4e97b128ae Merge branch 'security-stable-1.642' into security-stable-1.651 2017-01-05 16:12:11 -05:00
Jesse Glick 64b501c270 Merge branch 'security-stable-1.625' into security-stable-1.642 2017-01-05 16:11:32 -05:00
Jesse Glick 13905d8224 Merge pull request #96 from jenkinsci-cert/SECURITY-385
[SECURITY-385] Only suggest visible views in search
2017-01-05 16:11:09 -05:00
Daniel Beck e45a703665 [SECURITY-385] Minor test improvement 2017-01-05 20:06:23 +01:00
Jesse Glick 921f1a81ed Merge branch 'security-stable-2.32' into security-master 2017-01-04 10:12:42 -05:00
Jesse Glick 7c70042eee Merge branch 'security-stable-2.19' into security-stable-2.32 2017-01-04 10:11:22 -05:00
Jesse Glick 70b46d0a94 Merge branch 'security-stable-2.7' into security-stable-2.19 2017-01-04 10:11:08 -05:00
Jesse Glick e41dd93fd1 Merge branch 'security-stable-1.651' into security-stable-2.7 2017-01-04 10:10:50 -05:00
Jesse Glick 258b893e1f Using standard MockAuthorizationStrategy. 2017-01-04 10:09:59 -05:00
Jesse Glick a21b143aca Merge branch 'security-stable-1.642' into security-stable-1.651 2017-01-04 10:04:31 -05:00
Jesse Glick 142da2438e Merge branch 'security-stable-1.625' into security-stable-1.642 2017-01-04 10:02:34 -05:00
Jesse Glick 4ed5c850b6 Merge pull request #90 from jenkinsci-cert/SECURITY-321
[SECURITY-321] Prevent existing items from being overwritten even if you cannot DISCOVER them
2017-01-04 10:01:53 -05:00