Commit Graph
17505 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 3e7181d9a5 Merge remote-tracking branch 'origin/master' 2013-07-26 21:30:23 -07:00
Kohsuke Kawaguchi 85592268e2 Merge pull request #809 from jbyers/rpm-init-script-ip-address
expose --listen* command line arguments in RPM init script
2013-07-26 21:29:29 -07:00
Kohsuke Kawaguchi 6af9127409 [FIXED JENKINS-15025] no additional info in console log about failures
Conflicts:
	maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
2013-07-26 21:27:48 -07:00
Kohsuke Kawaguchi 09cf96f33c Merge pull request #854 from ikedam/feature/JENKINS-18643-1
[FIXED JENKINS-18643] Make tests run on Windows (line break character, query parameters for file schema)
2013-07-26 21:18:06 -07:00
Larry North 3376cf0158 [FIXED JENKINS-16660] Allow variable names with dots in bracketed references.
Given these <variable,value> mappings: <A,a> and <A.B,a-b>, $A.B would
evaluate to $a.B, as it currently does, and ${A.B} to a-b instead of the
current ${A.B}.

Existing ${A.B}-like references will break (not evaluate to ${A.B}) if
there actually is an A.B variable defined, which I think is very
unlikely.
2013-07-26 21:15:51 -07:00
Kohsuke Kawaguchi ba432da2b5 Merge pull request #880 from evilmilo/master
[FIXED JENKINS-18813] Add/RemoveTrigger now works
2013-07-26 21:08:51 -07:00
Kohsuke Kawaguchi 016baea4f0 Opening it up to plugins.
See https://groups.google.com/forum/#!topic/jenkinsci-dev/CPab12692Qs
and https://github.com/jenkinsci/jenkins/pull/873 for the context.

This change reimplements nullin's original commit as it contains too
many noise changes.
2013-07-26 21:05:19 -07:00
Kohsuke Kawaguchi f83d4550fc added more convenience method 2013-07-26 21:02:13 -07:00
Kohsuke Kawaguchi c462cb634c added a convenience method 2013-07-26 21:02:13 -07:00
Kohsuke Kawaguchi cae8c5f2ef Merge pull request #883 from daniel-beck/master
Show full job names in checkbox tooltips when configuring list views
2013-07-26 20:55:20 -07:00
Jesse Glick ed708297e9 Changing property to 1.${java.version} since that will be friendlier to Animal Sniffer. 2013-07-26 18:25:20 -04:00
Jesse Glick b15ecb7533 If you use ‘real apostrophes’ you do not need to escape ' to '' just for MessageFormat. 2013-07-26 17:52:48 -04:00
Jesse Glick 8238e6eb3f URL-escaping logger names. 2013-07-26 17:36:03 -04:00
Jesse Glick 010d9e9067 [FIXED JENKINS-18959] /log/all should not show FINE messages from custom loggers. 2013-07-26 17:20:32 -04:00
Kohsuke Kawaguchi 2210ec1bb4 merged back the RC branch 2013-07-24 18:22:03 -07:00
Kohsuke Kawaguchi 2284c445ac updated changelog as a part of the release 2013-07-24 18:21:57 -07:00
Jesse Glick 2152cf478e [FIXED JENKINS-18918] From plugins we must use target/ not target/classes/ to unpack Maven.
Also cleaning up variable names to be less misleading.

