Commit Graph
607 Commits
Author SHA1 Message Date
tfennelly a305e3dc93 Merge branch 'master' into JENKINS-26445-pagination-search
* master: (256 commits)
  Noting #1817
  Noting #1825
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.629
  [JENKINS-30139] Oleg wants to keep the data accessible so we have to go for immutable
  [JENKINS-30139] Forgot to change this one
  [JENKINS-30139] Add @Restricted to prevent external use of internal data
  [JENKINS-30139] Switch from a big fat lock to a concurrent collection
  [JENKINS-30374] Update obsolete help message
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.628
  noting merge of PR#1816 - use slf4j interceptors
  Manage commons-logging and log4j as provided, include slf4j adapters for tests.
  Exclude commons-logging and log4j in dangerous scopes compile and runtime in plugins as well.
  Only exclude commons-logging and log4j in dangerous scopes compile and runtime.
  Reintroduce enforcer rules as suggested by @jtnord.
  Document allBuilds for Job remote access API
  Include slf4j-jdk14 during tests.
  ...

Conflicts:
	war/src/main/webapp/scripts/hudson-behavior.js
2015-09-16 09:34:46 +01:00
Kanstantsin Shautsou bfa6d8be0c Remove hardcode in tar test 2015-08-25 01:09:09 +03:00
Kanstantsin Shautsou 3e187a0264 [FIXED JENKINS-10629] Unbroke stream with new tar implementation.
Causes bytes lost and truncated tar archive.
TarBuffer not used in TarArchiveOutputStream.
2015-08-25 01:09:09 +03:00
Jesse Glick 434608ba38 [JENKINS-29790] Noting merge of #1783. 2015-08-24 08:59:50 -04:00
Kanstantsin Shautsou 79c0bbf766 Protect from race condition in Triggers
[FIXED JENKINS-29790] [FIXED JENKINS-29945]
2015-08-21 21:46:52 +03:00
John Pederzolli 60ebcfb3f1 Update RunIdMigrator to properly handle matrix and maven jobs
Properly revert job history for matrix and maven jobs (depending on
setup).

Examples paths include:

jobs/someproject/Environment=prod/builds
jobs/someproject/test$test/builds
2015-08-17 15:53:11 -07:00
Daniel Beck 3944c1f2c5 Merge pull request #1789 from vlajos/typofixes-vlajos-20150807
typofix - https://github.com/vlajos/misspell_fixer
2015-08-17 13:15:03 +02:00
Oliver Gondža 7add0d1646 Merge pull request #1793 from pjdarton/utiltest_enhancement
Improved unit test for Util.deleteFile & Util.deleteRecursive
2015-08-17 07:16:03 +02:00
Peter Darton 94efc7ba6a Improved unit test for Util.deleteFile(File)
Added unit test for Util.deleteRecursive(File)
2015-08-17 07:14:47 +02:00
Veres Lajos d58903558e typofix - https://github.com/vlajos/misspell_fixer 2015-08-11 16:34:13 +01:00
Oliver Gondža 4589ce5d66 Avoid "EmptyStackException: null" in Items#getCanonicalName 2015-08-04 09:33:41 +02:00
tfennelly b103e59238 Making @jtnord happy
ridiculous stuff
2015-07-08 15:08:09 +01:00
tfennelly 76841f9d7e Javadoc etc for @jtnord 2015-07-08 14:03:28 +01:00
tfennelly d703b10fd6 Added a simple isMultipart utility to MultipartFormDataParser 2015-07-08 13:16:11 +01:00
tfennelly 5dfe78d2fc Moved Build History pagination and search classes to jenkins as requested by @jglick
I understand the motivation for this but I think it creates a bit of a maint/comprehension issue in that splits related classes across 2 different package hierarchies. I know we'll say that's ok but I don't like it. Just say'n.
2015-06-25 18:32:42 +01:00
tfennelly 7c28ed8b7d Moved Mock Queue.Item out into test/java
Not sure why I ever had it in Queue.MockItem. I must have wrongly though it was private/protected in some way that did not allow it to live anywhere else.
2015-06-25 18:32:42 +01:00
tfennelly 078d3c7c4b Build history pagination and search 2015-06-25 18:32:42 +01:00
Oliver Gondža b6bff4f2c0 [JENKINS-28041] fix failing unittest 2015-06-09 13:10:46 +02:00
Oleg Nenashev 7e4171ca5b Merge pull request #1707 from oleg-nenashev/jenkins_local_config
[FIXED JENKINS-28419] - JenkinsLocationConfiguration::adminAddress can be reset
2015-05-25 10:48:49 +03:00
Oleg Nenashev 73e151f3d1 Merge pull request #1672 from productsupcom/JENKINS-9283
[JENKINS-9283] Timezone Support for Scheduling
2015-05-21 08:48:08 +03:00
Boris 6b4d044ae0 JENKINS-9283 - Allow timezone definition in scheduler 2015-05-19 07:53:47 +03:00
Oleg Nenashev dab392f80f [JENKINS-28419] - Direct unit tests for JenkinsLocationConfiguration::adminAddress setter and getter 2015-05-16 14:25:45 +03:00
Oleg Nenashev 9a3e5518ba Merge pull request #1649 from deadmoose/follow_the_api_rules
[FIXED JENKINS-27939] - DefaultJnlpSlaveReceiver should return true when rejecting a takeover.
2015-05-16 12:55:00 +03:00
ikedam 3e38a509c5 [FIXED JENKINS-28227] Switch to Enblish locale in RunTest#getDurationString to test messages. 2015-05-05 11:51:55 +09:00
Oleg Nenashev 3bb39bbf1c Merge pull request #1591 from vb-linetco/patch-1
[FIXED JENKINS-27441] avoid IOOBE in getLog when called with 0
2015-05-04 15:56:02 +03:00
David Hoover 57255ccb10 Clean up some generics in ConsistentHash and add tests for non-defaults. 2015-04-19 14:48:04 -07:00
David Hoover aea48a9d7b Synchronize all appropriate methods in ConsistentHash.
Only add(T, int) was synchronized (and its javadoc claimed it was the
only one modifying .items), but all the bulk add methods were going
straight to addInternal() and then refreshTable() on their own. Then
countAllPoints() was iterating over items.values() which has undefined
behavior if the underlying Map changed.

