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
32,590 Commits 55 Branches 1,942 Tags
1e646ff7ee52ecbbca3d7957b65fb4edfd39d653
Commit Graph
32590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kohsuke Kawaguchi 6bb6436c55 [maven-release-plugin] prepare for next development iteration 2018-02-12 20:11:59 -08:00
Kohsuke Kawaguchi 4f68a6d353 [maven-release-plugin] prepare for next development iteration 2018-02-12 18:33:32 -08:00
Kohsuke Kawaguchi 0b47ade854 [maven-release-plugin] prepare release jenkins-2.89.4 jenkins-2.89.4 2018-02-12 18:33:31 -08:00
Daniel Beck 0284950913 Merge commit 'f8a2309b0260df89a03a91ccf976e6be999c1c02' into security-master 2018-02-12 14:48:42 +01:00
Daniel Beck f7b2687c84 Merge commit 'f8a2309b0260df89a03a91ccf976e6be999c1c02' of git://github.com/jenkinsci/jenkins 2018-02-12 14:47:44 +01:00
Jan Vansteenkiste 01ed9c9389 JENKINS-49496: Fix poorly translated sign-up string (dutch) 2018-02-12 08:44:59 +01:00
Kohsuke Kawaguchi f8a2309b02 [maven-release-plugin] prepare for next development iteration 2018-02-11 19:18:51 -08:00
Kohsuke Kawaguchi f6efa29041 [maven-release-plugin] prepare release jenkins-2.106 jenkins-2.106 2018-02-11 19:18:51 -08:00
Oleg Nenashev 041f9010ab Merge pull request #3278 from oleg-nenashev/sshd/1.7.0 
Updated SSHD Module to 2.4 to bundle SSHD Core 1.7.0
 2018-02-10 12:45:41 +01:00
Jesse Glick 864a93fe89 Merge branch 'security-stable-2.89' into security-master 2018-02-09 11:27:37 -05:00
Jesse Glick 60afa21e65 Merge branch 'security-stable-2.73' into security-stable-2.89 2018-02-09 11:27:22 -05:00
Jesse Glick 2817d237c2 Merge branch 'security-stable-2.60' into security-stable-2.73 2018-02-09 11:27:05 -05:00
Jesse Glick 19b71d8d29 Merge branch 'security-stable-2.46' into security-stable-2.60 2018-02-09 11:26:46 -05:00
Jesse Glick 9de6291580 [SECURITY-705] Additional precautions. 2018-02-09 11:25:42 -05:00
Jesse Glick cc398b7c52 Merge branch 'security-stable-2.89' into security-master 2018-02-08 15:42:47 +01:00
Jesse Glick d8bc3dc358 Merge branch 'stable-2.89' 2018-02-08 15:41:48 +01:00
Jesse Glick d69cf66948 Merge branch 'security-stable-2.73' into security-stable-2.89 2018-02-08 15:41:25 +01:00
Jesse Glick 65f66f99d9 Merge branch 'stable-2.89' into security-stable-2.89 2018-02-08 15:41:23 +01:00
Jesse Glick f4733a50cc Merge branch 'stable-2.89' of git://github.com/jenkinsci/jenkins into stable-2.89 2018-02-08 15:39:32 +01:00
Jesse Glick d5fda65e3f Merge branch 'security-stable-2.60' into security-stable-2.73 2018-02-08 15:39:22 +01:00
Jesse Glick 4aa29f8b37 Merge branch 'security-stable-2.46' into security-stable-2.60 2018-02-08 15:39:10 +01:00
Jesse Glick 8830d68f5f [SECURITY-717] Plugin.doDynamic check for WEB-INF or META-INF should be case-insensitive. 2018-02-08 15:37:47 +01:00
Stephen Connolly 027d7c682b [JENKINS-48775] HACKY HACKY FIX 
- Cheat and try a HTTP url if the proxy has never been accessed with a HTTP url before attempting a HTTPS url
 2018-02-06 15:23:52 +00:00
