Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 1f051eb37e Fixed a test regression
Previously, wa.contextDestroyed(null) interrupts the Jenkins.<init>
thread, and it was the 2nd reactor call that was throwing InterruptedException
from this call. Now that I removed that 2nd reactor call, the init
thread never actually fails.

The intent of the test case is to make sure the boot failure hook is
invoked, so even with this change it covers the original intent.
2016-03-28 16:05:40 -07:00
kzantow 2757b471a0 JENKINS-33813 - fix error page styling issue, add option to retry, fix
check for setup wizard js include
2016-03-28 18:51:41 -04:00
Manuel Recena 89f457775d More clean up 2016-03-29 00:30:09 +02:00
Jesse Glick 1a28593f09 [FIXED JENKINS-33772] ID was not sufficiently unique for SezpozModule; use an ID based on the actual annotated element. 2016-03-28 17:31:57 -04:00
Kohsuke Kawaguchi c97dfdee58 Whatever that makes other people comfortable 2016-03-28 14:24:39 -07:00
Jesse Glick 86503c2508 Moving DirectlyModifiableTopLevelItemGroup.canAdd check to a higher UI level, in ViewDescriptor.doAutoCompleteCopyNewItemFrom. 2016-03-28 16:36:50 -04:00
Jesse Glick d3ed1cb36c newJob link should be offered according to Item.CREATE permission on the ViewGroup (e.g., Folder), not necessarily root (Jenkins). 2016-03-28 15:58:36 -04:00
Jesse Glick 8c2cc70fbe Merge branch '2.0' into JENKINS-33759-misc 2016-03-28 15:42:14 -04:00
kzantow 3cf8de04a9 JENKINS-33770 - fix issue directly submitting firstUser page 2016-03-28 13:55:29 -04:00
recena 45d870d856 Clean up 2016-03-28 19:06:31 +02:00
kzantow d9d4f08d2b JENKINS-33826 build history badges styling issues 2016-03-28 09:11:39 -04:00
Daniel Beck 6219c8f9fd Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0
Conflicts:
	cli/pom.xml
	core/pom.xml
	pom.xml
	test/pom.xml
	war/pom.xml
2016-03-28 13:48:43 +02:00
Daniel Beck 2ed0905166 Minor formatting improvements 2016-03-28 13:40:40 +02:00
Oleg Nenashev ae235930a9 [FIXED JENKINS-33848] - Do not try to resolve empty strings in Items:fromNameList()
ReverseBuildTrigger autocompletes lists of jobs by delimiters when you select items, so sometimes you get the "Jib1, Job2, " in the form submission. Then ReverseBuildTrigger invokes Items::fromNameList() in order to resolve the dependency graph.

In this method Jenkins splits the string, trims it and then tries to resolve jobs. In such case an empty string is being passed to the resolution code. It may be unsafe since items (e.g. folders) may somehow override and mishandle the logic.

It would be useful to avoid such resolution attempts.
2016-03-28 12:08:02 +02:00
Daniel Beck 69570a869f Noting #2162,#2163,#2171,#2155,#2147,#2148,#2129 2016-03-28 06:11:50 +02:00
Kohsuke Kawaguchi f617dc58cd updated changelog for release 2016-03-27 19:26:19 -07:00
Kohsuke Kawaguchi 83ed203862 [maven-release-plugin] prepare for next development iteration 2016-03-27 19:21:39 -07:00
Kohsuke Kawaguchi 8cd91c1846 [maven-release-plugin] prepare release jenkins-1.655 jenkins-1.655 2016-03-27 19:21:39 -07:00
Manuel Recena b167c16e9e Polishing New Item option 2016-03-27 23:21:31 +02:00
Michael Koch 413baa1fbb Add desription of -noKeyAuth command line option for german translation 2016-03-27 13:32:03 +02:00
Kohsuke Kawaguchi 4b8d30a100 Don't go through init sequence twice
As a part of PR 1847, 3b5424e507 introduced a second invocation to
executeReactor. This is causing a problem in that it exectes
InitMilestone progression twice. If you are looking at
Jenkins.getInitLevel() it will go through STARTED ... COMPLETED once,
then it goes back to STARTED and then go to COMPLETED again.