Technically I didn't need to synchronize the current implementations of
remove(T) and add(T) since they delegated fully to add(T, int), but
that's leaking implementation details and inviting trouble down the road
when someone doesn't realize that.

Likewise, addInternal() and refreshTable() need not be synchronized
since they're only ever called from already synchronized methods, but
I'm inclined to go for belt & suspenders in the wake of these other
issues.
2015-04-19 14:39:01 -07:00
vb-linetco 75f58103d4 avoid IndexOutOfBoundsException when called with 0
return an empty list when called with maxLines = 0
added unit test for getLog(0) returning an empty list
2015-04-14 21:37:50 +02:00
David Hoover 2d452b6eb3 DefaultJnlpSlaveReceiver should return true when rejecting a takeover.
The contract for JnlpAgentReceiver in case of error on a claimed node is
to call handshake.error() but still return true so other handlers don't
take another crack a it.

Also added unit tests DefaultJnlpSlaveReceiver.
2015-04-14 09:21:30 -07:00
Oleg Nenashev 32dca8819c [JENKINS-10629] - Direct unit test for the issue
This test also introduces additional round-trip tests for small files
2015-04-14 18:59:38 +03:00
Richard Mortimer 7bb61a248e Merge fix for 'JENKINS-26777' 2015-03-30 13:17:38 +01:00
Stephen Connolly d9e4e36fde fix build 2015-03-28 00:05:22 +00:00
Stephen Connolly 86954de76e Merge branch 'wip-loadstats-refactor' 2015-03-27 10:14:25 +00:00
Richard Mortimer c2c9a3ef37 [FIXED JENKINS-26777] Build reports to be running for 45 yr and counting 2015-03-25 16:51:13 +00:00
Stephen Connolly b8a4a53245 Arg! cannot use Util.isOverridden as these are protected methods 2015-03-25 13:05:46 +00:00
Stephen Connolly 6b8af39b03 [FIXED JENKINS-21618] Ensure that the LoadStatistics return a self-consistent result.
The original method of computing load statistics would compute the total and idle counts independently
which could lead to counting errors while jobs started in between the different state counting operations.
This change switches to returning a `LoadStatisticsSnapshot` so that callers will get a single consistent
view of the counts which was valid for at least one point in time during the collection of the snapshot.
2015-03-25 11:56:11 +00:00
Kohsuke Kawaguchi dda70ee662 Merge remote-tracking branch 'security/security-rc' 2015-03-20 15:31:10 -07:00
Stephen Connolly 1cb69f8cc0 Move isRelativePath to Util and use from hudson.model.Slave's descriptor 2015-03-19 13:56:38 +00:00
Stephen Connolly 5de6f84eb7 Handle mostly-absolute paths on windows that use a drive letter
- of course drive mappings are user scoped and can change from user session to user session, so calling them absolute is a bit of a joke... none the less, for our purposes they are absolute enough
2015-03-18 12:01:26 +00:00
Jesse Glick 2c4cc77d33 Merge branch 'security' into security-rc
Conflicts:
	core/src/test/java/hudson/util/FormValidationTest.java
	test/src/test/java/hudson/model/UserTest.java
2015-03-16 18:16:09 -04:00
Oliver Gondža f880d8d2cd [SECURITY-171] test 2015-03-07 20:32:17 +01:00
Kohsuke Kawaguchi 03647c7ce4 merged back the RC branch 2015-02-28 12:53:13 -08:00
Jesse Glick f60bde00ab Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/PluginManager.java
	core/src/test/java/hudson/PluginManagerTest.java
2015-02-27 13:50:21 -05:00
James Nord b8c9841c30 [SECURITY-167] Plugin manager was also vulnerable.
Although the plugiun manager was vulnerable getting information
out of Jenkins was harder - however it would still be possible to
do bad things such as reading from /dev/zero on Linux
2015-02-27 18:18:23 +00:00
Jesse Glick db1f805d68 [FIXED JENKINS-26690] Integer overflow in AbstractLazyLoadRunMap.headMap with negative arguments. 2015-02-26 18:10:50 -05:00
Jesse Glick 7f51765a59 Merge branch 'security' into security-rc
Conflicts:
	test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
2015-02-07 11:37:16 -05:00
Jesse Glick 1bba1ac3c6 [SECURITY-162] Capture the root directory in VirtualFile.forFile and reject attempts to escape it. 2015-02-06 11:37:24 -05:00
Jesse Glick a001f71ded Merge pull request #6 from jenkinsci-cert/SECURITY-125
[SECURITY-125] Matrix project script security
2015-02-05 15:44:47 -05:00
Jesse Glick 10fbe7f1cb Miscellaneous updates in preparation for merge to trunk. 2015-02-05 10:29:05 -05:00
Jesse Glick 5c2ac6f50e Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/resources/hudson/model/Messages.properties
2015-02-05 08:54:50 -05:00