Commit Graph
3482 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 3a3f32da9d [maven-release-plugin] prepare for next development iteration 2016-12-18 17:49:48 -08:00
Kohsuke Kawaguchi e67560843f [maven-release-plugin] prepare release jenkins-2.37 2016-12-18 17:49:48 -08:00
Stephen Connolly cf0fea0c1f [FIXED JENKINS-40252] Add an Iterable<T> that returns all items unsorted 2016-12-14 20:23:51 +00:00
Stephen Connolly e18b34caaf Merge pull request #2603 from stephenc/jenkins-39300
[JENKINS-39300] View.getDisplayName() is ignored when rendering tabs
2016-12-12 15:13:46 +00:00
Kohsuke Kawaguchi 49653d1a6d [maven-release-plugin] prepare for next development iteration 2016-12-11 20:50:44 -08:00
Kohsuke Kawaguchi 44133ea90c [maven-release-plugin] prepare release jenkins-2.36 2016-12-11 20:50:44 -08:00
Stephen Connolly 3538931d1e [JENKINS-39300] Fix final test case 2016-12-11 17:09:04 +00:00
Daniel Beck 8d465c6aa0 Merge pull request #2659 from jglick/Run.getBadgeActions-JENKINS-40281
[JENKINS-40281] Do not try to mutate the result of getActions(Class)
2016-12-10 01:53:39 +01:00
Stephen Connolly d1c40f4b83 [JENKINS-39300] Update tests 2016-12-09 12:46:24 +00:00
Oleg Nenashev 006c6264b6 Merge pull request #2647 from olivergondza/testPluginWrapper
Test plugin wrapper
2016-12-09 11:07:17 +01:00
Jesse Glick c4ee05bcae Make sure Security218BlackBoxTest cleans up threads it starts (#2642)
* Make sure Security218BlackBoxTest cleans up threads it starts.

* Some code simplifications, and possible leak fixes, based on CLI now being AutoCloseable.

* Obsolete comment.
2016-12-09 11:05:49 +01:00
Jesse Glick 8d23041d4b [JENKINS-38514] Retain CauseOfBlockage from JobOffer (#2651)
* Converted to JenkinsRule.

* Improved messages from Node.canTake.

* [FIXED JENKINS-38514] BuildableItem needs to retain information from JobOffer about why it is neither blocked nor building.

* Converted to JenkinsRule.

* Found an existing usage of BecauseNodeIsNotAcceptingTasks.

* Original JENKINS-6598 test was checking behavior we want amended by JENKINS-38514.

* Ensure that a BuildableItem which is simply waiting for a free executor reports that as its CauseOfBlockage.

* Review comments from @oleg-nenashev.
2016-12-09 11:04:22 +01:00
Jesse Glick 5c79beb3ef [FIXED JENKINS-40281] Do not try to mutate the result of getActions(Class). 2016-12-08 18:03:45 -05:00
Kanstantsin Shautsou 9172bca30f [FIX JENKINS-40266] Allow override UserProperty.setUser(User) (#2655)
UserProperty may contain nested objects that depend on User. 
On User reconfiguration setUser(User) is called so it should be non-final to have ability override it and update references in nested objects.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
2016-12-07 00:52:35 +01:00
Kohsuke Kawaguchi f106e249b6 [maven-release-plugin] prepare for next development iteration 2016-12-04 12:36:17 -08:00
Kohsuke Kawaguchi 37df0e3a46 [maven-release-plugin] prepare release jenkins-2.35 2016-12-04 12:36:17 -08:00
Kohsuke Kawaguchi 36ba8e590d [maven-release-plugin] prepare for next development iteration 2016-11-27 12:55:26 -08:00
Kohsuke Kawaguchi 5346c8b6f2 [maven-release-plugin] prepare release jenkins-2.34 2016-11-27 12:55:26 -08:00
Jesse Glick 6360b96464 [JENKINS-38867] Optimize performance of Actionable.getAllActions (#2582)
* Optimize Actionable.getAllActions.

* Also need to invalidate the cache when new plugins are installed.

* Various improvements to TransientActionFactory caching.
· Move the cache code to TransientActionFactory itself, for better encapsulation.
· Optimize getAction(Class) to not need to call getAllActions; avoids copying lists, and can avoid calling TransientActionFactory at all.
· Ensure that we maintain a separate cache per ExtensionList instance, so that static state is not leaked across Jenkins restarts.

* Updated TransientActionFactory to specify what kinds of actions it could produce.

* It turns out that changing type parameters for an extension, while generally binary-compatible, breaks reflective code in Jenkins and so this is not an option.
… hudson.ExtensionFinder$GuiceFinder$SezpozModule configure
WARNING: Failed to load com.cloudbees.hudson.plugins.folder.relocate.RelocationAction$TransientActionFactoryImpl
java.lang.LinkageError: Failed to resolve class com.cloudbees.hudson.plugins.folder.relocate.RelocationAction$TransientActionFactoryImpl
	at hudson.ExtensionFinder$GuiceFinder$SezpozModule.resolve(ExtensionFinder.java:489)
	at hudson.ExtensionFinder$GuiceFinder$SezpozModule.configure(ExtensionFinder.java:506)
	at …
	at hudson.ExtensionFinder$GuiceFinder.<init>(ExtensionFinder.java:280)
	at …
	at hudson.ClassicPluginStrategy.findComponents(ClassicPluginStrategy.java:472)
	at hudson.ExtensionList.load(ExtensionList.java:349)
	at hudson.ExtensionList.ensureLoaded(ExtensionList.java:287)
	at hudson.ExtensionList.getComponents(ExtensionList.java:167)
	at jenkins.model.Jenkins$8.onInitMilestoneAttained(Jenkins.java:1082)
	at jenkins.InitReactorRunner$1.onAttained(InitReactorRunner.java:82)
	at org.jvnet.hudson.reactor.ReactorListener$Aggregator.onAttained(ReactorListener.java:104)
	at org.jvnet.hudson.reactor.Reactor$1.run(Reactor.java:176)
	at org.jvnet.hudson.reactor.Reactor$Node.run(Reactor.java:117)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
	at java.lang.Thread.run(Thread.java:745)
Caused by: java.lang.reflect.MalformedParameterizedTypeException
	at sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl.validateConstructorArguments(ParameterizedTypeImpl.java:58)
	at sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl.<init>(ParameterizedTypeImpl.java:51)
	at sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl.make(ParameterizedTypeImpl.java:92)
	at sun.reflect.generics.factory.CoreReflectionFactory.makeParameterizedType(CoreReflectionFactory.java:105)
	at sun.reflect.generics.visitor.Reifier.visitClassTypeSignature(Reifier.java:140)
	at sun.reflect.generics.tree.ClassTypeSignature.accept(ClassTypeSignature.java:49)
	at sun.reflect.generics.repository.ClassRepository.getSuperclass(ClassRepository.java:90)
	at java.lang.Class.getGenericSuperclass(Class.java:777)
	at hudson.ExtensionFinder$GuiceFinder$SezpozModule.resolve(ExtensionFinder.java:470)
	... 29 more

* Remove actionType override to make for a simpler diff.

* Strengthened test to cover accesses to unrelated context types.

* Strengthening tests in a couple of ways.

* Javadoc improvements suggested by @oleg-nenashev.
2016-11-27 07:38:38 +01:00
Oliver Gondža 2af7249c6a Remove duplicate or core/src/test/java/hudson/PluginWrapperTest.java 2016-11-25 13:24:49 +01:00
Kohsuke Kawaguchi 98561d9f50 [maven-release-plugin] prepare for next development iteration 2016-11-20 15:32:46 -08:00
Kohsuke Kawaguchi f515245715 [maven-release-plugin] prepare release jenkins-2.33 2016-11-20 15:32:46 -08:00
Daniel Beck 71ed5bf06e Merge pull request #2637 from jglick/TokenBasedRememberMeServices2Test-LoggerRule
Take advantage of LoggerRule to simplify test
2016-11-19 22:40:20 +01:00
Thorsten Scherler 1256285f62 [FIX JENKINS-39034] /i18n/resourceBundle should be conform to the w3c standard about locale negotiation (#2594)
* [parseCountry] Extract region/country and variant from the language parameter in case it is bigger then 2 letters. Add tests for both cases.

* [JENKINS-39034] remove debug system out

* [JENKINS-39034] Only if we have 5 or more character we want to get the country - prevent NPE

* [JENKINS-39034] use split since it is more general

* [JENKINS-39034] Only override country and variant if not already set

* [JENKINS-39034] better test cases to test whether the fallback and variant resolving work corret

* [JENKINS-39034] remove duplicate tests and better name existing ones
2016-11-19 22:30:51 +01:00
Kohsuke Kawaguchi 33c3037dae [maven-release-plugin] prepare for next development iteration 2016-11-16 06:13:35 -08:00
Kohsuke Kawaguchi b75d42edb4 [maven-release-plugin] prepare release jenkins-2.32 2016-11-16 06:13:35 -08:00
Jesse Glick e47c681f9f Take advantage of LoggerRule to simplify test. 2016-11-15 17:34:59 +01:00
Jesse Glick 5a163a3b30 Correcting newlines. 2016-11-15 12:43:51 +01:00
Jesse Glick 7706306d21 Merge branch 'security-stable-2.19' into security-master 2016-11-15 12:20:30 +01:00
Jesse Glick 555a863886 Merge branch 'security-stable-2.7' into security-stable-2.19 2016-11-15 09:54:14 +01:00
Kohsuke Kawaguchi 839f0ac671 [maven-release-plugin] prepare for next development iteration 2016-11-13 18:43:24 -08:00
Kohsuke Kawaguchi 52f14349ab [maven-release-plugin] prepare release jenkins-2.31 2016-11-13 18:43:24 -08:00
Jesse Glick 8ebf09f141 Merge branch 'security-stable-1.651' into security-stable-2.7 2016-11-13 20:42:57 +01:00
Jesse Glick e155560459 Merge branch 'security-stable-1.642' into security-stable-1.651 2016-11-13 20:41:02 +01:00
Jesse Glick 29cba7e72a Merge branch 'security-stable-1.625' into security-stable-1.642 2016-11-13 20:39:29 +01:00
Jesse Glick 2e90ee86b5 Merge branch 'security-stable-1.651' into security-stable-2.7 2016-11-13 18:21:03 +01:00
Jesse Glick 57722fc94b Merge branch 'stable-1.651' into security-stable-1.651 2016-11-13 18:19:27 +01:00
Jesse Glick b6995f9901 @kohsuke’s 8cde4eb incorrectly resolved a merge conflict, reverting a bit of 7493468. 2016-11-13 18:14:32 +01:00
Kohsuke Kawaguchi d84d9a2ad3 Preparing the integration commit for Nov 16th release
Merge branch 'SECURITY-360-test' into security-stable-1.625
2016-11-11 18:57:33 -08:00
Kohsuke Kawaguchi e2a70ddff0 Merge branch 'security-stable-1.651' into security-stable-2.7 2016-11-11 18:15:34 -08:00
Kohsuke Kawaguchi b2eed3002d Because of JENKINS-32273 change in 1.649, exit code changes 2016-11-11 18:02:40 -08:00
Kohsuke Kawaguchi 8cde4eb533 Merge branch 'security-stable-1.642' into security-stable-1.651 2016-11-11 17:45:03 -08:00
Kohsuke Kawaguchi d6bba752b9 Merge branch 'security-stable-1.625' into security-stable-1.642 2016-11-11 17:42:43 -08:00
Kohsuke Kawaguchi e7db526465 Merge pull request #72 from jenkinsci-cert/ysoserialnew
Extend ysoserial coverage for latest cases [SECURITY-317]
2016-11-11 17:39:38 -08:00
Kohsuke Kawaguchi 6078dd7aa0 [SECURITY-360] integration test
Make sure LDAPAttribute gets rejected.
2016-11-11 17:34:28 -08:00
Sam Van Oort d42c39c93a Add explanation for spring tests 2016-11-11 19:45:01 -05:00
Sam Van Oort 594ffcec02 Fix quirks in the tests 2016-11-11 18:50:35 -05:00
Sam Van Oort 3ba3a32204 Add entries for the new ysoserial tests and license headers 2016-11-11 18:06:43 -05:00
Sam Van Oort 4fc68251e3 Compileable ysoserial classes 2016-11-11 17:13:07 -05:00
Sam Van Oort 8395b78c83 Mostly working ysoserial updates 2016-11-11 16:50:14 -05:00