Note that new File("target") is really a bad idea since we cannot predict the CWD in effect when Maven is run.
(From the standard bin/mvn launcher, it seems that it will always be *some* Maven project at least.
This may not be true for Maven run embedded from various tools.)
But leaving that as is for now, since it is not clear how else we would find the project location.
(new File(env.description().getTestClass().getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile() might work but it is pretty hacky.)
2013-07-24 18:16:18 -04:00
Jesse Glick 68f1fa281f Comment about probable bug. 2013-07-24 18:09:10 -04:00
Jesse Glick 11953750ab [[JENKINS-16301] Use a buffered input stream to get somewhat better performance also from Maven archiving.
Introducing Util.getDigestOf(File) as a convenience.
2013-07-24 16:30:48 -04:00
Jesse Glick e0a3a1ddf5 [FIXED JENKINS-18178] Reverting an inessential part of the fix of JENKINS-16301 since it broke some Maven builds.
Apparently the Maven 2 process factory fails to adequately insulate the Maven process from Jenkins library dependencies;
if you specify a build extension that can override dependencies used by Jenkins core classes!
A real fix would involve changing class loader delegation, since presumably similar bugs could still occur.
2013-07-24 16:22:48 -04:00
Jesse Glick 74d57de91b Misleading comment. 2013-07-24 15:11:56 -04:00
Jesse Glick a0ff0b2f76 Typo in Javadoc. 2013-07-24 14:56:09 -04:00
Jesse Glick e1b50dcc53 Do not assume that retention strategy descriptor display name functions as a verb. 2013-07-24 12:57:53 -04:00
mcdonan edf932be37 [FIXED JENKINS-18813] Add/RemoveTrigger now works
Ensure the addTrigger and removeTrigger methods only use methods that are
supported by DescribableList. This means no indexed operations are
supported, so use only Iterator#remove and Collection#add

Add Integration Tests to ensure methods work as expected
2013-07-24 15:00:03 +01:00
Jesse Glick d18a27e5be Merge branch 'master' of github.com:jenkinsci/jenkins 2013-07-24 09:56:59 -04:00
Jesse Glick f209a75d67 Diagnosis for possible race condition in LogRotator when using external-monitor-job.
java.io.IOException: …/builds/2013-07-11_12-21-02 is in use
    at hudson.model.Run.delete(Run.java:1363)
    at hudson.tasks.LogRotator.perform(LogRotator.java:133)
    at hudson.model.Job.logRotate(Job.java:406)
    at hudson.model.Run.execute(Run.java:1638)
2013-07-24 09:56:31 -04:00
Oliver Gondža 06016ac4f8 Merge pull request #866 from Vlatombe/listview-set-includeregex-programmatically
Refactor ListView to allow to set includeRegex programmatically
2013-07-24 06:33:53 -07:00
Kohsuke Kawaguchi dfd46a4459 updated changelog for release 2013-07-23 23:35:38 -07:00
Kohsuke Kawaguchi 7729eaf280 [maven-release-plugin] prepare for next development iteration 2013-07-23 22:47:46 -07:00
Kohsuke Kawaguchi d33e903dc6 [maven-release-plugin] prepare release jenkins-1.524 jenkins-1.524 2013-07-23 22:47:46 -07:00
Olivier Lamy 3396247ea6 changelog entry for JENKINS-15935 2013-07-24 10:55:20 +10:00
Olivier Lamy 2a31fc8835 Merge branch 'master' of github.com:jenkinsci/jenkins 2013-07-24 10:52:30 +10:00
Olivier Lamy 941e83fae1 [JENKINS-15935] Can't build using maven 3.1.0 latest release candidate
Merge branch 'maven-3.1.0' for maven 3.1.0 support in Maven Integration Plugin
2013-07-24 10:16:20 +10:00
Jesse Glick b08e1a75e8 Merge branch 'master' of github.com:jenkinsci/jenkins 2013-07-23 20:02:13 -04:00
Jesse Glick 33101a3a01 [JENKINS-18898] Comment.
Unclear what Run.getEnvironment is supposed to return after the build is complete.
In particular, SubversionSCM calls this during polling to substitute variables in e.g. repo URL.
Presumably in such a case node-specific variables such as ToolInstallation.home would be irrelevant.
But in general should this reflect the “current” computer (if any), or the computer on which the build ran?
2013-07-23 20:01:56 -04:00
Jesse Glick be158b4b2a [FIXED JENKINS-18898] ToolInstallation.getHome may be null, and buildEnvVars must take that into account. 2013-07-23 19:48:43 -04:00
Olivier Lamy 03b1c4f521 Merge pull request #878 from MarkEWaite/javadoc-fixes-e
Fix javadoc for QueueTaskDispatcher and NodeProperty
2013-07-23 15:37:26 -07:00
Olivier Lamy 70de0a166b Merge pull request #876 from MarkEWaite/javadoc-fixes-d
Fix javadoc for @see reference in MatrixAggregator
2013-07-23 15:36:41 -07:00
Olivier Lamy 6b87aa70dd Merge pull request #875 from MarkEWaite/javadoc-fixes-c
Fix SCMTriggerCause javadoc to deprecated constructor
2013-07-23 15:36:10 -07:00
Olivier Lamy 8b862b0ed6 Merge pull request #879 from MarkEWaite/javadoc-fixes-f
Fix javadoc link in MatrixExecutionStrategy
2013-07-23 15:34:04 -07:00
Mark Waite 7d1e35f01c Fix javadoc link in MatrixExecutionStrategy
Uses the outer class plus the inner class to name the argument, which
satisfies javadoc.
2013-07-23 16:21:57 -06:00
Mark Waite 5b969fd1ca Fix javadoc for QueueTaskDispatcher and NodeProperty
There is a BuildableItem interface in hudson.model, but the references
in these files to BuildableItem objects are refering to an inner class
of the Queue object, not to the interface defined in huson.model.  The
javadoc link improvement may help authors see that difference.
2013-07-23 16:11:32 -06:00
Jesse Glick e78c541e89 Avoid computing lastFailedBuild if lastSuccessfulBuild is not null. 2013-07-23 18:11:13 -04:00
Mark Waite c04dd51104 Fix javadoc for @see reference in MatrixAggregator
http://javadoc.jenkins-ci.org/hudson/matrix/MatrixAggregator.html#startBuild()
has an @see reference which should be a link.
2013-07-23 10:43:01 -06:00
Mark Waite e8c4cd2f7e Fix SCMTriggerCause javadoc to deprecated constructor
http://javadoc.jenkins-ci.org/hudson/triggers/SCMTrigger.SCMTriggerCause.html
includes a deprecated constructor with an @{link } reference to the
preferred constructor.  That link is broken in the current javadoc.
This fixes the broken link.
2013-07-23 09:38:59 -06:00
Christoph Kutzinski 1f8479c7df Merge pull request #874 from MarkEWaite/javadoc-fixes-b
Fix javadoc link from deprecated DumbSlave constructor
2013-07-23 08:11:34 -07:00
Mark Waite eee526d0c7 Fix javadoc link from deprecated DumbSlave constructor 2013-07-23 08:33:30 -06:00
Olivier Lamy 6030c77e6b maven interceptors released version 1.4 2013-07-23 22:36:27 +10:00
Olivier Lamy bbea4a3608 ignore .java-version 2013-07-23 22:28:43 +10:00
Olivier Lamy b7488b6c31 fix unit test 2013-07-23 20:01:01 +10:00