Commit Graph
16888 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi dd099cf403 merged back the RC branch
Conflicts:
	maven-plugin/pom.xml
	plugins/pom.xml
	ui-samples-plugin/pom.xml
2013-10-07 10:28:11 -07:00
Kohsuke Kawaguchi 5e6c33e304 updated changelog as a part of the release 2013-10-07 09:06:22 -07:00
Jesse Glick ed03fbbc9d Revert "[FIXED JENKINS-18629]"
This reverts commit d15c15506e.
2013-10-07 11:18:36 -04:00
Kohsuke Kawaguchi d15c15506e [FIXED JENKINS-18629]
Consult Descriptor.newInstance() even when proccessing is in the middle
of JSON tree.
2013-10-07 08:10:42 -07:00
Kohsuke Kawaguchi 1e1ca08f12 updated changelog for release 2013-10-07 08:01:43 -07:00
Kohsuke Kawaguchi 0fef710c7b [maven-release-plugin] prepare for next development iteration 2013-10-07 07:52:13 -07:00
Kohsuke Kawaguchi d7002b0890 [maven-release-plugin] prepare release jenkins-1.534 jenkins-1.534 2013-10-07 07:52:13 -07:00
Oliver Gondža b533f77065 Amend #616 2013-10-07 11:26:24 +02:00
Oliver Gondža 04359e07a3 Merge pull request #616 from lvotypko/expand-all 2013-10-07 09:27:39 +02:00
Kohsuke Kawaguchi b19f4650d7 [FIXED JENKINS-18366] Winstone is now powered by Jetty 2013-10-06 11:27:00 -07:00
Harald Albers 982d939f66 German localization for "Disable remember me" option 2013-10-06 12:54:36 +02:00
Jesse Glick b9437154d8 ClassicPluginStrategy.DETACHED_LIST could confuse ClassicPluginStrategyTest by injecting dependencies on split plugins that have an index.jelly. 2013-10-04 18:19:49 -04:00
Jesse Glick 4613b15cc4 Split out ui-samples-plugin into its own repo. 2013-10-04 17:32:19 -04:00
Jesse Glick 89149277ae matrix-auth 1.0.2 (couple of fixups) 2013-10-04 17:06:28 -04:00
Jesse Glick b0ac41c3b1 Split off matrix-auth plugin. 2013-10-04 16:27:15 -04:00
Jesse Glick c01f2564eb Removing test dep on ui-samples.
Superfluous in that if you *want* to look at UI samples, you can just install that plugin.
And observed to cause a cyclic plugin dependency error when splitting matrix-auth from core.
(Unclear why ui-samples had a dependency on matrix-auth; perhaps related to dependency from test module.)
2013-10-04 16:24:13 -04:00
Jesse Glick 071139f8e5 Merge branch 'master' of github.com:jenkinsci/jenkins 2013-10-04 14:59:01 -04:00
Jesse Glick 7b38b7c5e9 Merge pull request #967 from akiellor/fix-local-build-issues
Fix `mvn -Plight-test install` on Ubuntu 13.04 with OpenJDK
2013-10-04 11:48:27 -07:00
Jesse Glick f1205fa4d6 Copy basic Surefire configuration, esp. forkCount=2, to the plugin POM.
Shaves >11min off the test time for maven-plugin on my machine!
2013-10-04 14:37:27 -04:00
Andrew Kiellor 47c90210e3 Remove unused import. 2013-10-04 13:51:44 -04:00
Jesse Glick 261f40533e Moving one test case to maven-plugin. 2013-10-04 13:43:48 -04:00
Andrew Kiellor ff71ab755c Migrated some usages of GNUCLibrary to the jnr PosixAPI, fixed 'mvn -Plight-test install' on ubuntu with OpenJDK. 2013-10-04 13:42:42 -04:00
Jesse Glick facfc178df Moving hudson.maven tests to maven-plugin. 2013-10-04 12:50:28 -04:00
Jesse Glick 8deb42bf89 [JENKINS-19473] Removing workaround since root bug should be fixed in jzlib 1.1.3. 2013-10-04 11:16:55 -04:00
Kohsuke Kawaguchi f98070d3e6 maven plugin is moved off to a separate repository.
See https://github.com/jenkinsci/maven-plugin
2013-10-03 22:35:14 -07:00
Jesse Glick 7ca07b5d4b [JENKINS-16332] Further diagnostics. Note that you must enable a hudson.model.User logger at FINE or below to use. 2013-10-03 12:32:04 -04:00
Jesse Glick 1c68183ae8 [FIXED JENKINS-19307] Noting merge of pull #937. 2013-10-03 10:34:34 -04:00
Jesse Glick b86d9e94d4 Merge branch 'JENKINS-19486_Polling_with_workspace_gets_incorrect_environment' of https://github.com/Vlatombe/jenkins into Vlatombe-JENKINS-19486_Polling_with_workspace_gets_incorrect_environment 2013-10-03 10:27:07 -04:00
Vojtěch Juránek 5c25cb6a1b Merge pull request #964 from edenrox/master
[FIXED JENKINS-10675] use X-Forwarded-Proto if present
2013-10-02 14:11:33 -07:00
CloudBees DEV@Cloud 2b9347a002 Merge commit '07720988a99eff3c0432e10caef5d4beda4c4ef4' 2013-10-02 20:14:20 +00:00
Jesse Glick 07720988a9 Refer to permissions now defined in Item by that name, not via AbstractProject or Job. 2013-10-02 16:13:01 -04:00
Oliver Gondža 33d1ac6782 [JENKINS-19803] Update changelog after #959 2013-10-02 21:22:39 +02:00
Oliver Gondža 3f9402d956 Merge pull request #959 from sghill/JENKINS-19803 2013-10-02 21:15:59 +02:00
Jesse Glick 6c886e7b02 [FIXED JENKINS-19447] [FIXED JENKINS-8957] Noting changes in pull #946. 2013-10-02 13:36:31 -04:00
Jesse Glick 9ec37cc08a Merge branch 'JENKINS-8957' of https://github.com/cowwoc/jenkins into cowwoc-JENKINS-8957 2013-10-02 13:33:43 -04:00
Ian Hopkins ddfa65fae6 [FIXED JENKINS-10675] use X-Forwarded-Proto if present 2013-10-02 11:28:24 -04:00
Jesse Glick ea85489a0a Fixing JenkinsRule as HudsonTestCase was for optional dependencies in e11c01c.
(Implies reverting c4e3add as well, since we need resolvePluginFile to return null.)
2013-10-01 17:09:15 -04:00
Jesse Glick 64aa0b0c01 @since 2013-10-01 15:50:35 -04:00
Nicolas De Loof 6450647d64 [FIXED JENKINS-19821] recognize UNC path as absolute 2013-10-01 12:19:48 +02:00
sghill b16b203293 Merge remote-tracking branch 'upstream/master' into JENKINS-19803 2013-10-01 00:37:17 -04:00
Vojtěch Juránek 67be8def39 Merge pull request #958 from lvotypko/userTest
Better wait until build is finshed and remove existing CauseAction.
2013-09-29 23:43:56 -07:00
Kohsuke Kawaguchi 7c493eb35f the trunk is toward 1.535-SNAPSHOT 2013-09-29 18:09:41 -07:00
Kohsuke Kawaguchi 587738dfea creating an RC branch 2013-09-29 18:09:30 -07:00
Kohsuke Kawaguchi 8e2bda4ac6 merged back the RC branch 2013-09-29 15:54:51 -07:00
Kohsuke Kawaguchi f491e9c5de updated changelog as a part of the release 2013-09-29 15:54:47 -07:00
Kohsuke Kawaguchi d212af6681 updated changelog for release 2013-09-29 15:07:18 -07:00
Kohsuke Kawaguchi c79d929496 [maven-release-plugin] prepare for next development iteration 2013-09-29 14:57:35 -07:00
Kohsuke Kawaguchi 95f0992989 [maven-release-plugin] prepare release jenkins-1.533 jenkins-1.533 2013-09-29 14:57:34 -07:00
Jesse Glick 6b6a69ec0d [FIXED JENKINS-19251] Use hashes rather than modification time to determine if Maven agent JARs are up to date. 2013-09-29 13:08:21 -07:00
sghill 16f3f4b93f Merge remote-tracking branch 'upstream/master' into JENKINS-19803 2013-09-29 15:26:57 -04:00