Commit Graph
19762 Commits
Author SHA1 Message Date
Jesse Glick b76e7bf998 [FIXED JENKINS-25655] Incorrect caching from entrySet sometimes caused incorrect results.
Caused a failure in hudson.plugins.promoted_builds.conditions.ManualConditionTest.testManualPromotionProcessViaWebClient when run against 1.580.1.
builds/299 builds/300 builds/301 changes/299 changes/300 changes/301
2014-11-17 17:48:48 -05:00
Jesse Glick 1568166e76 Merge pull request #1464 from KostyaSha/fix_warexploder
Explode WAR fails when ./target does not yet exist (e.g., run from IDEA)
2014-11-17 10:42:07 -05:00
Stephen Connolly 4e56128cd8 Allow Projects to take the Queue.Item's actions into consideration when determining their default authentication 2014-11-17 14:18:06 +00:00
Stephen Connolly b27c11acc7 Actually don't need the lock here as c.kill() now does the right thing 2014-11-17 13:51:41 +00:00
Stephen Connolly ddff2faa90 Damn you Java 7 for not catching 2014-11-17 12:49:30 +00:00
Stephen Connolly 65b71c20b1 Allow programmatic QueueItemAuthenticators that are not user configurable 2014-11-17 11:44:56 +00:00
Stephen Connolly 7335916f18 Provide a future path to refactoring the Queue locking strategy
- Also tidy up some holes in locking strategy that can cause builds to be scheduled on
  executors that are about to be interrupted or nodes in the process of being removed
2014-11-17 11:07:59 +00:00
Kohsuke Kawaguchi 7f990004ec the trunk is toward 1.592-SNAPSHOT 2014-11-16 19:34:12 -08:00
Kohsuke Kawaguchi b2121adb5c creating an RC branch 2014-11-16 19:34:08 -08:00
Kohsuke Kawaguchi af49ac94ea merged back the RC branch 2014-11-16 17:38:51 -08:00
Kohsuke Kawaguchi 88f2ebc762 updated changelog as a part of the release 2014-11-16 17:38:48 -08:00
Kohsuke Kawaguchi 54f5d89695 updated changelog for release 2014-11-16 15:58:53 -08:00
Kohsuke Kawaguchi 09fe8c1d05 [maven-release-plugin] prepare for next development iteration 2014-11-16 15:52:54 -08:00
Kohsuke Kawaguchi 29f5057bcf [maven-release-plugin] prepare release jenkins-1.590 jenkins-1.590 2014-11-16 15:52:54 -08:00
Kanstantsin Shautsou 9aaeb0a3f2 Explode WAR fails when ./target does not yet exist (e.g., run from IDEA).
Create parent directory before trying to lock dir using files.

java.lang.Exception: Failed to initialize exploded war
at org.jvnet.hudson.test.WarExploder.getExplodedDir(WarExploder.java:49)
at org.jvnet.hudson.test.JenkinsRule.createWebServer(JenkinsRule.java:582)
at org.jvnet.hudson.test.JenkinsRule.newHudson(JenkinsRule.java:538)
at org.jvnet.hudson.test.JenkinsRule.before(JenkinsRule.java:332)
at org.jvnet.hudson.test.JenkinsRule$2.evaluate(JenkinsRule.java:482)
at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:48)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
at org.junit.runner.JUnitCore.run(JUnitCore.java:160)
at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:74)
at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:211)
at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:67)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at com.intellij.rt.execution.application.AppMain.main(AppMain.java:134)
Caused by: java.io.FileNotFoundException: /Users/integer/Documents/idea/jenkins-ws-git-plugin/./target/jenkins-for-test.exploding (No such file or directory)
at java.io.FileOutputStream.open(Native Method)
at java.io.FileOutputStream.(FileOutputStream.java:212)
at java.io.FileOutputStream.(FileOutputStream.java:104)
at org.jvnet.hudson.test.WarExploder.explode(WarExploder.java:99)
at org.jvnet.hudson.test.WarExploder.(WarExploder.java:58)
... 24 more
2014-11-16 02:55:42 +03:00
Jesse Glick 4f0e910384 Merge pull request #1463 from intelradoux/patch-1
Update ChoiceParameterDefinition
2014-11-14 17:55:40 -05:00
intelradoux 07a19fcc3c Update ChoiceParameterDefinition
The "it.value" don't exist, so we need to set the defaultParameterValue. 

It help me display correctly parameter for my multilauncher plugin. 
Note that other ParameterDefinition use the default value to display parameter, so IMO it is safe to do this.
2014-11-14 09:49:10 +01:00
Jesse Glick fb8a8b4041 Merge pull request #1462 from cyrille-leclerc/add-verbose-logs
Better debug messages in JSONSignatureValidator
2014-11-13 13:58:30 -05:00
Jesse Glick 9a63158175 AtomicFileWriter.commit should use Util.deleteFile so as to get a more meaningful error message in case the deletion fails.
The following is not helpful in terms of diagnosing the root problem:
java.io.IOException: Unable to delete /…/jobs/demo/builds/…/workflow/3.xml
	at hudson.util.AtomicFileWriter.commit(AtomicFileWriter.java:112)
	at hudson.XmlFile.write(XmlFile.java:179)
	at org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage.saveActions(SimpleXStreamFlowNodeStorage.java:106)
	at …
