Commit Graph
490 Commits
Author SHA1 Message Date
Jesse Glick 3f2958795c ${h.breakableString(…)} might be called with a null argument if something is broken.
For robustness, pass on the null to Jelly rather than failing page rendering.
2014-04-30 18:19:17 -04:00
Kohsuke Kawaguchi d5c368dd8e Merge branch 'pull-714' 2014-04-19 18:31:09 -07:00
Kohsuke Kawaguchi 52b2571126 Merge pull request #737
Conflicts:
	core/src/main/java/hudson/model/UpdateCenter.java
2014-04-19 16:42:31 -07:00
Jesse Glick b6b7bfd27c [FIXED JENKINS-22681] Fix of JENKINS-19418 should have used getById, not load, to avoid reloading the last build gratuitously. 2014-04-18 18:36:55 -04:00
Oliver Gondža a7eb8b7eb3 Merge pull request #1195 from daniel-beck/JENKINS-22670
[FIXED JENKINS-22670] Less aggressive word breaking
2014-04-18 19:20:55 +02:00
Daniel Beck 35b0094137 [FIXED JENKINS-22670] Less aggressive word breaking 2014-04-17 21:49:15 +02:00
Jesse Glick 04aace98d1 Extracting some miscellaneous usages from core/src. 2014-04-14 19:47:20 -04:00
Jesse Glick 4aad749cbe Removing hudson.matrix classes and associated resources as a first pass. 2014-04-14 19:03:29 -04:00
Kohsuke Kawaguchi 1f55b80f18 fixed a test regression 2014-04-03 21:05:31 -07:00
Kohsuke Kawaguchi 0b27f364f9 [JENKINS-22354]
Avoid having FilePath to depend on Jenkins, which increases the amount of classloading that has to happen during remoting
2014-04-03 20:17:24 -07:00
Jesse Glick bcc8614856 [FIXED JENKINS-18364] Functions.getRelativeLinkTo is called many times during rendering, so skip checking View.getItems which is expensive. 2014-04-01 10:53:25 -04:00
Oliver Gondža e1d7439981 Revert "list-jobs should print names, not display names, since people expect to be able to feed the results into other CLI commands."
This reverts commit aaa50018ee.
2014-03-25 22:27:20 +01:00
Jesse Glick aaa50018ee list-jobs should print names, not display names, since people expect to be able to feed the results into other CLI commands. 2014-03-19 14:42:17 -04:00
Michal Srb 86ad82227c Switch to java.util.logging on few places 2014-03-11 07:57:52 +01:00
Jesse Glick a0d6e5286d Fixed outstanding uses in core of deprecations from #1135 & #1138. 2014-02-27 17:29:29 -05:00
Kohsuke Kawaguchi 56024205c1 Excluding this test on unsupported platform
... based on Tyler's discovery at https://gist.github.com/rtyler/9195510

testRemoting(hudson.util.ProcessTreeTest)  Time elapsed: 0.097 sec  <<< ERROR!
java.util.NoSuchElementException: null
        at java.util.HashMap$HashIterator.nextEntry(HashMap.java:897)
        at java.util.HashMap$ValueIterator.next(HashMap.java:922)
        at hudson.util.ProcessTreeTest$MyCallable.call(ProcessTreeTest.java:42)
        at hudson.util.ProcessTreeTest$MyCallable.call(ProcessTreeTest.java:38)
        at hudson.remoting.UserRequest.perform(UserRequest.java:118)
        at hudson.remoting.UserRequest.perform(UserRequest.java:48)
        at hudson.remoting.Request$2.run(Request.java:328)
        at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
        at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
        at java.util.concurrent.FutureTask.run(FutureTask.java:166)
        at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
        at java.lang.Thread.run(Thread.java:724)

He runs this on FreeBSD.
2014-02-24 11:57:25 -08:00
Jesse Glick b09f828706 [JENKINS-21159] Noting #663 merge. 2014-02-18 18:25:16 -05:00
Jesse Glick 20c4b06f8c Merge branch 'master_g' of github.com:ialbors/jenkins
[FIXED JENKINS-21159] Merged #663.
2014-02-18 18:10:17 -05:00
Jesse Glick b2c69b4a35 Split RawHtmlMarkupFormatter into a bundled plugin (antisamy-markup-formatter).
https://trello.com/c/NvZt4WXu/15-rawhtmlmarkupformatter
2014-02-17 12:22:53 -05:00
Jesse Glick 408e2acace Merge branch 'security' into security-rc 2014-02-12 09:59:34 -05:00
Jesse Glick d030fbbaee [FIXED SECURITY-105] Disabling DynamicProxyConverter. 2014-02-12 09:56:21 -05:00
Jesse Glick abc77438d2 Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/util/RobustReflectionConverter.java
	core/src/main/resources/lib/layout/layout.jelly
	war/pom.xml
2014-02-11 21:00:54 -05:00
Jesse Glick 7541e83cc9 [SECURITY-76] [SECURITY-88] Adjust test to policy changes. 2014-02-11 17:29:05 -05:00
Michael Strasser 61ec6a942a safe() also replaces '%' with '_' 2014-02-07 09:59:49 +01:00
Kevin P. Fleming d33a73591d Remove unnecessary executable bits on source files 2014-01-31 08:38:07 -05:00
Jesse Glick 3bc72bb9d2 jdk5 was correctly failing after d73ea7e. 2014-01-27 13:51:04 -08:00
Jesse Glick 08ab1b788f Let -Dignore.random.failures work on UpdateCenterTest, which is currently failing and so blocking validated merge. 2014-01-27 12:43:31 -08:00
Kohsuke Kawaguchi f1e4440463 Revert "Merge branch 'pull-1091'"
This reverts commit 1fda95b6ae, reversing
changes made to 0fd39c445a.

