OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,548 Commits 55 Branches 1,942 Tags
19e1dd9944c2703abbf0d187b3f67817a6934143
Commit Graph
672 Commits
Author SHA1 Message Date
Jesse Glick 19e1dd9944 [FIXED JENKINS-27530] Jenkins.reload must also reload the Queue to ensure that every Queue.Item.task corresponds to a live Job, lest nextBuildNumber be bogus. 
(cherry picked from commit 12fd3e47e3)
 2016-07-20 15:42:52 +02:00
peppelan 15ce24ae4d [JENKINS-35198] - DelegatingComputerLauncher should accept child classes in its hooks (#2384) 
* JENKINS-35198 Add failing test for clear identification of the issue and future regression test

* JENKINS-35198 Fix DelegatingComputerLauncher logic for filtering out subclasses as possible delegates

this logic is by default, and subclasses can still allow the selection of other DelegatingComputerLauncher instances as delegates.
 2016-05-29 14:38:32 +04:00
Vincent Latombe 0c16c8576b [JENKINS-23507] Make FilePath.installIfNecessaryFrom follow redirects (#2331) 2016-05-13 12:36:45 +02:00
Jesse Glick c2d0a5778e Merge commit '97a0fa0d036b9d3873c9b269123020a42e7ee3e9' into security-master 2016-05-11 12:07:25 -04:00
Daniel Beck 240405dfc3 Merge pull request #2026 from pjdarton/fix_jenkins_15331 
[FIX JENKINS-15331] Windows file locking workaround
 2016-05-04 01:32:27 +02:00
Jesse Glick 888ca85784 Merge branch 'security-stable-1.651' into security-master 2016-04-28 17:38:40 -04:00
Jesse Glick c08e0bf79d Merge branch 'security-stable-1.642' into security-stable-1.651 2016-04-28 17:38:13 -04:00
Jesse Glick 11120802c1 Merge branch 'security-stable-1.625' into security-stable-1.642 2016-04-28 17:37:52 -04:00
Jesse Glick c88268d870 Merge branch 'security-stable-1.609' into security-stable-1.625 2016-04-28 17:36:42 -04:00
Daniel Beck 38f8b43e8d [SECURITY-276] Add more tests for relative URLs 2016-04-28 00:45:43 +02:00
Daniel Beck e6efae7d0d [SECURITY-276] Better method name, add tests 2016-04-27 13:51:10 +02:00
Craig Rodrigues 0a97623834 In testParse_with_XXE(), use more temporary variables 
This will help isolate the source of exceptions
thrown in this test.
 2016-04-13 11:49:40 -07:00
Daniel Beck 1fe9cf7b7a Merge branch '2.0' of github.com:jenkinsci/jenkins 2016-04-07 11:52:44 +02:00
Craig Rodrigues 0611d0788a Remove use of '<' and '>' which cause javadoc errors 
Tested with Java 8 and "mvn javadoc:test-javadoc".  Eliminates errors such as:

    [ERROR] java/hudson/os/DCOMSandbox.java:18: error: bad use of '>'
 2016-04-06 15:52:04 -07:00
Craig Rodrigues e0daa5c4e8 Fix href links 
Eliminates errors with Java 8 and "mvn javadoc:test-javadoc" such as:

    [ERROR] jenkins/core/src/test/java/hudson/os/DCOMSandbox.java:18: error: bad use of '>'
 2016-04-06 15:52:04 -07:00
Daniel Beck d182cdf223 Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0 2016-04-06 19:18:44 +02:00
Baptiste Mathus 2c9adc9965 Merge pull request #2221 from rodrigc/java8_fix1 
Do not use '_' as an identifier
 2016-04-06 15:39:40 +02:00
Craig Rodrigues 552d8a6b95 Fix href tags 
Eliminates errors with Java 8 and "mvn javadoc:test-javadoc" such as:

    [ERROR] jenkins/core/src/test/java/hudson/model/ItemsTest.java:12: error: unknown attribute: hef
    [ERROR] * @author: <a hef="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
 2016-04-05 12:35:30 -07:00
Craig Rodrigues 84fa59a87c Do not use '_' as an identifier 
Eliminates Java 8 warnings:
  (use of '_' as an identifier might not be supported in releases after Java SE 8)
 2016-04-05 11:03:08 -07:00
Emilio Escobar f6db6670a8 [JENKINS-28790] Baptiste comments fixed 
(cherry picked from commit 7fb1ac9d9f)
 2016-03-30 11:58:21 +02:00
Emilio Escobar 0782aa567b [JENKINS-28790] solved the issue masked parameters not masked in windows system. toWindowsCommand joins all args in one, missing masked. 
(cherry picked from commit b9a72bcd96)
 2016-03-30 11:58:21 +02:00
Daniel Beck 869f66cc07 Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0 
Conflicts:
	changelog.html
	cli/pom.xml
	core/pom.xml
	core/src/main/java/hudson/ProxyConfiguration.java
	core/src/main/java/jenkins/model/Jenkins.java
	core/src/main/java/jenkins/slaves/JnlpSlaveHandshake.java
	core/src/main/resources/hudson/model/Messages_da.properties
	pom.xml
	test/pom.xml
	war/pom.xml
 2016-03-16 19:00:40 +01:00
Oliver Gondža 8ba59197e4 Merge pull request #2049 from pjanouse/JENKINS-33037 
[FIXED JENKINS-33037] Fixed malformed ranges in RangeSet.fromString()
 2016-03-16 13:26:17 +01:00
Ing. Pavel Janousek c1621a2bd0 [JENKINS-33037] Fixed malformed ranges in RangeSet.fromString() 
Fix for rejecting malformed ranges in
hudson.model.Fingerprint.RangeSet.fromString(...)
 2016-03-10 16:35:58 +01:00
Stephen Connolly f68f5fb24f [FIXED JENKINS-33414] Added an API to allow identification of the Jenkins JVM 
- Fix the ProxyConfiguration code to not require Jenkins class to be loaded in remote JVMs
 2016-03-08 23:05:00 +00:00
Daniel Beck 074890c093 Merge pull request #2015 from escoem/JENKINS-28790 
[FIX JENKINS-28790] Masked parameters are now hidden on Windows
 2016-03-08 16:28:17 +01:00
Sam Van Oort e136952d2a Remove remainder of ConcurrentHashMap testcase 2016-03-02 10:53:03 -05:00
Jesse Glick 383a5aec51 [FIXED JENKINS-22767] Make sure only one thread actually loads a given build. 
(cherry picked from commit d5167025a2)
 2016-03-02 08:55:48 +01:00
Sam Van Oort f3a9dd5bb0 Remove broken XStream2 test of legacy custom ConcurrentHashMapSerialiation 
This one requires some explanation: there is a bug
As custom serialization of ConcurrentHashMaps was removed circa 2010
(see eb51d46d56)

We can assume that testing conversion is no longer a high priority.
Root cause appears to be a subtle change in the XStream attribute access behavior when run under JDK8 only.
This appears to be the only case that triggers it.
 2016-02-29 14:36:39 -05:00
Daniel Beck 3624f70169 Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0 
Conflicts:
	cli/pom.xml
	core/pom.xml
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/cli/CreateNodeCommandTest.java
	test/src/test/java/hudson/cli/DeleteNodeCommandTest.java
	test/src/test/java/hudson/cli/GetNodeCommandTest.java
	test/src/test/java/hudson/cli/OnlineNodeCommandTest.java
	test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
	war/pom.xml
 2016-02-22 13:22:37 +01:00
Peter Darton f1e16504e9 ...and another missing import (same reason). 2016-02-12 16:57:01 +00:00
Peter Darton 4a6e998360 Fix missing import (caused by failed merge.) 2016-02-12 16:52:02 +00:00
Peter Darton 310c674762 FIXED JENKINS-15331 by changing Util.deleteContentsRecursive, Util.deleteFile and Util.deleteRecursive so that they can retry failed deletions. 
The number of deletion attempts and the time it waits between deletes are configurable via system properties (like hudson.Util.noSymlink etc).
Util.DELETION_MAX is set by -Dhudson.Util.deletionMax.  Default is 3 attempts.
Util.WAIT_BETWEEN_DELETION_RETRIES is set by -Dhudson.Util.deletionRetryWait.  Defaults is 100 milliseconds.
Util.GC_AFTER_FAILED_DELETE is set by -Dhudson.Util.performGCOnFailedDelete.  Default is false.

Added unit-tests for new functionality.
 2016-02-12 16:22:35 +00:00
Ing. Pavel Janousek d5725e6d18 [JENKINS-32273] Unified an issue handling in CLI 
Re-factored all existed CLI code to follow the new proposed scheme for
raising an exception if issue occurs, handling and reporting it.
Unified CLIRegisterer as well.
Fixed unit tests to follow the new scheme.
 2016-02-12 16:25:20 +01:00
Emilio Escobar 7fb1ac9d9f [JENKINS-28790] Baptiste comments fixed 2016-02-08 11:02:54 -06:00
Emilio Escobar b9a72bcd96 [JENKINS-28790] solved the issue masked parameters not masked in windows system. toWindowsCommand joins all args in one, missing masked. 2016-02-05 15:35:18 +01:00
Daniel Beck 9cab873461 Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0 
Conflicts:
	cli/pom.xml
	core/pom.xml
	plugins/pom.xml
	pom.xml
	test/pom.xml
	war/pom.xml
 2016-01-26 15:49:33 +01:00
tfennelly 60b9e7e30b Setting XMLUtil DocumentBuilderFactory features to try close XXE vulnerabilities 2016-01-20 18:05:57 +00:00
tfennelly 036a8e94ed [FIX JENKINS-9598] Add plugin selection wizard on first launch 
Also ... unbundling of plugins from Jenkins core.
 2016-01-20 10:54:32 +00:00
Jesse Glick d5167025a2 [FIXED JENKINS-22767] Make sure only one thread actually loads a given build. 2016-01-18 21:47:19 -05:00
Jesse Glick e61621c5b6 Skip the test if the tar or unzip commands are not available. 
https://ci.jenkins-ci.org/job/jenkins_main_trunk/4400/testReport/junit/hudson.util.io/TarArchiverTest/permission/
 2016-01-08 12:59:22 -05:00
Jesse Glick a5f871d8a1 Merge branch 'master' into security-master 2015-11-10 14:23:54 -05:00
Christopher Simons 7efb9090dd remove unused import statements 
In addition to cluttering the namespace, unused imports generate
compiler warnings, introducing noise and obscuring more important
compiler warnings.  This change removes them.
 2015-11-10 10:13:52 -05:00
Jesse Glick 8fafe3ff86 Merge branch 'security-stable-1.625' into security-master 2015-11-05 17:03:30 -05:00
Jesse Glick d0d728981a Merge branch 'security-stable-1.609' into security-stable-1.625 2015-11-04 18:20:43 -05:00
Valentina Armenise 6d15072f04 [security-184] solve NPE in testHandleTakeover 2015-11-03 20:08:14 +01:00
Valentina Armenise 223c301dce [security-184] solve NPE in test 2015-11-03 17:04:03 +01:00
Wilfred Hughes 707d4ba135 JENKINS-31217 Treat null as a default JDK name. 2015-11-02 10:18:18 +00:00
Kanstantsin Shautsou fff2e27537 Remove hardcode in tar test 
(cherry picked from commit bfa6d8be0c)
 2015-10-28 18:32:48 +01:00
Kanstantsin Shautsou fd1e392fd4 [FIXED JENKINS-10629] Unbroke stream with new tar implementation. 
Causes bytes lost and truncated tar archive.
TarBuffer not used in TarArchiveOutputStream.

(cherry picked from commit 3e187a0264)
 2015-10-28 18:32:31 +01:00