Commit Graph
32590 Commits
Author SHA1 Message Date
Jesse Glick 8311fb5c7f May as well use new DownloadService.loadJSON method here.
(cherry picked from commit 1c99cc1af0)
2015-01-09 15:16:44 -05:00
Jesse Glick 6c6e1751fe Deleting failing test updateDirectlyWithHtml.
loadJSON does not support parsing HTML.
Nor should it need to, since UC URLs are supposed to be to the JSONP file.
The .html extension is added automatically by downloadService when postBack is supported.
(cherry picked from commit d6b37a9457)

Conflicts:
	test/src/test/java/hudson/model/UpdateSiteTest.java
	test/src/test/resources/hudson/model/update-center.json.html
2015-01-09 15:16:38 -05:00
Jesse Glick 01ba28d0a2 Testing the loadJSON method directly to make sure various JSONP formats are handled.
(cherry picked from commit fb52414513)
2015-01-09 15:15:34 -05:00
Jesse Glick 8c9910f2bb @kohsuke prefers that the option to disable signature checks not even be presented unless -Dhudson.model.DownloadService.noSignatureCheck is used.
(cherry picked from commit 54c85007f3)
2015-01-09 15:15:34 -05:00
Jesse Glick a47dc036d8 Be a bit paranoid and ensure the admin has CONFIGURE_UPDATECENTER before turning off signature checks.
(cherry picked from commit 1262d88289)
2015-01-09 15:15:34 -05:00
Jesse Glick 33d88c015c [FIXED JENKINS-19081] Offer the option of downloading metadata directly from the server.
(cherry picked from commit 1ac77750e9)

Conflicts:
	core/src/main/java/hudson/model/DownloadService.java
	core/src/main/java/hudson/model/UpdateSite.java
2015-01-09 15:15:02 -05:00
Jesse Glick 66f92ac5c5 Merge branch 'security' into security-rc
Conflicts:
	core/pom.xml
2015-01-09 14:37:31 -05:00
Jesse Glick ef9421f7fd Merge branch 'security' into security-stable-1.580
Conflicts:
	core/pom.xml
2015-01-09 14:36:41 -05:00
Oliver Gondža 90e989827e [FIXED JENKINS-21341] Merge pull request #1169 from pliljenberg/master
Ugly hack to fix destroyProcess for Java8

(cherry picked from commit 19640e7b4a)
2015-01-09 14:34:14 -05:00
Kohsuke Kawaguchi 82d6292cf8 [FIXED JENKINS-18537]
Integrated the new version of XStream that contains the fix.

(cherry picked from commit 585eb87c2d)

Conflicts:
	changelog.html
2015-01-09 14:32:37 -05:00
Oliver Gondža de53fea5f9 Merge branch 'master' into override-whyKeepLog 2015-01-09 16:47:12 +01:00
Jesse Glick 9e333bc1e6 [JENKINS-10944] [JENKINS-24519] Noting merge of #1513. 2015-01-09 07:57:57 -05:00
Jesse Glick 7ce51328d5 Merge pull request #1453 from jglick/guice-update
Update Guice to 4.0-beta5
2015-01-09 07:53:35 -05:00
Oliver Gondža 567596e9b6 Merge pull request #1522 from darxriggs/no-extends-Assert
Don't extend a test class from org.junit.Assert to use its static methods.
2015-01-09 13:47:20 +01:00
Jesse Glick 7ef3d0bbf0 [JENKINS-22311] Noting merge of #1492. 2015-01-09 07:25:25 -05:00
Jesse Glick 8e5199e377 [JENKINS-25338] Noting merge of #1497. 2015-01-09 07:21:23 -05:00
Jesse Glick b33b921dc5 [JENKINS-25601] Noting merge of #1499. 2015-01-09 07:16:23 -05:00
René Scheibe 665c4985d7 don't extend a test class from org.junit.Assert to use its static methods
* to simplify the static import and test use Hamcrest to compare arrays
* no need to box boolean[] to Boolean[] when using Hamcrest
2015-01-09 12:30:00 +01:00
René Scheibe 13ab787d5f don't extend a test class from org.junit.Assert to use its static methods 2015-01-09 12:25:37 +01:00
Jesse Glick 75eeccf866 [FIXED JENKINS-26331] Noting merge of #1519. 2015-01-08 21:08:15 -05:00
Jesse Glick 28984e5920 Merge pull request #1521 from darxriggs/consistent-use-of-Assert
statically import methods used from org.junit.Assert
2015-01-08 20:11:09 -05:00
Jesse Glick 12251abe8f [FIXED JENKINS-22811] Noting merge of #1517. 2015-01-08 17:35:47 -05:00
christ66 3661ed5093 Remove unnecessary check in test unit. Fix misleading test unit comment. 2015-01-08 11:27:29 -08:00
René Scheibe 2d3dbad35a statically import methods used from org.junit.Assert
* that's a common practice so do it consistently in all tests
2015-01-08 20:25:18 +01:00
christ66 d58c3cd5d6 Remove redundant catch exception 2015-01-08 11:19:06 -08:00
Kohsuke Kawaguchi f90e53583a Merge branch 'stable-1.580' of github.com:jenkinsci/jenkins into stable-1.580 jenkins-1.580.3-rc1 2015-01-08 11:11:49 -08:00
christ66 da1c74f619 Fix log message to report more verbose message. 2015-01-08 11:01:12 -08:00
Daniel Spilker 1fae8c072a [JENKINS-26331] use buildDirectory system property to configure target directory 2015-01-08 15:39:58 +01:00
christ66 c3eb1cac79 If a project action fails to load we should log the project action and continue to load the project. 2015-01-07 15:17:58 -08:00
christ66 cd0752432e Merge remote-tracking branch 'upstream/master' into JENKINS-22811
Conflicts:
	test/src/test/java/hudson/model/ItemGroupMixInTest.java
