OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-13 20:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,465 Commits 60 Branches 1,942 Tags
5ecbb09ef4eb30a695f88aeabbdc0d6c4d3c19a1
Commit Graph
3095 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi fb55a3a556 [maven-release-plugin] prepare for next development iteration 2016-03-10 21:29:09 -08:00
Kohsuke Kawaguchi 4226d13030 [maven-release-plugin] prepare release jenkins-2.0-alpha-3 2016-03-10 21:29:09 -08:00
Kohsuke Kawaguchi 54d1cf11c9 Merge pull request #2034 from daspilker/2.0-JENKINS-21249 
[JENKINS-21249] Update Groovy to 2.4.6
 2016-03-10 19:01:39 -08:00
Daniel Beck cd6c00f9ed Merge tag 'jenkins-1.652' of github.com:jenkinsci/jenkins into 2.0 
[maven-release-plugin] copy for tag jenkins-1.652

Conflicts:
	cli/pom.xml
	core/pom.xml
	core/src/main/resources/lib/form/checkbox.jelly
	pom.xml
	test/pom.xml
	war/pom.xml
 2016-03-09 21:42:42 +01:00
Kohsuke Kawaguchi 12a290c44a [maven-release-plugin] prepare release jenkins-1.652 2016-03-06 19:28:51 -08:00
kzantow 5368c96404 JENKINS-30749 - make Jenkins secure out of the box: 
* create initial admin user with difficult password (based on UUID)
* force login with password as security token
* force initial admin user creation
 2016-03-05 18:51:02 -05:00
Jesse Glick 239b7f521e Merge pull request #2083 from jtnord/bad-enforcer 
Excluded jenkins-war from the test harness.
 2016-03-04 19:02:15 -05:00
Kohsuke Kawaguchi 920f20fd06 Fixing a test 
Previously, when the 2nd `e.click()` is called, the page has already transitioned to another page, so the anchor objects have become invalid.

HtmlUnit somehow still manages to follow a link, except when there's some JavaScript attached to the onclick() handler it's going to execute in a strange environment. Some management link requires a POST, and that was done via JavaScript. So that broke the test.
 2016-03-04 13:11:53 -08:00
James Nord 06d936f695 Excluded war from test from the test harness. 
Whilst this is not used in the dependencies, the enforcer plugin downloads
the i1.580.1 jar so it can scan it.  Most likely a bug in the
extra-enforcer-rules but we obviously don;t need it as we have an explicit
dependency on the latest version!
 2016-03-04 16:16:35 +00:00
Jesse Glick f187d706e5 [JENKINS-27152] Merging #2066. 2016-03-03 21:26:20 -05:00
Kohsuke Kawaguchi 08a8f14722 Merge pull request #2063 from jenkinsci/JENKINS-23378 
[FIXED JENKINS-23378] Servlet 3.1
 2016-02-29 08:56:57 -08:00
Kohsuke Kawaguchi 0a866f5727 [maven-release-plugin] prepare for next development iteration 2016-02-28 21:51:15 -08:00
Kohsuke Kawaguchi 2d83d39ce5 [maven-release-plugin] prepare release jenkins-1.651 2016-02-28 21:51:14 -08:00
Kohsuke Kawaguchi 96b2b2a889 Picked up the test harness fix from the master branch 
Conflicts:
	test/pom.xml
 2016-02-27 08:15:07 -08:00
Kohsuke Kawaguchi efffc58a5f Fixing POM version in preparation of merge 2016-02-27 08:14:48 -08:00
Kohsuke Kawaguchi de8b391cc9 Jetty 9.2 changes in test harness 2016-02-26 13:33:08 -08:00
Jesse Glick 307bfc1738 [JENKINS-27152] Introduce common API WorkspaceList.tempDir. 2016-02-26 15:52:58 -05:00
Kohsuke Kawaguchi 26b9a84ba1 [maven-release-plugin] prepare for next development iteration 2016-02-25 12:25:49 -08:00
Kohsuke Kawaguchi a94ad033fc [maven-release-plugin] prepare release jenkins-2.0-alpha-2 2016-02-25 12:25:49 -08:00
Jesse Glick 9f475452eb Reverting merge of #1301 as well as mistaken follow-up 1e804fdf27. 
The root problem was missing <scope>test</scope> in domain-discovery.
 2016-02-25 11:44:08 -05:00
