Commit Graph
3262 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 0f87fd7e64 [maven-release-plugin] prepare for next development iteration 2016-05-15 21:39:27 -07:00
Kohsuke Kawaguchi bdf2b13ab6 [maven-release-plugin] prepare release jenkins-2.4 2016-05-15 21:39:27 -07:00
Oleg Nenashev bb1f620d0a [JENKINS-34833] - Installation Wizard: Allow altering the list of suggested plugins from update sites (#2348)
* [JENKINS-34833] - Installation Wizard: Allow altering the list of succested plugins from update sites

In our company we provide a custom package of Jenkins, which provides a customized set of plugins (open-source and closed-source ones). These plugins come from the custom update site.

We would like to provide custom suggestions to users of our Jenkins packages when they install Jenkins. For such purpose we would like to make the plugin suggestions list overridable by UpdateSite extensions in Jenkins.

* [JENKINS-34833] - Fix the JS Unit test (code from @kzantow)

* [JENKINS-34833] - Unit tests for SetupWizard

* [JENKINS-34833] - Address comment regarding the error propagation for the unknown version

* [JENKINS-34833] - SetupWizard::getPlatformPluginList() is not a part of the public API

* [JENKINS-34833] - Address comments from @orrc
2016-05-15 17:05:12 +02:00
evernat 65f2a4a406 [JENKINS-34755] fix read of 'SystemProperties' values before init of the context (#2347)
* fix read of 'SystemProperties' values before init of the context

* fix constructor and test

* revert help-spec_fr.html

* revert help-spec_fr.html

* revert help-spec_fr.html
2016-05-15 16:31:23 +02:00
Andres Rodriguez 454642dafe [JENKINS-34681] Allow custom plugin managers when using war (#2323)
* [JENKINS-34681] Allow custom default plugin managers

* [JENKINS-34681] Convert remaining properties to SystemProperties.
2016-05-14 21:32:55 +02:00
Oleg Nenashev 768da3e241 [JENKINS-34733] - Allow overriding Jenkins UpdateCenter by a custom implementation (#2332)
* [JENKINS-34733] - Allow overriding Jenkins UpdateCenter by a custom implementation

* [JENKINS-34733] - Reduce the logging level for the custom update center selection

* [JENKINS-34733 and JENKINS-34674] - Use SystemProperties in the UpdateCenter
2016-05-14 15:37:04 +02:00
Oleg Nenashev fdabb52503 Merge branch 'master' into JENKINS-34755
Conflicts:
	core/src/main/java/hudson/FilePath.java
2016-05-13 23:00:17 +02:00
Oleg Nenashev d0012ea8d7 [JENKINS-34755] - Add some tests 2016-05-12 15:09:43 +02:00
Oliver Gondža c69efd9db3 Merge pull request #2310 from pjanouse/JENKINS-32777
[JENKINS-32777] Cover 'delete-builds' CLI by tests
2016-05-12 12:31:02 +02:00
Kohsuke Kawaguchi 75e93bed8a Merge branch 'master' of github.com:jenkinsci/jenkins
Conflicts:
	changelog.html
2016-05-11 11:46:30 -07:00
Kohsuke Kawaguchi 969dc7ad95 [maven-release-plugin] prepare for next development iteration 2016-05-11 11:39:42 -07:00
Kohsuke Kawaguchi a6c21b6329 [maven-release-plugin] prepare release jenkins-2.3 2016-05-11 11:39:42 -07:00
Jesse Glick c2d0a5778e Merge commit '97a0fa0d036b9d3873c9b269123020a42e7ee3e9' into security-master 2016-05-11 12:07:25 -04:00
Ing. Pavel Janousek 107aaf9000 Modified per Oleg's comment 2016-05-11 15:01:06 +02:00
Ing. Pavel Janousek e4643cf1e3 Modified based on Oliver's feedback
Slighty optimized and better legible asserts
2016-05-11 14:55:11 +02:00
Ing. Pavel Janousek ff2992ed6e [JENKINS-32777] Cover 'delete-builds' CLI by tests 2016-05-11 14:55:11 +02:00
Pavel Janousek 1047cd9ed9 [JENKINS-31900] CLI command reload-configuration extracted from core to CLI (#1956)
reload-configuration covered by test-cases
2016-05-11 09:17:22 +02:00
Oleg Nenashev 0b3dbfce64 Merge pull request #2319 from oleg-nenashev/JENKINS-34674
[JENKINS-34674,JENKINS-34675] - Handling of the default update site ID
2016-05-10 15:38:55 +02:00
Daniel Beck 8f43679945 Merge pull request #2295 from pjanouse/JENKINS-34328
[JENKINS-34328] CLI command disconnect-node extracted from core to CLI
2016-05-09 21:59:51 +02:00
Kohsuke Kawaguchi 97a0fa0d03 [maven-release-plugin] prepare for next development iteration 2016-05-08 13:50:54 -07:00
Kohsuke Kawaguchi 53f665c453 [maven-release-plugin] prepare release jenkins-2.2 2016-05-08 13:50:54 -07:00
Oleg Nenashev 25f6c2cf6d [JENKINS-34675] - Fix the Unit test 2016-05-08 18:53:51 +02:00
Ing. Pavel Janousek 6feaea8647 [JENKINS-34328] CLI command disconnect-node extracted from core to CLI
disconnect-node extended to accept multiple node names
disconnect-node covered by test-cases
2016-05-05 10:49:13 +02:00
Oliver Gondža a3e2831b47 Merge branch 'master' into move-test-classes 2016-05-04 10:30:07 +02:00
Daniel Beck 49a65c2bbb Merge pull request #2257 from pjanouse/JENKINS-32874
[JENKINS-32874] Improved test coverage of AbstractBuildRangeCommand
2016-05-04 00:53:43 +02:00
Kohsuke Kawaguchi 746fdcba38 Merge pull request #2298 from vivek/master
Upgrade to stapler 1.243 and some testcase fix.
2016-05-02 08:49:52 -07:00
Kohsuke Kawaguchi 16465de28b [maven-release-plugin] prepare for next development iteration 2016-05-01 10:04:48 -07:00
Kohsuke Kawaguchi f9f597816c [maven-release-plugin] prepare release jenkins-2.1 2016-05-01 10:04:48 -07:00
Jesse Glick f0ece9f6ab Merge branch 'security-stable-1.651' into security-master 2016-04-29 15:42:58 -04:00
Jesse Glick 9f3f352ee9 [JENKINS-32273] CLI exit codes changed as of #1997 in 1.649. 2016-04-29 15:42:22 -04:00
Jesse Glick a8130b2ac2 Merge branch 'security-stable-1.651' into security-master 2016-04-29 15:31:25 -04:00
Jesse Glick 94af2e874c Merge branch 'security-stable-1.642' into security-stable-1.651 2016-04-29 15:31:15 -04:00
Jesse Glick ecf0ec7d3d Merge branch 'security-stable-1.625' into security-stable-1.642 2016-04-29 15:31:00 -04:00
Jesse Glick 0f5e70f15a Merge branch 'security-stable-1.609' into security-stable-1.625 2016-04-29 15:30:27 -04:00
Jesse Glick edffecea84 Merge pull request #59 from jenkinsci-cert/SECURITY-170-v2
[FIX SECURITY-170] Don't expose parameters not defined on the run
2016-04-29 15:29:56 -04:00
Jesse Glick 14d2013dec Merge branch 'security-stable-1.651' into security-master 2016-04-29 14:32:38 -04:00
Jesse Glick a4a70977ca Merge branch 'security-stable-1.642' into security-stable-1.651 2016-04-29 14:31:13 -04:00
Jesse Glick 06d47c760e Merge branch 'security-stable-1.625' into security-stable-1.642 2016-04-29 14:29:51 -04:00
Jesse Glick 6de0fc0f02 Missing import. 2016-04-29 14:28:40 -04:00
Jesse Glick 4242be8b5d Merge branch 'security-stable-1.609' into security-stable-1.625 2016-04-29 14:23:58 -04:00
Jesse Glick e4b97c5918 [JENKINS-26775] Suppress ApiTest.wrappedMultipleItems prior to 1.651 where it is fixed for JDK 8. 2016-04-29 14:23:31 -04:00
Antonio Muñiz a7264a9627 [SECURITY-170] More tests 2016-04-29 20:00:49 +02:00
Antonio Muñiz eb2b62e1aa [SECURITY-170] Fixing test 2016-04-29 19:37:24 +02:00
Antonio Muñiz 92556fd1a3 [SECURITY-170] Whitelisted parameters system property added (as suggested by @jglick) 2016-04-29 18:22:13 +02:00
Jesse Glick 6e815b1ff7 Merge branch 'security-stable-1.651' into security-master 2016-04-29 12:09:20 -04:00
Jesse Glick 4baafc0951 Merge branch 'security-stable-1.642' into security-stable-1.651 2016-04-29 12:09:09 -04:00
Jesse Glick 2992fdad76 Merge branch 'security-stable-1.625' into security-stable-1.642 2016-04-29 12:07:24 -04:00
Jesse Glick 416439ef2f Merge branch 'security-stable-1.609' into security-stable-1.625 2016-04-29 12:02:15 -04:00
Jesse Glick de29daa369 Merge pull request #63 from jenkinsci-cert/SECURITY-266
[SECURITY-266] Conceal ciphertext from users who could not resubmit it here
2016-04-29 12:01:27 -04:00
Jesse Glick 3ec94b8a4f Merge branch 'security-stable-1.651' into security-master 2016-04-29 07:51:52 -04:00