Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 39dae39677 [maven-release-plugin] prepare for next development iteration 2016-05-11 10:14:10 -07:00
Kohsuke Kawaguchi b6bbc1414e [maven-release-plugin] prepare release jenkins-1.651.2 jenkins-1.651.2 2016-05-11 10:14:10 -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
Oleg Nenashev c83a8fdf0d [JENKINS-34710] - PluginWrapper should not throw IOException if somebody enables the enabled plugin (#2327) 2016-05-11 12:11:02 +02:00
Alex Earl 58a5d2249d [JENKINS-4610] - Remove historical CVS code in the ChangeLogParser initialization (#2248)
* Remove CVS historical code - JENKINS-4610

* Fix whitespace issue
2016-05-11 11:45:43 +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
pagio81 2f6b3d5816 [JENKINS-22358] - Disable JSESSIONID in URL on JBoss (#2003)
More details: https://issues.jboss.org/browse/WFLY-4782
2016-05-11 09:15:06 +02:00
Daniel Spilker c6d3390dc2 [JENKINS-32978] Support latest source version to avoid compile time warnings with JDK7 (#2032)
see http://stackoverflow.com/questions/8185331/forward-compatible-java-6-annotation-processor-and-supportedsourceversion
2016-05-11 09:10:00 +02:00
Baptiste Mathus c3a0c3b6cb Noting #2316, #2288, #2048, #2295, #2297 2016-05-11 00:11:13 +02:00
Oliver Gondža 59c86b8f7d Minor sortable.js documentation improvement (#2326) 2016-05-10 15:45:43 +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
Baptiste Mathus b9bb52ffce Switch Jenkins.getInstance() to @Nonnull (#2297)
As detailed by @stephenc:

> So there is `getInstanceOrNull()` which is for use in Jenkins core or
> in code that plugins add that may escape the Jenkins singleton
> lifecycle.
>
> In regular plugins `getInstance()` will never return null as the
> lifecycle does not instantiate them until after there is a Jenkins
> singleton and the plugins will be stopped before there is no
> singleton.
>
> The `getActiveInstance()` is therefore equivalent to `getInstance()`
> and should never have been born.
>
> The only way a plugin can get a `null` from `Jenkins.getInstance()` is
> if you install an `atExit()` handler, use a `PhantomReference` type
> thing, or directly manipulate the servlet container in some way or
> other. A correctly written plugin should unwind any of those things
> when it is stopped or a method bound to the termination lifecycle. If
> there are some cases (for which I cannot anticipate a good coder being
> able to write a correct termination lifecycle method to fix) where the
> code cannot be unhooked... then in those cases the plugin should use
> `getInstanceOrNull()` and know how to respond to the `null` that could
> not be avoided.
2016-05-10 06:56:26 +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
Carlos Sanchez 3e1bc969f4 [JENKINS-34683] Do not print stack trace if plugin is missing dependencies (#2048)
[JENKINS-34683] - Do not print stack trace if plugin is missing dependencies
2016-05-09 16:34:26 +02:00
Kanstantsin Shautsou f4765d9aec Allow specifying custom AbortExceptions (#2288)
Workflow users may want to catch specific Exceptions without stracktrace in future.
2016-05-09 16:33:30 +02:00
Manuel Recena d7852479fc [JENKINS-34629] jenkins-ui (NPM module) is private, used only internally (#2316) 2016-05-09 16:32:52 +02:00
Daniel Beck f5e691f8f4 Noting #2177, #2298, #2250, #2289, #2026, #2293, #2309, #2317, #2311, #2303, #2308 2016-05-09 10:08:21 +02:00
Kohsuke Kawaguchi e7706e1f23 updated changelog for release 2016-05-08 13:56:31 -07: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 jenkins-2.2 2016-05-08 13:50:54 -07:00
Jean-Philippe Briend b1da34a096 Translation french jenkins2 various screens (#2308)
* Add French translation on New Item screen

* Add French translation to Manage Jenkins page

* Add French translation to GlobalToolConfiguration page

* Add missing French translation to Manage Jenkins page

* Correct translations typos and PR remarks
2016-05-08 20:51:29 +02:00
Oleg Nenashev 25f6c2cf6d [JENKINS-34675] - Fix the Unit test 2016-05-08 18:53:51 +02:00
Tom Fennelly 78ad23644b Merge pull request #2303 from tfennelly/session-listener-ep
HttpSession listener ExtensionPoint
2016-05-08 14:20:50 +01:00
Oleg Nenashev 3431a817c5 [FIXED JENKINS-34674] - Allow defining custom default update site IDs via system properties 2016-05-08 14:51:53 +02:00
Oleg Nenashev 5d1f81c56c [FIXED JENKINS-34675] - Prevent hanging of the WebUI if the default Update Site ID cannot be resolved.
Also hardens the Java code a bit.
2016-05-08 14:50:11 +02:00
Oliver Gondža 3ef19cc1d3 [JENKINS-33780] Catch all throwables from implementations 2016-05-06 21:12:07 +02:00
Daniel Beck 0a361c1050 Merge pull request #2311 from Vlatombe/JENKINS-34601
[JENKINS-34601] Fix help file for node name attribute
2016-05-06 13:35:29 +02:00
Daniel Beck c2525bf988 Merge pull request #2317 from daniel-beck/JENKINS-31611
[FIX JENKINS-31611] Restrict access to plugin pages
2016-05-06 12:23:08 +02:00
Daniel Beck 023b2ad418 [FIX JENKINS-31611] Restrict access to plugin pages 2016-05-05 23:27:06 +02:00
Daniel Beck c64804d8fa Merge pull request #2309 from tomass/master
Lithuanian translation update
2016-05-05 21:23:05 +02:00
Oliver Gondža f21fe5450b [FIXED JENKINS-33780] Introduce NodeListener 2016-05-05 21:06:00 +02:00
Pavel Janousek 621256e5f6 Fixed JavaDoc for deprecated Computer.cliOnline() (#2313) 2016-05-05 16:53:09 +02:00
Ing. Pavel Janousek 897003e0f2 Slighty modified based on the feedback from reviewers. 2016-05-05 15:12:11 +02:00
Manuel Recena cb058a1ff9 [JENKINS-32936] Support for multiple layouts in Jelly Layout tag (#2253)
* [JENKINS-32936] Initial source code modifications

* [JENKINS-32936] Three views are using this approach

* [JENKINS-32936] Conflicts were resolved in a wrong way
2016-05-05 13:23:01 +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
Kohsuke Kawaguchi 31ad77005e Merge pull request #2293 from jenkinsci/symbol
Symbol annotations on core
2016-05-04 15:31:36 -07:00
Oliver Gondža 7a899d4544 Avoid log clutter 2016-05-04 22:07:05 +02:00
Vincent Latombe 789dc6dc76 [JENKINS-34601] Fix help file for node name attribute 2016-05-04 11:18:06 -07:00
Daniel Beck 5e0b737138 Merge pull request #2154 from olivergondza/move-test-classes
Move remaining test helper classes from core repo
2016-05-04 14:47:37 +02:00
Oliver Gondža a3e2831b47 Merge branch 'master' into move-test-classes 2016-05-04 10:30:07 +02:00
Daniel Beck 240405dfc3 Merge pull request #2026 from pjdarton/fix_jenkins_15331
[FIX JENKINS-15331] Windows file locking workaround
2016-05-04 01:32:27 +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
Tomas 866ad0e242 Lithuanian translation update 2016-05-03 22:32:58 +03:00
Daniel Beck 134abbd6d3 Merge pull request #2289 from recena/JENKINS-34438
[JENKINS-34438] Activate JSHint during the build process
2016-05-03 21:22:32 +02:00
tfennelly 66351d671d Move HttpSessionListener "all" method
Trying to get a +1 from Daniel
2016-05-03 16:41:36 +01:00
tfennelly fb54551b33 Revert "Added JenkinsHttpSessionListenerTest to commit history so we can resurect it later (maybe)"
This reverts commit 77555ee888.
2016-05-03 16:33:29 +01:00
tfennelly 77555ee888 Added JenkinsHttpSessionListenerTest to commit history so we can resurect it later (maybe) 2016-05-03 16:33:10 +01:00