builds/297 builds/298 changes/297 changes/298
2014-11-13 10:31:12 -05:00
Cyrille Le Clerc 229ecdc7c8 Better debug messages in JSONSignatureValidator 2014-11-12 00:55:16 +00:00
Kohsuke Kawaguchi 68b383e0b2 Adding another cause builds/296 changes/296 2014-11-11 11:52:26 -08:00
Kohsuke Kawaguchi 2e87c36ca0 Making this class serializable
The use case that led me here was to use this from workflow which relies primarily on Java serialization
2014-11-11 11:52:26 -08:00
Nicolas De Loof e77f79e82b log error creating slave log directory 2014-11-11 10:58:10 +01:00
Jesse Glick 9cca9e05be Expanding Javadoc from #1454 as suggested by @oleg-nenashev. builds/295 changes/295 2014-11-10 13:30:17 -05:00
Jesse Glick 50124db9d5 Merge branch 'Computer.currentComputer-JENKINS-2786' 2014-11-10 13:28:53 -05:00
Daniel Beck d57e3e7e34 Fix 1.589 changes 2014-11-10 19:19:08 +01:00
Kohsuke Kawaguchi d948344c1e Merge remote-tracking branch 'origin/master' 2014-11-10 06:13:05 -08:00
Kohsuke Kawaguchi 9edf0e3f79 the trunk is toward 1.591-SNAPSHOT 2014-11-10 06:12:33 -08:00
Kohsuke Kawaguchi a0b900b9aa creating an RC branch 2014-11-10 06:12:29 -08:00
Oleg Nenashev 4f54c8af33 Noting https://github.com/jenkinsci/jenkins/pull/1268 , cleanup of previous changelogs
Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2014-11-10 13:16:31 +03:00
Oleg Nenashev 9162c3cbb7 Noting https://github.com/jenkinsci/jenkins/pull/1408
Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2014-11-10 12:38:21 +03:00
Oleg Nenashev fef47e124f Merge pull request #1408 from howlger/master
[FIXED JENKINS-22514] In ZIP archives file separator must be '/'
2014-11-10 12:26:13 +03:00
Kohsuke Kawaguchi e71d5e42c4 merged back the RC branch 2014-11-09 21:40:34 -08:00
Kohsuke Kawaguchi a501f24f98 updated changelog as a part of the release 2014-11-09 21:40:31 -08:00
Kohsuke Kawaguchi 2521f170e7 updated changelog for release 2014-11-09 21:01:58 -08:00
Kohsuke Kawaguchi b9bfb0e69a [maven-release-plugin] prepare for next development iteration 2014-11-09 20:53:06 -08:00
Kohsuke Kawaguchi 88d406d157 [maven-release-plugin] prepare release jenkins-1.589 jenkins-1.589 2014-11-09 20:53:05 -08:00
Oliver Gondža 1a48deb09d Noting #1458 and #1456 2014-11-08 10:38:50 +01:00
Oliver Gondža e96f08d61a Merge pull request #1458 from olivergondza/aggregate-validations
Aggregate multiple FormValidations into one
2014-11-08 10:36:08 +01:00
Jesse Glick 78fde58c30 Merge branch 'master' of git://github.com/jenkinsci/jenkins builds/294 changes/294 2014-11-07 14:13:09 -05:00
Oliver Gondža e451789ac7 Merge pull request #1456 from olivergondza/extract-label-validation
Expose AbstractProject.AbstractProjectDescriptor#validateLabelExpression for plugins
2014-11-07 19:42:03 +01:00
Jesse Glick ae053472a0 Merging #1268. builds/293 changes/293 2014-11-07 13:08:53 -05:00
Jesse Glick bfa557b16a Merge branch 'JENKINS-23339' of github.com:synopsys-arc-oss/jenkins 2014-11-07 13:08:03 -05:00
Kohsuke Kawaguchi ada8432fc5 [JENKINS-25144] Merge pull request #1427 builds/292 changes/292 2014-11-07 09:43:25 -08:00
Kohsuke Kawaguchi 9e81b8e4fe [FIXED JENKINS-25144] Revisiting the attempted fix in the previous commit.
IIUC, the issue here is that the request in question contains both a
valid session cookie AND basic authentication header, and that path
results in a failure because BasicHeaderProcessor expects one of
BasicHeaderAuthenticators to validate the basic authentication header
(without knowing that there's already a valid Authentication object that
came from the HTTP session, yet no BasicHeaderAuthenticator actually
processes this because BasicHeaderRealPasswordAuthenticator backs away
from doing that.

I think the corect fix is for BasicHeaderRealPasswordAuthenticator to
get rid of authenticationIsRequired check. This check instead belongs to
BasicHeaderProcessor, where it should be used to check if any
BasicHeaderAuthenticator should be consulted or not.

The problem with having this logic in
BasicHeaderRealPasswordAuthenticator is that this is just an
implementation of an extension point, and thus it needs to be removable.
As it stands right now in this fix, if this impl is removed,
JENKINS-25144 will be back again.
2014-11-07 09:42:23 -08:00
Christof Schoell 0176b6d902 [JENKINS-25144]
return authentication object instead of null if authentication is not
required - otherwise valid login fails with basic authentication
2014-11-07 09:40:26 -08:00
Oleg Nenashev e6c2e16f7a [FIXED JENKINS-23339] - Introduce the validated Jenkins::getActiveInstance() method
jenkins.model.Jenkins::getInstance() method is marked as @CheckForNull, but the most of Jenkins code does not actually check the return value. It leads to tons of static analysis errors, hence it is hard to analyze the code.

The change also adds annotations to old methods like Hudson::getInstance()

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2014-11-07 20:07:52 +03:00
Oliver Gondža 34850200b2 Introduce FormValidation#aggregate 2014-11-07 09:20:06 +01:00
Jesse Glick 24c5e5e440 Javadoc note pertaining to #1454. builds/291 changes/291 2014-11-06 14:29:07 -05:00
Jesse Glick bcdae275d0 [JENKINS-25473] Retroactively filing #1439. 2014-11-06 09:48:32 -05:00