2015-01-07 13:12:18 -08:00
Jesse Glick 8457554149 Merge pull request #1518 from darxriggs/Bug-to-Issue
replace all deprecated @Bug annotations with @Issue
2015-01-07 15:53:36 -05:00
christ66 fa40c102f5 Mark test extension with the correct annotation 2015-01-07 10:16:08 -08:00
christ66 8f24c4aa5c Obtain folder from jenkins instead of using local variable. 2015-01-07 10:14:26 -08:00
René Scheibe bd1d6251e0 replace all deprecated @Bug annotations with @Issue 2015-01-07 17:12:21 +01:00
christ66 b5213b3815 Fixed compilation error 2015-01-06 19:46:01 -08:00
christ66 3e29bd7eff [JENKINS-22811] Folder loading can break when an item inside the folder fails to load or throws an Exception. 2015-01-06 19:41:51 -08:00
Jesse Glick 6f8477f49e Merge pull request #1516 from darxriggs/no-more-HudsonTestCase-the-easy-part
migrate tests from using HudsonTestCase to JenkinsRule
2015-01-06 18:07:33 -05:00
tfennelly 3603b69938 Single/Multiline Build History
(cherry picked from commit cb9036c455)
2015-01-06 21:12:57 +01:00
Daniel Beck 2172503f3c [FIXED JENKINS-25989] Allow breaking label and node lists
(cherry picked from commit 2820e59202)
2015-01-06 21:00:54 +01:00
Jesse Glick 14d676bb15 [FIXED JENKINS-25788] RunMap.remove was always returning false, even when the Run was in fact removed.
(cherry picked from commit ce94579c50)

Conflicts:
	changelog.html
2015-01-06 20:55:46 +01:00
Jesse Glick 21a619f2e0 JUnit 4.
(cherry picked from commit 96ecabedb0)
2015-01-06 20:55:24 +01:00
Jesse Glick 23152a6da4 For RunMapTest to be Groovy was pointless and aggravating.
(cherry picked from commit 30f00b111a)
2015-01-06 20:55:24 +01:00
Richard Mortimer ea6baf9a10 [FIXES JENKINS-24272] jnlp slaves fail to reconnect when master is restarted
During master restart only attempt to reconnect the slave after the master has
finished restarting.

(cherry picked from commit 48e19c58f9)
2015-01-06 20:43:21 +01:00
René Scheibe 3a618a0633 migrate tests from using HudsonTestCase to JenkinsRule
* these are simple tests without Jelly files or actions implemented in the test class
2015-01-06 16:30:04 +01:00
Jesse Glick 0cdab01c7e Jenkins was failing to log exceptions from raw Runnable/Callable sent to Timer (without using SafeTimerTask, PeriodicWork, etc.). builds/336 changes/336 2015-01-06 09:54:16 -05:00
Jesse Glick 1a80973ab8 Merge branch 'master' into FlyweightTask-JENKINS-10944 2015-01-06 07:03:50 -05:00
Jesse Glick 86ed77711b Correcting 9595175f10 (JUnit 4 merge fixup for #1472). builds/335 changes/335 2015-01-06 07:03:08 -05:00
Oliver Gondža 9595175f10 Use JUnit4 in merged patch too 2015-01-06 12:28:01 +01:00
Oliver Gondža fb832b76a3 Merge pull request #1514 from bschelberg/master
Fixed min/max operations in ComputerRetentionWork
2015-01-06 12:17:58 +01:00
Oliver Gondža d6c1457d88 Noting #1472 2015-01-06 11:54:33 +01:00