Commit Graph
2423 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 9e36cc731a [maven-release-plugin] prepare for next development iteration 2015-03-16 19:14:02 -07:00
Kohsuke Kawaguchi 097a7c5ff4 [maven-release-plugin] prepare release jenkins-1.605 2015-03-16 19:14:02 -07:00
tfennelly 7e5063937c Merge branch 'master' into JENKINS-27256
* master:
  Updated changelog
  updated changelog as a part of the release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.604
  Noting #1597
  Noting #1593, #1579, move JENKINS-22346, #1558
  Remove two fixes that were backported to RC
  JENKINS-27183 Avoid deadlock when using build-monitor-plugin
2015-03-16 17:30:50 +00:00
Kohsuke Kawaguchi 2657689081 [maven-release-plugin] prepare for next development iteration 2015-03-15 10:32:26 -07:00
Kohsuke Kawaguchi 0ed1fb97ba [maven-release-plugin] prepare release jenkins-1.604 2015-03-15 10:32:26 -07:00
tfennelly ad9d191cbc [FIXED JENKINS-27256] Added functional test for stapler fix to handle dispatcher methods for getX(long) model methods 2015-03-12 19:15:48 +00:00
Kohsuke Kawaguchi e9bf4b71cd the trunk is toward 1.604-SNAPSHOT 2015-03-08 12:42:02 -07:00
Kohsuke Kawaguchi 2983905e45 the trunk is toward 1.603-SNAPSHOT 2015-03-04 06:30:25 -08:00
Jesse Glick 87ab95e7fc Merge branch 'master' of git://github.com/jenkinsci/jenkins 2015-03-02 18:54:06 -05:00
Jesse Glick e559f39697 [JENKINS-27188] Picking a better test location for #1590. 2015-03-02 18:51:55 -05:00
Johno Crawford a624f373c5 Return copy of EnvVars to prevent outside modification. 2015-03-02 21:22:32 +00:00
Oliver Gondža a87a5a1a5c More robust unit test 2015-03-02 19:05:51 +01:00
Kohsuke Kawaguchi 8d9329e57c the trunk is toward 1.602-SNAPSHOT 2015-03-01 11:19:22 -08:00
Kohsuke Kawaguchi 03647c7ce4 merged back the RC branch 2015-02-28 12:53:13 -08:00
Kohsuke Kawaguchi 083ea50125 [maven-release-plugin] prepare for next development iteration 2015-02-28 09:23:17 -08:00
Kohsuke Kawaguchi 1d096c265d [maven-release-plugin] prepare release jenkins-1.600 2015-02-28 09:23:17 -08:00
Kohsuke Kawaguchi f83e9aef6d Merge branch 'security' into security-rc
Conflicts:
	test/src/test/java/hudson/model/UpdateCenter2Test.java
2015-02-28 08:25:09 -08:00
Kohsuke Kawaguchi 25411a0bed Fixed a test failure
With the server-side download, the test needs to induce the update
center metadata retrieval in a separate manner.
2015-02-27 15:35:13 -08:00
Jesse Glick 8f84890923 Merge branch 'rc' into security-rc 2015-02-27 13:48:15 -05:00
Jesse Glick c8abbfc972 Merge pull request #1572 from ikedam/feature/JENKINS-4409_DisableURLConnectionCache
[JENKINS-4409] Disable URLConnection.useCache in tests on Windows
2015-02-23 12:06:26 -05:00
Jesse Glick 0d8ebb17c2 [JENKINS-25779] Fix an NPE when ArtifactArchiver.setAllowEmptyArchive is not explicitly called. 2015-02-22 16:26:23 -05:00
tfennelly 89681c2029 Mapping of Queue.Item.id onto Run instance
Allowing correlation/tracking all the way through the lifecycle
2015-02-20 10:32:42 +00:00
Kohsuke Kawaguchi 419d670cd0 the trunk is toward 1.601-SNAPSHOT 2015-02-16 17:18:15 -08:00
ikedam c4e5fbdbc9 [FIXED JENKINS-4409] Disable URLConnection.useCache in tests on Windows. It prevents deleting temporary directories when tests finish. 2015-02-14 15:10:03 +09:00
Oliver Gondža fae41b01c9 [JENKINS-26684] Reproduce in unittest. 2015-02-08 14:26:13 +01: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 be06d6c4b8 Merge pull request #11 from jenkinsci-cert/SECURITY-162
[SECURITY-162] Forbid symlink attacks from artifact archiving
2015-02-07 11:25:08 -05:00
Jesse Glick 35b97d451c Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/model/Api.java
	test/src/test/java/hudson/model/ApiTest.java
2015-02-06 17:31:49 -05:00
Robert Sandell 1887656c11 Merge pull request #9 from jenkinsci-cert/SECURITY-165
[SECURITY-165] blacklist the document xpath function for use in Api
2015-02-06 18:18:30 +01: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
Robert Sandell 1629a93fbc Tidy up
Review comments fixed:
 Added license header
 Reformat the issue comment
 Restricted NoExternalUse
 toLowerCase in English locale
 lesser resolution of declared exception from the test