And this code looks bit odd anyway. Why execute a whole reactor
just to make one method invocation? But I didn't see any discussion of
this in PR 1847.

This change fixes this oddity by making this a part of the main
(and sole) initialization reactor session. It's not clear what
milestone should be the pre-requisite, but given that it's only looking
at dependency chain, PLUGINS_PREPARED should be adequate.
2016-03-26 13:10:25 -07:00
Kohsuke Kawaguchi 1777069976 Doc improvements 2016-03-26 12:49:28 -07:00
Kohsuke Kawaguchi a82238b888 Simplified by using instance methods 2016-03-26 12:49:28 -07:00
Kohsuke Kawaguchi 1bc7f6219a The previous change requires that Guice is setup
... which is done by looking for locating & instantiating ExtensionFinders.
2016-03-26 12:49:28 -07:00
Kohsuke Kawaguchi 199dfed4f0 Allow instance methods for @Initializer and @Terminator
This simplifies typical usage of them.
2016-03-26 11:07:44 -07:00
Kohsuke Kawaguchi 2579ceaff4 NioChannelHub must be explicitly shut down
... or else it'll keep running. This can be seen as a large number of zombie threads like the following in the unit test:

"NioChannelHub keys=0 gen=0: Computer.threadPoolForRemoting [#250]" daemon prio=10 tid=0x00007f793d841000 nid=0x3cc1 runnable [0x00007f78e2665000]
   java.lang.Thread.State: RUNNABLE
        at sun.nio.ch.EPollArrayWrapper.epollWait(Native Method)
        at sun.nio.ch.EPollArrayWrapper.poll(EPollArrayWrapper.java:228)
        at sun.nio.ch.EPollSelectorImpl.doSelect(EPollSelectorImpl.java:81)
        at sun.nio.ch.SelectorImpl.lockAndDoSelect(SelectorImpl.java:87)
        - locked <0x00000000c50d46d8> (a sun.nio.ch.Util$2)
        - locked <0x00000000c50d46e8> (a java.util.Collections$UnmodifiableSet)
        - locked <0x00000000c50d4690> (a sun.nio.ch.EPollSelectorImpl)
        at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:98)
        at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:102)
        at org.jenkinsci.remoting.nio.NioChannelHub.run(NioChannelHub.java:542)
        at jenkins.util.ContextResettingExecutorService$1.run(ContextResettingExecutorService.java:28)
        at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
        at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
        at java.util.concurrent.FutureTask.run(FutureTask.java:166)
        at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
        at java.lang.Thread.run(Thread.java:722)
2016-03-26 09:14:32 -07:00
Oleg Nenashev 311fe0a852 Merge pull request #2174 from aheritier/patch-2
Fix missing space in log message
2016-03-26 16:14:33 +01:00
Jesse Glick 0ebf47bd34 Merge pull request #2171 from jglick/noisy-InstallUncaughtExceptionHandler
Be quiet
2016-03-25 19:14:10 -04:00
Kohsuke Kawaguchi 25ad5aedfb [FIXED JENKINS-33799]
Fix the width & height of the icon via CSS.

