Commit Graph
4881 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi bd4ec617c2 [maven-release-plugin] prepare for next development iteration 2019-09-23 09:31:12 -07:00
Kohsuke Kawaguchi bd6946956e [maven-release-plugin] prepare release jenkins-2.190.1 2019-09-23 09:30:59 -07:00
Daniel Beck 190c431c82 Merge branch 'stable-2.190' into security-stable-2.190 2019-09-12 14:08:14 +02:00
Jeff Thompson f114f920f3 Merge pull request #4188 from Wadeck/JENKINS-59167_rss_rootUrl
[JENKINS-59167] Correction of rootUrl in RSS/Atom feeds

(cherry picked from commit 26c8523052)
2019-09-12 09:12:56 +02:00
Daniel Beck b08cf5fdd5 Merge branch 'security-stable-2.176' into security-stable-2.190 2019-09-10 22:51:44 +02:00
Daniel Beck 3073c11e0c Merge branch 'security-stable-2.164' into security-stable-2.176 2019-09-10 22:43:57 +02:00
Daniel Beck b1432e31b8 Merge branch 'security-stable-2.150' into security-stable-2.164 2019-09-10 22:40:02 +02:00
Daniel Beck 0a3efd0816 Merge branch 'security-stable-2.138' into security-stable-2.150 2019-09-10 21:58:49 +02:00
Wadeck Follonier e2c596c049 [SECURITY-1471] 2019-09-10 21:31:40 +02:00
Wadeck Follonier 00064be366 [SECURITY-1525] 2019-09-10 21:27:35 +02:00
Daniel Beck a6af29cd1f Merge branch 'security-stable-2.176' into security-stable-2.190 2019-09-10 20:45:27 +02:00
Daniel Beck 941c35559a Merge branch 'security-stable-2.164' into security-stable-2.176 2019-09-10 20:45:00 +02:00
Daniel Beck b4ba5dfc46 Merge branch 'security-stable-2.150' into security-stable-2.164 2019-09-10 20:44:27 +02:00
Daniel Beck 00de43f5b3 Merge branch 'security-stable-2.138' into security-stable-2.150 2019-09-10 20:42:54 +02:00
Wadeck Follonier df600eb7a2 [SECURITY-1498] 2019-09-10 20:31:20 +02:00
Wadeck Follonier 8c8d014330 [SECURITY-1537] 2019-09-10 20:30:30 +02:00
Wadeck Follonier 95d2f62ebd [SECURITY-1491]
Co-Authored-By: Daniel Beck <daniel-beck@users.noreply.github.com>
(cherry picked from commit ace5965b45)
2019-09-09 16:34:35 +02:00
Kohsuke Kawaguchi f8e48a3064 [maven-release-plugin] prepare for next development iteration 2019-08-26 09:03:46 -07:00
Kohsuke Kawaguchi 6666bc05b6 [maven-release-plugin] prepare release jenkins-2.176.3 2019-08-26 09:03:36 -07:00
Kohsuke Kawaguchi 01d7f443c9 [maven-release-plugin] prepare for next development iteration 2019-08-18 18:54:13 -07:00
Kohsuke Kawaguchi 16ea4d0d9a [maven-release-plugin] prepare release jenkins-2.190 2019-08-18 18:54:06 -07:00
Wadeck Follonier 8b70c48a5f [JENKINS-58736] Correction of /assets throwing 500 (#4136) 2019-08-16 09:56:42 +02:00
Matt Sicker f8f095e466 Replace Charset.forName with StandardCharsets (#4132)
This refactors usage of Charset::forName on common character sets that
now have an equivalent value in StandardCharsets.
2019-08-16 09:55:34 +02:00
Daniel Beck 6e068d2401 Merge branch 'stable-2.176' into security-stable-2.176 2019-08-13 16:38:11 +02:00
Matt Sicker 8fcce3c850 [JENKINS-58548] Remove extra whitespace from scriptText (#4133)
* [JENKINS-58548] Remove extra whitespace from scriptText

This removes the unnecessary whitespace being output in scriptText
and anywhere else that has non-XML whitespace semantics in its output
when using <l:view>.

Signed-off-by: Matt Sicker <boards@gmail.com>

* Fix test name

Co-Authored-By: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
(cherry picked from commit dae53088b7)
2019-08-13 15:19:48 +02:00
Daniel Beck 91fabe2aee Merge branch 'security-stable-2.164' into security-stable-2.176 2019-08-13 13:37:35 +02:00
Daniel Beck 97db3ad8e7 Merge branch 'security-stable-2.150' into security-stable-2.164 2019-08-13 13:36:44 +02:00
Daniel Beck cad06f01ce Merge branch 'security-stable-2.138' into security-stable-2.150 2019-08-13 13:35:09 +02:00
Wadeck FollonierandDaniel Beck ace5965b45 [SECURITY-1491]
Co-Authored-By: Daniel Beck <daniel-beck@users.noreply.github.com>
2019-08-13 13:30:21 +02:00
Kohsuke Kawaguchi 17d45ff1ae [maven-release-plugin] prepare for next development iteration 2019-08-07 09:30:55 -07:00
Kohsuke Kawaguchi a5db82c025 [maven-release-plugin] prepare release jenkins-2.189 2019-08-07 09:30:50 -07:00
Kohsuke Kawaguchi b2616a947a Test shouldn't be interactively breaking
This causes the test to time out. What I don't understand is how this
test got merged in the first place.
2019-08-06 08:44:49 -07:00
Abhyudaya Sharma 974d1dd544 Support JMH benchmarks from Jenkins Test Harness (#4135)
* Support running JMH benchmarks from JTH 2.51

* Fix NPE caused by ExtensionFinderTest
* A test for running a sample benchmark
* Bump up JTH to 2.54
* git ignore the report produced by benchmarks

* Fix BindException in BootFailureTest

* Fix NPE during `tearDown()` in CustomPluginManagerTest

JenkinsRule >= 2.50 does not ignore errors during Jenkins shutdown
2019-08-05 14:07:26 +02:00
Matt SickerandDaniel Beck dae53088b7 [JENKINS-58548] Remove extra whitespace from scriptText (#4133)
* [JENKINS-58548] Remove extra whitespace from scriptText

This removes the unnecessary whitespace being output in scriptText
and anywhere else that has non-XML whitespace semantics in its output
when using <l:view>.

Signed-off-by: Matt Sicker <boards@gmail.com>

* Fix test name

Co-Authored-By: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
2019-08-02 00:18:16 +02:00
Jesse Glick 5169f14019 Batch up dynamic plugin installations from setup wizard (#4124)
* Batch up dynamic plugin installations from setup wizard.

* Reworked to thread the list of batched-up plugins properly and introduced CompleteBatchJob to force the setup wizard to wait.

* UpdateCenterPluginInstallTest.test_installKnownPlugins failure.

* @amuniz notes that an existing message could now be considered misleading.

* Introduced UpdateCenter.DownloadJob.getDisplayName for better consistency in logging, as suggested by @Vlatombe.

* Reducing log levels of messages from dynamicLoad which are not of great interest, as suggested by @Vlatombe.

* Reducing log level of another message of little interest.

* Adding classic UI for CompleteBatchJob.

* CompleteBatchJob should be used only when dynamicLoad.

* Null defense on UpdateCenterJob.site.
Otherwise can get:
java.lang.NullPointerException
	at hudson.model.UpdateCenter.getConnectionCheckJob(UpdateCenter.java:850)
	at hudson.model.UpdateCenter.addConnectionCheckJob(UpdateCenter.java:817)
	at hudson.model.UpdateCenter.addJob(UpdateCenter.java:804)
	at hudson.model.UpdateSite$Plugin.deploy(UpdateSite.java:1367)
	at hudson.PluginManager.install(PluginManager.java:1537)
	at hudson.PluginManager.install(PluginManager.java:1496)
	at hudson.PluginManager.doInstall(PluginManager.java:1445)
	at …
2019-08-01 19:55:44 +02:00
Daniel Beck 551cbd7849 Update versions of some detached plugins that installed in some cases when upgrading Jenkins or when implied dependencies are not specified for manually managed plugins. (#4125)
* Update bundled plugins

* Add new dependencies for JUnit, fix test with matrix-auth

* Introduce property for matrix-auth version
2019-08-01 19:54:39 +02:00
Jesse Glick 3076b58df4 [JENKINS-33843] Permit disabling optional dependencies (#4001)
* Implied dependencies on detached plugins were not being marked optional despite being listed in optionalDependencies, confusing the calculation of optionalDependents in resolveDependentPlugins.

* Javadoc improvements based on code exploration.

* [JENKINS-33843] Do not consider optional dependencies for purposes of disabling plugins.

* PluginManagerInstalledGUITest updated to reflect new behavior.

(cherry picked from commit 0f73231f77)
2019-08-01 13:04:14 +02:00
Oleg Nenashev e56fd2d3e4 Merge pull request #4096 from jvz/JENKINS-56243
[JENKINS-56243] Ensure user seed saved to session

(cherry picked from commit a0095dc1ee)
2019-08-01 12:58:21 +02:00
Jesse Glick aee0b50f3b Stop using the "name" argument in the "install-plugin" CLI command (#4123)
* InstallPluginCommand.name is unnecessary.

* Minor changes to error reporting requested by @oleg-nenashev.
2019-07-27 12:04:20 +02:00
Pavel Janousek 312fcd1b9e [JENKINS-54854] Added a warning when cron trigger spent more than a threshold (30s) in its execution (#3802)
* [JENKINS-54854] Added a warning when cron trigger spent more than a threshold (30s) in its execution

* Added a test

* Fix based on feedback

* Added Admin monitor

* Cleanup

* Polishing

* Fix according the feedback provided by Oliver

* Added missing renamed admin monitor class

* Better Web layout

* Limit stacked messages to 10 by default

* Improved replacement

* Make SlowTriggerAdminMonitor#errors thread-safe

* Fixed as requested

* Admin monitor title changed
2019-07-27 08:02:01 +02:00
Jesse Glick 07ef6650a6 Run the Linux JDK 8 & 11 builds using ACI agents rather than Ubuntu VMs (#4129)
* Run the Linux JDK 8 & 11 builds using ACI agents rather than Ubuntu VMs.

* A couple of tests failed when run as root.

* Since https://github.com/jenkinsci/jnlp-agents/pull/5 is as yet undeployed, install packages ourselves as a workaround.

* Revert "Since https://github.com/jenkinsci/jnlp-agents/pull/5 is as yet undeployed, install packages ourselves as a workaround."
This reverts commit 2f7e84d67a.
The changes have been deployed, so the workaround is no longer necessary.
2019-07-27 07:54:24 +02:00
Kohsuke Kawaguchi cfb92a2805 [maven-release-plugin] prepare for next development iteration 2019-07-21 15:54:08 -07:00
Kohsuke Kawaguchi fd38fa6521 [maven-release-plugin] prepare release jenkins-2.187 2019-07-21 15:53:59 -07:00
Kohsuke Kawaguchi dedde61953 [maven-release-plugin] prepare for next development iteration 2019-07-16 20:22:51 -07:00
Kohsuke Kawaguchi aacc3ec40a [maven-release-plugin] prepare release jenkins-2.186 2019-07-16 20:22:44 -07:00
Kohsuke Kawaguchi 704d0cb2cb [maven-release-plugin] prepare for next development iteration 2019-07-15 08:18:21 -07:00
Kohsuke Kawaguchi 4c99afbf4d [maven-release-plugin] prepare release jenkins-2.176.2 2019-07-15 08:18:08 -07:00
Wadeck Follonier 5384602b68 Merge branch 'master' into security-master 2019-07-15 13:33:57 +02:00
Kohsuke Kawaguchi 6fea9b24d8 [maven-release-plugin] prepare for next development iteration 2019-07-14 12:23:24 -07:00
Kohsuke Kawaguchi a4c9cba4f3 [maven-release-plugin] prepare release jenkins-2.185 2019-07-14 12:23:13 -07:00