2015-02-06 10:34:41 +01:00
Jesse Glick 57d2b5382b Merge pull request #8 from jenkinsci-cert/testConfigureDownstreamProjectSecurity-RandomlyFails
@RandomlyFails
2015-02-05 21:27:55 -05:00
Jesse Glick b237a41af4 Also checking DirectoryBrowserSupport behavior, as in DirectoryBrowserSupportTest. 2015-02-05 18:42:54 -05:00
Jesse Glick b72246edb1 outsideSymlinks 2015-02-05 18:30:16 -05:00
Jesse Glick 0b96005f60 Merge branch 'security' into security-rc 2015-02-05 17:47:47 -05:00
Ryan Campbell 3e40c6fa00 Merge pull request #10 from jenkinsci-cert/SECURITY-166
[SECURITY-166] Make UI tests work across Jenkins versions
2015-02-05 16:39:50 -06:00
Jesse Glick 6ad8cbfc3a Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/ClassicPluginStrategy.java
	core/src/main/java/hudson/cli/AddJobToViewCommand.java
	core/src/main/java/hudson/model/Run.java
	core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
	core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
	core/src/main/java/jenkins/model/IdStrategyDescriptor.java
	core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
	core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
	core/src/main/resources/hudson/model/FileParameterValue/value_pt_BR.properties
	core/src/main/resources/hudson/model/Job/index.jelly
	core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
	core/src/main/resources/hudson/node_monitors/Messages_cs.properties
	core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
	core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
	core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
	core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
	core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
	core/src/main/resources/jenkins/model/IdStrategy/config.jelly
	core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
	core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
	core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
	core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
	core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
	core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
	core/src/main/resources/jenkins/triggers/Messages_fr.properties
	core/src/main/resources/lib/form/class-entry.jelly
	core/src/main/resources/lib/form/helpLink_pt_BR.properties
	core/src/main/resources/lib/form/link.jelly
	core/src/main/resources/lib/hudson/project/configurable.properties
	core/src/main/resources/lib/hudson/project/configurable_bg.properties
	core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
	core/src/main/resources/lib/hudson/project/configurable_eu.properties
	core/src/main/resources/lib/hudson/project/configurable_gl.properties
	core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
	core/src/main/resources/lib/hudson/project/configurable_nl.properties
	core/src/main/resources/lib/hudson/project/configurable_tr.properties
	core/src/main/resources/lib/hudson/project/console-link.jelly
	core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
	core/src/main/resources/lib/layout/pane_de.properties
	core/src/main/resources/lib/layout/pane_pt.properties
	core/src/main/resources/lib/layout/pane_pt_BR.properties
	core/src/main/resources/lib/layout/task_pt.properties
	core/src/test/java/hudson/util/XStream2Test.java
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/model/AbstractItemSecurityTest.java
	test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
	war/src/main/webapp/scripts/msie.js
2015-02-05 16:35:57 -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
Oliver Gondža c0bda98396 Refactor ProjectTest#testGetRelationship 2015-02-05 21:32:44 +01:00
Oliver Gondža cb5845db29 Fix ProjectTest#testGetRelationship for Windows 2015-02-05 21:19:04 +01:00
Oliver Gondža 07ecd9e1bf Broken .bat script in LauncherTest#overwriteSystemEnvVars 2015-02-05 21:19:04 +01:00
Ryan Campbell 29f59e42ae [SECURITY-166] Make UI tests work across Jenkins versions 2015-02-05 13:45:33 -06:00
Robert Sandell de4414cbf3 [SECURITY-165] blacklist the document xpath function for use in Api 2015-02-05 20:37:57 +01:00
James Nord 5564a62eb6 Merge pull request #7 from jenkinsci-cert/SECURITY-167_2
[SECURITY-167] Followup tweaks to address review comments.
2015-02-05 16:19:14 +00:00
Jesse Glick 10fbe7f1cb Miscellaneous updates in preparation for merge to trunk. 2015-02-05 10:29:05 -05:00
Jesse Glick dff4beb641 @RandomlyFails 2015-02-05 10:09:08 -05:00
Ryan Campbell 1338e661aa Merge pull request #5 from jenkinsci-cert/SECURITY-166
Fixes for SECURITY-166
2015-02-05 08:44:51 -06:00
James Nord 1786daa514 [SECURITY-167] Followup tweaks to address review comments.
Addresses some comments received after the original fix was merged.
2015-02-05 14:36:29 +00:00
Jesse Glick 1d9e1d473a Merge branch 'security' into security-rc 2015-02-05 09:07:08 -05:00
Jesse Glick 76ff1034a9 Avoid duplicate class conflict with core/src/test/java/hudson/model/AbstractItemTest.java. 2015-02-05 09:05:06 -05:00