Previously, we were relying on the actual image being served as a
correct size. This is fine for icons we ship in Jenkins, but when
plugins use avatars as icons, those images might not come in the correct
size.
2016-03-25 14:46:04 -07:00
Arnaud Heritier 6235f4868d Fix missing space in log message 2016-03-25 20:42:45 +01:00
Jesse Glick d2eb07d91a Make ViewDescriptor.doAutoCompleteCopyNewItemFrom honor DirectlyModifiableTopLevelItemGroup.canAdd. 2016-03-25 13:37:20 -04:00
Jesse Glick 0a04ebb939 Be quiet. 2016-03-25 13:16:29 -04:00
Jesse Glick 21ffd86807 Incorrect handling of relative paths from createItem, especially from a folder. 2016-03-25 12:49:55 -04:00
kzantow 2968285d9a JENKINS-33770 - not all paths restricted during SetupWizard 2016-03-25 11:02:11 -04:00
Daniel Beck 994375f9bb Merge pull request #2155 from daniel-beck/JENKINS-33546-33605
[JENKINS-33546] [JENKINS-33605] Back to Stapler 1.239
2016-03-25 13:34:13 +01:00
James Nord 83f51e0782 Merge pull request #2162 from batmat/dot-mvn-dir
Add the .mvn directory and set default Xmx value
2016-03-24 20:27:50 +00:00
Oleg Nenashev abf5312797 Merge pull request #2169 from jenkinsci/label-jelly-typo-fix
Fix typo in hudson/tools/label.jelly
2016-03-24 21:04:46 +01:00
Oleg Nenashev 4a5430a77e Fix typo in hudson/tools/label.jelly 2016-03-24 21:00:27 +01:00
Baptiste Mathus 1015b395c1 Add the .mvn directory and set default Xmx value
Using the new feature introduced in Maven 3.3.1.
See
https://maven.apache.org/docs/3.3.1/release-notes.html#JVM_and_Command_Line_Options
for more details.

Possibly a long term better solution/first encounter for newcomers. When
people can't build Jenkins because of wrong default memory settings.
Like https://goo.gl/Co9kye

The "Xmx800m" was chosen after looking at last successful ci.j.o builds.
Max memory displayed by Maven being ~730MB. So putting 800 to leave the
build some room so that the GC has less chance to have to chime in too
often.
2016-03-24 16:43:28 +01:00
Robert Sandell 320ff5ff44 Merge pull request #2163 from rsandell/public-fp-xstream
Make Fingerprint's XSTREAM field public
2016-03-24 16:14:07 +01:00
Kohsuke Kawaguchi 1873c6fb84 [maven-release-plugin] prepare for next development iteration 2016-03-24 01:03:27 -07:00
Kohsuke Kawaguchi 1ed4f17454 [maven-release-plugin] prepare release jenkins-2.0-beta-1 jenkins-2.0-beta-1 2016-03-24 01:03:27 -07:00
Kohsuke Kawaguchi 2b95a169c5 Disabling HelpLinkTest
as an emergency measure for shipping 2.0 beta 1

See the comment for why. Probably related to scrollspy
2016-03-24 00:14:51 -07:00
Daniel Beck 830ebd22c8 Merge pull request #2167 from rtyler/good-ratings-are-good
[FIX WEBSITE-147] Make changelog ratings work on jenkins.io
2016-03-24 04:49:27 +01:00
Kohsuke Kawaguchi 129b69d4fa Next stop, beta 1 2016-03-23 20:32:28 -07:00
Kohsuke Kawaguchi d3666a1714 Merge pull request #2166 from jenkinsci/upgrade-wizard
[FIX JENKINS-33767] Only show the upgrade banner when Jenkins is in charge
2016-03-23 20:29:37 -07:00
R. Tyler Croy 4c41b9c804 Make sure ratings in the changelog works properly on jenkins.io
[FIX WEBSITE-147]
2016-03-23 20:20:48 -07:00
Kohsuke Kawaguchi e26d8f8956 Fixed up tests
Test code needs to now execute in the request scope for us to be able to
determine if Jenkins object is in charge or not
2016-03-23 19:24:37 -07:00
Daniel Beck 0de30681c8 Merge pull request #2117 from recena/JENKINS-31162
[JENKINS-31162] New item categorization
2016-03-24 01:10:25 +01:00
Daniel Beck 6790c3f93e Merge pull request #2165 from batmat/install-text-leaner
More concise welcome text for Jenkins 2
2016-03-24 01:04:48 +01:00