Jesse Glick f4b78921e8 [JENKINS-27035] Gathering command read/write events (#3071) 
* Slave.JnlpJar.getURL did not work in some modes when core had a snapshot dependency on Remoting.

* Starting to implement Channel.Listener.read/write.

* Now obtaining response timing statistics.

* For now, avoiding timestamped snapshots, as it caused problems for #3120 which I have asked for help from @stephenc diagnosing.

* Simplified logging a bit.

* onResponse

* hudson.FilePath$Mkdirs is a lot more readable than hudson.FilePath$13.

* Specific snapshot.

* onJar

* LoggingChannelListener

* remoting.version=3.17

* Making a few test assertions more lenient to adapt to https://github.com/jenkinsci/remoting/pull/247.
 2018-02-06 09:40:24 +01:00
Jesse Glick 7f839d8277 Fixing nullability annotations on Util.escape. 2018-02-05 23:43:54 +01:00
Kohsuke Kawaguchi 01a65588f6 Merge pull request #3279 from kohsuke/cac-24 
LegacySecurityRealm should follow the databinding pattern
 2018-02-05 16:57:56 +01:00
Kohsuke Kawaguchi 491718f4f7 Follow standard databinding pattern 
In order for this to behave more uniformly with other systems like CaC,
it's preferrable not to override the newInstance method and instead use
the standard annotation.

Issue: https://github.com/jenkinsci/configuration-as-code-plugin/issues/24
 2018-02-05 13:51:13 +01:00
Kohsuke Kawaguchi e5d25038b4 [maven-release-plugin] prepare for next development iteration 2018-02-04 14:37:51 -08:00
Kohsuke Kawaguchi f160d161c2 [maven-release-plugin] prepare release jenkins-2.105 jenkins-2.105 2018-02-04 14:37:51 -08:00
Baptiste Mathus 0c17e82e82 Merge pull request #3185 from mikecirioli/OSS-2590 
[JENKINS-48463] Update jenkins core to use  XML v1.1
 2018-02-04 11:31:53 +01:00
Oleg Nenashev fbe71717f6 Updated SSHD Module to 2.4 to bundle SSHD Core 1.7.0 2018-02-04 08:13:14 +01:00
tfennelly 88aec821d9 Removed prototypejs extended create syntax support check (always returning false) 2018-02-04 00:55:45 +01:00
Kohsuke Kawaguchi 96ceca6d0e [JENKINS-11618] Adding back the 'toJSON' instance method. 
This change, in parallel to a fix in stapler bind.js, would maximize the
backward compatibility.
 2018-02-04 00:55:18 +01:00
Kohsuke Kawaguchi 3ebecc3cf7 Backporting 918fc6e6ca 
made to work with <textarea>s, too.

git-svn-id:
https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@8172
71c3de6d-444a-0410-be80-ed276b4c234a
 2018-02-04 00:54:00 +01:00
Kohsuke Kawaguchi 182da887b0 Disabling automatic JSON evaluation. 
This is an adopted version of 8b1e071d22.
Since 1.7 has a flag to disable this behaviour, I think a better fix is
to disable this flag by default.
 2018-02-04 00:50:59 +01:00
Kohsuke Kawaguchi 8d31484297 Cherry-picking c6acb5b8d5 2018-02-04 00:50:34 +01:00
Kohsuke Kawaguchi 54e654faec [JENKINS-11618] backporting the fix here. 
I actually applied the diff from
6904bb61e31595b70260840937114e79a646da5d in keyboard-shortcuts-plugin
 2018-02-04 00:49:56 +01:00
Ulli Hafner 3d2e29bc4d Revert "Reverted to plain vanilla 1.7." 
This reverts commit a5aa65fae4.
 2018-02-04 00:36:54 +01:00
Oleg Nenashev bff2d2a399 Merge pull request #3223 from oleg-nenashev/extras-executable-war/1.37 
[JENKINS-22088] - Upgrade Extras Executable War from 1.36 to 1.37
 2018-02-03 22:29:04 +01:00
Ulli Hafner a5aa65fae4 Reverted to plain vanilla 1.7. 2018-02-03 20:14:08 +01:00
Sam Van Oort 2a6fc653ee Fix [JENKINS-49206] by ensuring Timer threads get standard classloader (#3272) 
* Fix [JENKINS-49206] by ensuring Timer threads get standard classloader

* Refactor to better fit in with existing ThreadFactor utils

* Fix javadocs
 2018-02-03 13:22:53 +01:00
Baptiste Mathus 6cefcf17a8 [JENKINS-48407] Re-enable AtomicFileWriterTest#checkPermissionsRespectUmask() (#3275) 
* [JENKINS-48407] Re-enable test

The previous test assumed permissions would always be the same,
when they actually depend on umask settings.

This change creates a file *not* using the temporary API, gets its
permissions then compares it to the ones obtained using
AtomicFileWriter.

Note: we now only check the given permissions, not the "non-given".

* Use assertThat(..., equalTo()) instead of a manual loop

* Remove unused imports

* Use TemporaryFolder instead of manual temporary dir creation
 2018-02-02 16:17:55 +01:00
Jesse Glick ac05680bb6 Introduced ACL.lambda convenience method (#3260) 
* Introduced ACL.lambda convenience method.

* Javadoc
 2018-02-02 15:56:55 +01:00
Ulli Hafner 5ed43002d7 [FIXED JENKINS-49319] Upgrade to Prototype 1.7.3. 2018-02-01 21:17:34 +01:00
Daniel Beck f1fc0f02ed Merge pull request #3256 from daniel-beck/better-dependency-errors 
Separate original and downstream dependency errors
 2018-02-01 19:03:54 +01:00
Vincent Latombe c359b86053 [FIXES JENKINS-47439] Setup wizard does not resume after restart (#3166) 
* [JENKINS-47439] Add a failing test

On first startup, the setup wizard goes into state NEW and the filter to
force display the setup wizard is installed.

On second startup, the setup wizard goes into state RESTART (which
assumes the setup wizard is done), and the setup wizard is skipped
completely.

This test expects that state NEW is retained upon restart when nothing
is done.

* [JENKINS-47439] Persist InstallState

In some cases, the heuristics to determine the current setup wizard state are
fragile. It is safer to persist the install state so that upon restart,
the setup wizard can resume where it was left off.

* Missing javadoc and since for new public methods

* s/XXX/FIXME/

* Missed that one

* Setup wizard filter should be removed when entering a state where setup is complete

* Use parameterized logging

* Improvements over previous impl

* Removed static isUsingSecurityToken. Now only determined from install
state.
* Call onInstallStateUpdate before InstallState#initializeState as the
latter can update state.

* Triggering a new build

(cherry picked from commit 30ab4481f2)
 2018-01-31 11:44:44 +01:00
Devin Nusbaum 7b6c86dc58 [JENKINS-48899] Do not downgrade detached plugins when upgrading Jenkins (#3229) 
* Reproduce JENKINS-48899

* Do not downgrade installed detached plugins

(cherry picked from commit d629897958)
 2018-01-31 11:41:51 +01:00
Jesse Glick 09b839ca9b Merge branch 'security-stable-2.89' into security-master 2018-01-30 12:21:43 -05:00
Jesse Glick ac38a9c398 Merge branch 'security-stable-2.73' into security-stable-2.89 2018-01-30 12:21:22 -05:00
Jesse Glick 3173203b17 Merge branch 'security-stable-2.60' into security-stable-2.73 2018-01-30 12:21:02 -05:00