Kohsuke Kawaguchi 1e804fdf27 Looks like an interesting form of a merge conflict. 2016-02-24 13:33:58 -08:00
Kohsuke Kawaguchi f445f3e13c [maven-release-plugin] prepare for next development iteration 2016-02-24 10:28:02 -08:00
Kohsuke Kawaguchi c091d38625 [maven-release-plugin] prepare release jenkins-1.650 2016-02-24 10:28:01 -08:00
Kohsuke Kawaguchi d1b1b82a28 Merge remote-tracking branch 'security/security-master' 2016-02-24 09:23:02 -08:00
Kohsuke Kawaguchi 823f9bae71 [maven-release-plugin] prepare for next development iteration 2016-02-23 09:25:25 -08:00
Kohsuke Kawaguchi 2ee4ccc8ef [maven-release-plugin] prepare release jenkins-2.0-alpha-1 2016-02-23 09:25:24 -08: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
Kohsuke Kawaguchi d7f35274d8 [maven-release-plugin] prepare for next development iteration 2016-02-21 12:16:13 -08:00
Kohsuke Kawaguchi f5db2b933e [maven-release-plugin] prepare release jenkins-1.649 2016-02-21 12:16:12 -08:00
Oliver Gondža fe41dc89ab Merge pull request #1997 from pjanouse/JENKINS-32273 
[JENKINS-32273] Unified an issue handling in CLI
 2016-02-19 15:53:15 +01:00
Kohsuke Kawaguchi adfeaba43c [maven-release-plugin] prepare for next development iteration 2016-02-17 16:38:48 -08:00
Kohsuke Kawaguchi e7428a4355 [maven-release-plugin] prepare release jenkins-1.648 2016-02-17 16:38:47 -08:00
Andrew Bayer 32d65cc678 test pom.xml: Bump Surefire -Xmx 
I'm seeing some GC overhead limit errors - more memory should solve that.
 2016-02-16 12:02:40 -08:00
Daniel Spilker ae2fe03591 updated Groovy to 2.4.5 
* the transitive Groovy dependencies jline and jansi had to be updated
* use gmaven-runtime-2.0
 2016-02-16 20:42:55 +01:00
Kohsuke Kawaguchi f40f9bbbad Merge remote-tracking branch 'origin/pr/2007' into 2.0 2016-02-13 11:59:59 -06: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
Jesse Glick 2711f2bc16 Merge branch 'master' into security-master 2016-02-11 11:31:53 -05:00
Oliver Gondža 731c86ea3c Better defect localization 2016-02-11 11:37:15 +01:00
Jesse Glick 67e4b9fb60 Merge branch 'security-stable-1.642' into security-master 2016-02-10 19:15:45 -05:00
Jesse Glick f4c22155d2 Merge branch 'security-stable-1.625' into security-stable-1.642 2016-02-10 19:13:21 -05:00
Jesse Glick 1211ff9276 Merge branch 'security-stable-1.609' into security-stable-1.625 2016-02-10 19:08:09 -05:00
Jesse Glick 0a1e46570d Merge pull request #61 from jenkinsci-cert/SECURITY-232 
[SECURITY-232] Integrating Remoting build with blacklist
 2016-02-10 18:05:11 -06:00
Kohsuke Kawaguchi 5afddb1ab5 Merge branch 'master' of github.com:jenkinsci/jenkins 2016-02-04 07:55:19 -08:00
Stephen Connolly 95043db718 Merge pull request #1991 from andresrc/JENKINS-32517 
[JENKINS-32517] Deprecate Queue#getApproximateItemsQuickly
 2016-02-04 15:08:52 +00:00
Daniel Beck aa8b855af3 [SECURITY-247] Added doCreateItem test, improved loading test 2016-02-04 00:33:13 +01:00
Jesse Glick 1ec232ca1c [FIXED SECURITY-232] Integrating Remoting build with blacklist. 2016-02-03 17:40:36 -05:00
Daniel Beck 18cc8e0eb7 [FIX SECURITY-247] Prevent loading of MethodClosure from XML 2016-02-03 23:25:29 +01:00
Jesse Glick ef8ea8c669 [FIXED JENKINS-24696] Cannot assume that Jenkins.getInstance() != null when we are running a boot failure script. 
(cherry picked from commit 42de07bba6)
 2016-02-03 19:21:57 +01:00
Jesse Glick 501d7fbbb1 Converting BootFailureTest from Groovy to Java. 
(cherry picked from commit 09722a982f)
 2016-02-03 19:21:57 +01:00
Kohsuke Kawaguchi 279027e40f [maven-release-plugin] prepare for next development iteration 2016-02-03 08:00:40 -08:00