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
Jesse Glick 6466de8cf6 Merge branch 'stable-2.89' of git://github.com/jenkinsci/jenkins into stable-2.89 2017-12-14 09:54:36 -05:00
Nicolas De loof 67476c7920 upgrade access-modifier to 1.12 
with 1.12 @Restricted annotation are kept for runtime, which is a requirement for [configuration-as-code](https://github.com/jenkinsci/configuration-as-code-plugin) to detect technical attribute which should not be exposed (typically : `Jenkins#setInstallState()`)
 2017-12-14 08:12:48 +01:00
Kohsuke Kawaguchi d31adbe0f3 Merge remote-tracking branch 'origin/master' 2017-12-13 19:00:33 -08:00
Kohsuke Kawaguchi 4c75250ad4 [maven-release-plugin] prepare for next development iteration 2017-12-13 17:58:00 -08:00
Kohsuke Kawaguchi 0f029f39e6 [maven-release-plugin] prepare release jenkins-2.95 jenkins-2.95 2017-12-13 17:58:00 -08:00
Kohsuke Kawaguchi 0e5db018ca Merge remote-tracking branch 'origin/stable-2.89' into stable-2.89 2017-12-13 16:53:42 -08:00
Kohsuke Kawaguchi 8ae7df076e [maven-release-plugin] prepare for next development iteration 2017-12-13 16:41:56 -08:00
Kohsuke Kawaguchi b6443aacbb [maven-release-plugin] prepare release jenkins-2.89.2 jenkins-2.89.2 2017-12-13 16:41:56 -08:00
Jesse Glick 51b0f2f5d3 Redesigned fix to run from XStream2.unmarshal. 2017-12-13 17:17:16 -05:00
Jesse Glick 0a50ab9957 Merge branch 'jenkins-21017' of https://github.com/stephenc/jenkins into unmarshal-JENKINS-21017 2017-12-13 15:01:57 -05:00
Jesse Glick 9b39411b1a Merge branch 'security-stable-2.89' into security-master 2017-12-13 13:07:24 -05:00
Jesse Glick b225871afc Merge branch 'stable-2.89' 2017-12-13 13:05:45 -05:00
Jesse Glick eec0188cc4 Merge branch 'security-stable-2.73' into security-stable-2.89 2017-12-13 13:04:35 -05:00
Jesse Glick b41473c3b0 Merge branch 'stable-2.73' into stable-2.89 2017-12-13 13:03:08 -05:00
Jesse Glick 8f816cbf03 Merge branch 'security-stable-2.60' into security-stable-2.73 2017-12-13 13:02:43 -05:00
Jesse Glick 57006d1266 Merge branch 'security-stable-2.46' into security-stable-2.60 2017-12-13 13:00:39 -05:00
Jesse Glick ccc374a717 [SECURITY-667] Ensure all tasks have completed before we attain COMPLETED. 2017-12-13 12:59:04 -05:00
Jesse Glick 22d32ed699 Merge (-s ours) stable-2.89 into master 2017-12-13 12:53:33 -05:00
Jesse Glick c0ba0527ee Merge commit '78adf02addc47ccb2629c9bb9101a8dd630b22a5' 2017-12-13 12:53:14 -05:00
Jochen Fürbacher bf4c8e6fdf Fixed typo in German translation. 2017-12-13 15:06:53 +01:00
Devin Nusbaum cfbc34ed72 Assert that detached plugins and their dependencies load successfully 2017-12-12 17:37:25 -05:00
Devin Nusbaum efd8b7153b Use LocalData to test upgrades from before and after 2.0 2017-12-12 17:16:30 -05:00
Oleg Nenashev cc6c508e6b Merge pull request #3175 from Wadeck/JENKINS-48383_LOGGED_IN_AFTER_ACCOUNT_CREATION 
[JENKINS-48383] Add loggedIn event on self-registration
 2017-12-12 22:26:57 +01:00
Devin Nusbaum 0518a29059 Add test for installing detached plugins after upgrading Jenkins 2017-12-12 10:44:56 -05:00
Devin Nusbaum 6bf700827a Do not use InstallState in PluginManager when loading detached plugins 2017-12-12 10:38:20 -05:00
Oleg Nenashev 7d7848ac53 Merge pull request #3176 from suren-jenkins/suren-zh 
Add Chinese translation
 2017-12-12 10:05:23 +01:00
Jesse Glick 0c59df3d46 [JENKINS-48480] Deleting DeprecatedAgentProtocolMonitor.initializerCheck. (#3190) 2017-12-12 10:03:22 +01:00
Daniel Beck 2f45a2332b [JENKINS-34254] Adapt to upstream change using ServiceLoader 2017-12-12 00:12:23 +01:00
Jesse Glick b6088dc456 Deprecating Service in favor of ServiceLoader. 2017-12-11 17:44:55 -05:00
Kohsuke Kawaguchi 78adf02add [maven-release-plugin] prepare for next development iteration 2017-12-11 13:34:20 -08:00
Kohsuke Kawaguchi a4608a21ce [maven-release-plugin] prepare release jenkins-2.94 jenkins-2.94 2017-12-11 13:34:19 -08:00
Wadeck Follonier afea0567da - also translate Item => "élément" 2017-12-11 16:45:32 +01:00
Jesse Glick b450e9bdb6 [JENKINS-47429] User.getLegacyConfigFilesFor no longer seems to be necessary. 
(cherry picked from commit 3853b38139)
 2017-12-11 10:36:12 +01:00
Oleg Nenashev 6be05b8014 [JENKINS-48157] - Risk of NPE when migrating MyViewProperty without PrimaryView (#3156) 
* [JENKINS-48157] - Reproduce the issue in test

* [JENKINS-48157] - Annotate and document nullness conditions in MyViewsProperty and ViewGroupMixIn

* [FIXED JENKINS-48157] - Prevent NPEs when using public API and when using null primaryViewName

* [JENKINS-48157] - Fix typo in Javadoc

(cherry picked from commit 211b57e8b0)
 2017-12-11 10:32:26 +01:00
t-hall 065b874a47 [JENKINS-34138] Fix maven installs from stepping on each other (#3042) 
* [JENKINS-34138] Adding equals/hashCode methods so that installs don't step on each other

* [JENKINS-34138] Added issue reference to unit tests

* [JENKINS-34138] - changed the order of equals / hashcode

(cherry picked from commit d688c15490)
 2017-12-11 10:31:13 +01:00
Daniel Beck b27bb928a2 [JENKINS-34254] Set HTTP status code for view 2017-12-10 10:35:17 +01:00
Vincent Latombe 30ab4481f2 [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
 2017-12-10 07:27:36 +03:00
Oleg Nenashev 18d7ed5ac9 Merge pull request #3183 from jglick/mock-hell 
Updating Powermock and Objenesis to avoid Mockito/Hamcrest library mismatches
 2017-12-10 07:17:58 +03:00
Oleg Nenashev 972257bf32 Merge pull request #1437 from benru/JENKINS-25286 
[FIXED JENKINS-25286] Export assignedLabels for agents and jobs in JSON and XML APIs
 2017-12-10 07:16:24 +03:00
Oleg Nenashev 59b9658a56 Merge pull request #3111 from oleg-nenashev/feature/JENKINS-27026 
[JENKINS-27026] - Update SSHD Module from 2.0 to 2.3
 2017-12-10 07:12:54 +03:00
Daniel Beck e20b049614 [JENKINS-34254] Fix RequirePOST form 2017-12-10 03:00:53 +01:00
Jesse Glick 969ed92345 Merge pull request #3177 from jglick/SYSTEM-JENKINS-20474 
[JENKINS-20474] Optimize away ACL construction and AuthorizationStrategy calls when checking permissions for SYSTEM
 2017-12-09 08:35:58 -05:00
Jesse Glick 041e9fe1f2 Merge pull request #3184 from jglick/gmaven 
GMaven cleanup
 2017-12-09 08:35:02 -05:00
Jesse Glick a8a0b5a202 Merge pull request #3182 from jglick/skipAfterFailureCount 
surefire.skipAfterFailureCount=100
 2017-12-08 21:25:10 -05:00
Jesse Glick 0bc7b46055 Last trace of gmaven gone! 2017-12-08 18:49:22 -05:00
Jesse Glick 26e2001cf2 ApplyButtonTest 2017-12-08 18:40:13 -05:00
Jesse Glick fcedf647d7 PeepholePermalinkTest 2017-12-08 18:37:28 -05:00
Jesse Glick 7bcb30cb8e Jenkins19124Test 2017-12-08 18:31:02 -05:00
Jesse Glick 6a32a20fcd HistoryWidgetTest 2017-12-08 18:17:58 -05:00
Jesse Glick d6dfd42a47 TextFileTest 2017-12-08 18:15:28 -05:00