Daniel Beck confirmed that I wasn't supposed to merge both 1090 and
1091. After discussion with him, I'm taking 1090.

See: https://github.com/jenkinsci/jenkins/commit/1fda95b6aea55cb216074b18bbb34fd8708c64c0#commitcomment-5112285
2014-01-20 09:57:30 -08:00
Kohsuke Kawaguchi 1fda95b6ae Merge branch 'pull-1091'
Conflicts:
	core/src/main/java/hudson/logging/LogRecorder.java
	core/src/test/java/hudson/logging/LogRecorderTest.java
2014-01-18 16:40:57 -08:00
Kohsuke Kawaguchi 0fd39c445a Merge pull request #1090 from daniel-beck/JENKINS-21386
[FIXED JENKINS-21386] Allow more specific loggers to reduce log level
2014-01-18 16:30:25 -08:00
Jesse Glick 5727f287e2 Warn in the UI about short cycles in the day of month field for a crontab, which can have surprising behaviors near the end of a month. 2014-01-16 11:27:27 -05:00
Daniel Beck bd6b999eb0 [FIXED JENKINS-21386] Allow reordering loggers, use first with matching name. 2014-01-15 01:59:05 +01:00
Daniel Beck b9426e4f17 [FIXED JENKINS-21386] Allow more specific loggers to reduce log level 2014-01-15 01:34:14 +01:00
Jesse Glick 540a529dee Fixing Actionable.replaceAction. 2014-01-08 21:34:17 -05:00
Jesse Glick 6d3c2e0d84 [FIXED JENKINS-18680] Update members of a ListView using a regular listener, not View.onJobRenamed which does not work with folders. 2013-12-19 18:28:01 -05:00
Jesse Glick a11df3f338 Rewrote computeRelativeNamesAfterRenaming to work with moves. 2013-12-19 17:21:11 -05:00
Jesse Glick b65f42c6d0 Working on making it straightforward for plugins to update even relative names after a move. 2013-12-19 12:56:41 -05:00
Jesse Glick 66805b7463 Why did these tests have timeouts?
Seems to have caused spurious timeout errors.
https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/1748/testReport/junit/hudson.scheduler/CronTabEventualityTest/testFirstSundayOfMonthWillBeEventuallyTriggeredWithinOneMonthAndOneWeek_0_/
java.lang.Exception: test timed out after 1000 milliseconds
	at java.io.UnixFileSystem.getBooleanAttributes0(Native Method)
	at java.io.UnixFileSystem.getBooleanAttributes(UnixFileSystem.java:242)
	at java.io.File.exists(File.java:772)
	at sun.misc.URLClassPath$FileLoader.getResource(URLClassPath.java:1072)
	at sun.misc.URLClassPath.getResource(URLClassPath.java:199)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:358)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:424)
	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
	at hudson.scheduler.CronTab.set(CronTab.java:87)
	at hudson.scheduler.CronTab.<init>(CronTab.java:83)
	at hudson.scheduler.CronTab.<init>(CronTab.java:66)
	at hudson.scheduler.CronTabEventualityTest.checkEventuality(CronTabEventualityTest.java:113)
	at hudson.scheduler.CronTabEventualityTest.testFirstSundayOfMonthWillBeEventuallyTriggeredWithinOneMonthAndOneWeek(CronTabEventualityTest.java:109)
2013-12-16 16:25:05 -05:00
Oliver Gondža 3f1f122ff4 [FIXED JENKINS-20928] l:breakable mishandles HTML metacharacters 2013-12-12 15:16:13 +01:00
Jesse Glick a900b488b5 [FIXED JENKINS-20800] HTML metacharacters not escaped in log messages. 2013-11-27 18:32:22 -08:00
Oliver Gondža 58ee9395cf Merge pull request #1015 from olivergondza/fix-7285
[FIXED JENKINS-7285] Fix regression from 1.536
2013-11-16 15:00:10 +01:00
Jesse Glick 3583f34426 Merge branch 'scheduled-executor-timer' of github.com:recampbell/jenkins into recampbell-scheduled-executor-timer 2013-11-15 17:39:47 -05:00
Jesse Glick 15ac490af1 Now that we use Java 6, can finally deprecate IOException2. 2013-11-15 08:19:59 -05:00
Oliver Gondža d7c016b881 [FIXED JENKINS-7285] Fix regression from 1.536 2013-11-14 13:25:24 +01:00
Oliver Gondža 7648a95a7c Refactor hudson.console.UrlAnnotatorTest 2013-11-08 10:47:21 +01:00
Edmund Wong 4bf5e15b18 [JENKINS 19866] Add log handling line beginning with 'file://' 2013-11-08 16:22:45 +08:00
ikedam 6d56de71cb [JENKINS-20280] Use topological sorting to decide the order to override variables. 2013-11-01 23:55:29 +09:00
ikedam 562c64bbdb [JENKINS-20280] Make it easy to change the implementation. Especially Map.Entry is not so convenient to handle. 2013-11-01 22:11:18 +09:00
Ryan Campbell 6e9b7b7e64 Naming convention 2013-10-28 15:42:38 -05:00
Ryan Campbell 565ced0dba [FIXES JENKINS-19622] Replace hudson.model.Trigger#timer with jenkins.util.Timer, which exposes a ScheduledExecutorService. Up to 10 additional threads will be created to run pending tasks even if running tasks are blocked.
Also, move static initialization of timers to the classes which require them.
2013-10-28 14:44:17 -05:00