Commit Graph
15581 Commits
Author SHA1 Message Date
Baptiste Mathus b8d244b677 [FIX JENKINS-34857] Dont throw Exception when Jenkins.instance yields null 2016-05-16 21:04:58 +02:00
Oliver Gondža c8d2f9036a Merge pull request #2350 from olivergondza/name-queue-maintenance-thread
Assign name to queue maintenance thread
2016-05-16 13:26:26 +02:00
Oliver Gondža 25435182ca Assign name to queue maintenance thread 2016-05-16 10:42:21 +02:00
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
Manuel Recena 606794a46f [JENKINS-34628] - Bundle "Font Awesome" and "Google Fints: Roboto" dependencies to prevent failures in the offline mode (#2318)
* [JENKINS-34628] Remove dependencies with external static resources

* [JENKINS-34628] License files were added

* [JENKINS-34628] Added references in the About page
2016-05-15 15:58:01 +02:00
Andres Rodriguez 5762eb9fc0 [JENKINS-32886] Pick up missing downloads on restart (#2345)
* [JENKINS-32886] Pick up missing downloads

* [JENKINS-32886] Improve error handling.
2016-05-15 13:04:56 +02:00
Oleg Nenashev 99f80a0b0b [JENKINS-34755] Migrate the stuff and restrict access to the engine in the next release (#2346)
[JENKINS-34755] Migrate to SystemProperties and restrict access to the engine
2016-05-15 01:05:50 +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
David McFarland 6ceccc0cc4 [JENKINS-28071] generalise CLI's BuildCommand target from AbstractProject to Job (#1979)
* [JENKINS-28071] generalise BuildCommand target from AbstractProject to Job

This allows e.g. WorkflowJob to build, fixing symptom [JENKINS-29826]

* fixup! [JENKINS-28071] generalise BuildCommand target from AbstractProject to Job

* fixup! [JENKINS-28071] generalise BuildCommand target from AbstractProject to Job
2016-05-14 15:09:28 +02:00
Oleg Nenashev 1e6afbae3b [JENKINS-34745] - Prevent CheckUpdates PeriodicWork death if update site cert is missing (#2333)
* [JENKINS-34745] - Prevent CheckUpdates PeriodicWork death in the case of the missing update site signature

* [JENKINS-34745] - Fix typo in the validator

* [JENKINS-34745] - Fix the formatting of the validation message (cc @lanwen)
2016-05-14 14:05:35 +02:00
Felix Belzunce Arcos 9b18d9bd5d [FIXED JENKINS-34370] Fix NPE getting size of parameterDefinitions.size (#2296)
* Fix NPE getting size of parameterDefinitions.size

* Protect get against NPE

* readResolve and adequate List management

* [JENKINS-34370] Simplify code

* Address comments

* Address comments

* Use NullPointerException
2016-05-14 12:45:55 +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
James Nord 17dfb8ab00 Amending #2055 (#2342) 2016-05-13 17:33:40 +02:00
Vincent Latombe 0c16c8576b [JENKINS-23507] Make FilePath.installIfNecessaryFrom follow redirects (#2331) 2016-05-13 12:36:45 +02:00
Oliver Gondža 782804f38e Merge pull request #2312 from pjanouse/JENKINS-31618
[JENKINS-31618] Fixed NoSuchMethodException in loginLink.jelly
2016-05-13 12:17:06 +02:00
Oleg Nenashev ebb84da617 [JENKINS-34748] - Fix handling of dependency trees in PluginManager::addDependencies() (#2334) 2016-05-13 10:39:01 +02:00
Jesse Glick cc26370e8d Update SezPoz to 1.11. (#2338) 2016-05-13 10:36:36 +02:00
Ing. Pavel Janousek 1642f64e26 Fixed typo in comment 2016-05-13 08:53:14 +02:00
Carlos Rendon d8076e9654 Fix RSS id for builds in folders (#1965)
[JENKINS-34767] - Prevent RSS ID collisions for items with same name in different folders
2016-05-12 16:38:27 +02:00
Felix Belzunce Arcos 4bab3630ef [FIXED JENKINS-25164] Add JOB_BASE_NAME env var (#2321)
* [JENKINS-25164] Add SHORT_JOB_NAME env var

* Delete strip off

* [JENKINS-25164] Change SHORT_JOB_NAME for LEAF_JOB_NAME

* [JENKINS-25164] Change LEAF_JOB_NAME for JOB_BASE_NAME
2016-05-12 16:33:02 +02:00
Oleg Nenashev cf0444f056 [JENKINS-34755] - Added disclaimer regarding the non-initialized context 2016-05-12 15:46:57 +02:00
Oleg Nenashev c9a5995cc3 [JENKINS-34755] - Wrap all loggers with logging level checks 2016-05-12 15:44:48 +02:00
Ing. Pavel Janousek cac3a2e955 Fixed condition 2016-05-12 15:38:55 +02:00
Oleg Nenashev 732696bd89 Update annotation-indexer from 1.7 to 1.11 (#2329)
Diff: https://github.com/jenkinsci/lib-annotation-indexer/compare/e90dade9a07b04b64ac1b08d539d30ad69ddf7a8...2eec43c72b3cd040d2057e6bbbf639f5e030453e

Major changes:
* 1.11 - [JENKINS-32978] support latest source version to avoid compile time warnings with JDK7
* 1.10 - Get ready for JDK 9
* 1.10 - Be tolerant against line separators on different operating systems
* 1.9 - Support of third-party annotations
* 1.8 - Annotation processor can be intercepted
2016-05-12 15:21:26 +02:00
Oleg Nenashev 930f6308a5 [JENKINS-34705] - Prevent hanging of InstallationWizard if internet check is skipped (#2328) 2016-05-12 15:11:45 +02:00
Oleg Nenashev d0012ea8d7 [JENKINS-34755] - Add some tests 2016-05-12 15:09:43 +02:00
Ing. Pavel Janousek f2f9d36c06 Fixed per Oliver's comments 2016-05-12 14:46:30 +02:00
Ing. Pavel Janousek da4e784923 Modified for being a bit more legible 2016-05-12 14:46:30 +02:00
Ing. Pavel Janousek 2a489d3eea Better handled or fixed identified problematic parts of the code. 2016-05-12 14:46:30 +02:00
Ing. Pavel Janousek 6c6f34cd64 [JENKINS-31618] Fixed NoSuchMethodException in loginLink.jelly
The logic is moved from template back to Java and modified to fix the issue.
The argorithm is rewritten for better legibility.
2016-05-12 14:46:30 +02:00
Oleg Nenashev d03e68f03c [JENKINS-34755] - Wrap SecurityExceptions, they should not go outside 2016-05-12 14:40:13 +02:00
Oleg Nenashev bea2a92361 [JENKINS-34755] - Reformat Javadoc 2016-05-12 12:52:51 +02:00
Oleg Nenashev 61a9ea606e [JENKINS-34755] - Polish the code a bit 2016-05-12 12:19:43 +02:00
Oleg Nenashev ce8922bd74 Merge branch 'master' into JENKINS-34755
Conflicts:
	core/src/main/java/hudson/Util.java
	core/src/main/java/hudson/WebAppMain.java
	core/src/main/java/hudson/model/Item.java
	core/src/main/java/hudson/model/Queue.java
	core/src/main/java/hudson/model/UpdateCenter.java
	core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
	core/src/main/java/hudson/slaves/NodeProvisioner.java
	core/src/main/java/jenkins/model/Jenkins.java
	core/src/main/java/jenkins/slaves/NioChannelSelector.java
	core/src/main/java/jenkins/util/xml/XMLUtils.java
2016-05-12 12:05:24 +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
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
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
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