Commit Graph
32590 Commits
Author SHA1 Message Date
Oleg Nenashev cc85dc1c44 Merge pull request #2445 from recena/JENKINS-34670
[JENKINS-34670] Add support for a new full screen layout
2017-04-02 20:22:45 +02:00
Oleg Nenashev 78c5fbcd94 Merge pull request #2826 from oleg-nenashev/windows-slave-installer/1.8
[JENKINS-42744] - Update WinSW to 2.0.3 and Windows Agent installer t0 1.8
2017-04-02 20:21:46 +02:00
Oleg Nenashev 04e2d33c60 [JENKINS-42744] - Update WinSW to 2.0.3 and Windows Agent installer to 1.8
This PR updates WinSW to 2.0.3 in order to fix [JENKINS-42744](https://issues.jenkins-ci.org/browse/JENKINS-42744), which is reported as a critical regression in Jenkins 2.50.

Changelog: https://github.com/kohsuke/winsw/blob/master/CHANGELOG.md#203

Full diff: https://github.com/kohsuke/winsw/compare/winsw-2.0.2...winsw-2.0.3
2017-04-01 22:27:39 +02:00
Manuel Recena f3f29c0e45 Merge branch 'master' of https://github.com/jenkinsci/jenkins into JENKINS-34670 2017-04-01 20:40:30 +02:00
recena bb1ff6a4b3 Merge branch 'JENKINS-34670' of https://github.com/recena/jenkins into JENKINS-34670 2017-03-31 17:21:39 +02:00
recena c8970db709 [JENKINS-34670] Reverting html.jelly and noting as deprecated 2017-03-31 17:21:08 +02:00
kzantow a3bf6a9801 JENKINS-41778 - setup wizard issues when failures 2017-03-30 15:32:14 -04:00
Baptiste Mathus 496d574b8c Use released bridge-method-injector:1.15
And suppress associated workaround
2017-03-30 18:16:09 +02:00
Daniel Beck a34479c418 [JENKINS-43228] Add test 2017-03-30 18:11:52 +02:00
Daniel Beck 43d612f984 [FIX JENKINS-43228] Consider time zone for cron validation 2017-03-30 15:26:08 +02:00
Daniel Beck bde09f70af Merge pull request #2816 from stephenc/jenkins-42934
[JENKINS-42934] Avoid using new FileInputStream / new FileOutputStream
2017-03-30 12:46:10 +02:00
Daniel Beck 0ddf2d5be7 Merge pull request #2822 from daniel-beck/borderless-admin-monitor-popup
Remove invalid CSS rule
2017-03-30 12:45:07 +02:00
Baptiste Mathus 65c0a2c708 Fix generics ambiguity
Inline the method to use concrete subtypes of AbstractBuild to remove ambiguity

```
[INFO] Jenkins war ........................................ SUCCESS [04:19 min]
[INFO] Tests for Jenkins core ............................. FAILURE [ 18.740 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 06:01 min
[INFO] Finished at: 2017-03-29T23:07:16+02:00
[INFO] Final Memory: 92M/504M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.0:testCompile (default-testCompile) on project test: Compilation failure
[ERROR] /home/tiste/dev/JENKINS/jenkins/test/src/test/java/hudson/model/GetEnvironmentOutsideBuildTest.java:[89,30] error: no suitable method found for buildAndAssertSuccess(AbstractProject)
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR]   mvn <goals> -rf :test
```
2017-03-30 07:11:26 +02:00
Baptiste Mathus 77dfa64b6a Fix error with 1.8.0_77 in CI, does not happen with 1.8.0_121
Probably a bit ugly, but well for a test it should be acceptable.
2017-03-30 07:06:09 +02:00
Baptiste Mathus e74c738107 Fix bridge-method-injector IllegalArgumentException
```
[ERROR] Failed to execute goal com.infradna.tool:bridge-method-injector:1.13:process (default) on project jenkins-core: Failed to process @WithBridgeMethods: Failed to process /home/tiste/dev/tmp/2017-03-29T23h05m22+0200-jenkins-core/jenkins/jenkins/core/target/classes/hudson/model/AbstractItem.class: IllegalArgumentException -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal com.infradna.tool:bridge-method-injector:1.13:process (default) on project jenkins-core: Failed to process @WithBridgeMethods
        at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212)
        at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
        at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
        at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:116)
        at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:80)
        at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51)
        at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
        at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:307)
        at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:193)
        at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:106)
        at org.apache.maven.cli.MavenCli.execute(MavenCli.java:863)
        at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
        at org.apache.maven.cli.MavenCli.main(MavenCli.java:199)
        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
        at java.lang.reflect.Method.invoke(Method.java:498)
        at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
        at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
        at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
        at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
Caused by: org.apache.maven.plugin.MojoExecutionException: Failed to process @WithBridgeMethods
        at com.infradna.tool.bridge_method_injector.ProcessMojo.execute(ProcessMojo.java:68)
        at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:134)
        at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:207)
        ... 20 more
Caused by: java.io.IOException: Failed to process /home/tiste/dev/tmp/2017-03-29T23h05m22+0200-jenkins-core/jenkins/jenkins/core/target/classes/hudson/model/AbstractItem.class
        at com.infradna.tool.bridge_method_injector.MethodInjector.handle(MethodInjector.java:106)
        at com.infradna.tool.bridge_method_injector.ProcessMojo.execute(ProcessMojo.java:65)
        ... 22 more
Caused by: java.lang.IllegalArgumentException
        at org.objectweb.asm.ClassReader.<init>(ClassReader.java:170)
        at org.objectweb.asm.ClassReader.<init>(ClassReader.java:153)
        at org.objectweb.asm.ClassReader.<init>(ClassReader.java:424)
        at com.infradna.tool.bridge_method_injector.MethodInjector.handle(MethodInjector.java:74)
        ... 23 more
[ERROR]

```
2017-03-29 23:08:59 +02:00
Kohsuke Kawaguchi b71b1fb43b [maven-release-plugin] prepare for next development iteration 2017-03-29 13:49:23 -07:00
Kohsuke Kawaguchi c6a23bdd26 [maven-release-plugin] prepare release jenkins-2.46.1 jenkins-2.46.1 2017-03-29 13:49:23 -07:00
Oleg Nenashev 0ae38f553a Merge pull request #2785 from TristanFAURE/JENKINS-42590
[JENKINS-42590] : remove text mentioning getDisplayName==null
2017-03-29 11:50:30 +02:00
Kohsuke Kawaguchi a3b939849c [maven-release-plugin] prepare for next development iteration 2017-03-26 19:20:17 -07:00
Kohsuke Kawaguchi a538c67277 [maven-release-plugin] prepare release jenkins-2.52 jenkins-2.52 2017-03-26 19:20:17 -07:00
Daniel Beck c83894e325 Remove invalid CSS rule 2017-03-25 01:51:37 +01:00
Jesse Glick 60632c0e98 Added -strictHostKey option to CLI in -ssh mode.
[FIXED JENKINS-33595] Picks up https://github.com/jenkinsci/sshd-module/pull/11
to turn off SSHD by default, but expose it to tests which wish to enable it.
2017-03-24 17:12:05 -04:00
Jesse Glick e69ba0f024 Merge branch 'master' into SSH-CLI-JENKINS-41745 2017-03-24 15:26:59 -04:00
Jesse Glick 1101b323c1 Merge pull request #2819 from jglick/Computer.addAction-JENKINS-42969
[JENKINS-42969] UnsupportedOperationException from Computer.addAction
2017-03-24 10:17:42 -04:00
Daniel Beck ed08122814 Merge pull request #2777 from daniel-beck/update-german-translation
Update German translation
2017-03-24 12:08:30 +01:00
Daniel Beck a00a6993ec Merge branch 'master' of github.com:jenkinsci/jenkins into update-german-translation 2017-03-24 01:58:19 +01:00
Daniel Beck de9b3d3561 Address more review comments 2017-03-23 22:35:07 +01:00
Daniel Beck c3b06ad985 Address further review comments 2017-03-23 22:32:27 +01:00
Jesse Glick 1348855519 Merge pull request #2809 from jglick/MyViewTest.testDoCreateItem
Trying to diagnose a test failure on Windows on CI
2017-03-23 16:10:28 -04:00
Daniel Beck a7ab8a2356 Merge pull request #2813 from daniel-beck/remove-partial-translations
Remove partial (less than 5% complete) translations
2017-03-23 01:20:51 +01:00
Daniel Beck a1955c8c37 Merge branch 'master' of github.com:jenkinsci/jenkins into remove-partial-translations 2017-03-22 15:31:54 +01:00
Daniel Beck b5914bb634 Merge pull request #2812 from daniel-beck/localizations-cleanup
Clean up localizations
2017-03-22 15:14:58 +01:00
Stephen Connolly 568772cddc [JENKINS-42934] Some unit tests need side-effects of FileInputStream 2017-03-22 09:04:20 +00:00
Jesse Glick 838357700d [FIXED JENKINS-42969] UnsupportedOperationException from Computer.addAction. 2017-03-21 13:02:17 -04:00
Stephen Connolly e603b10088 [JENKINS-42934] A couple of places where FileNotFoundException may be replaced by NoSuchFileException by JVM shenanigans 2017-03-21 13:55:06 +00:00
Stephen Connolly 218d0a5516 [JENKINS-42934] Actually use Java's file locking API to lock the file on windows 2017-03-21 11:08:50 +00:00
Stephen Connolly 211bb29338 [JENKINS-42934] When you specify options you need to include CREATE or the file will not be created 2017-03-20 16:02:59 +00:00
Stephen Connolly a7fc570158 [JENKINS-42934] Need to catch a different exception 2017-03-20 15:51:57 +00:00
Stephen Connolly f0cd7ae8ff [JENKINS-42934] Avoid using new FileInputStream / new FileOutputStream 2017-03-20 12:50:46 +00:00
Kohsuke Kawaguchi 4948d6c556 [maven-release-plugin] prepare for next development iteration 2017-03-19 22:07:24 -07:00
Kohsuke Kawaguchi c196792f45 [maven-release-plugin] prepare release jenkins-2.51 jenkins-2.51 2017-03-19 22:07:24 -07:00
Tristan FAURE 3ff8ce4853 [JENKINS-42627] CLI is not translated to French (#2787)
[JENKINS-42627] French translation for CLI
2017-03-19 21:33:17 +01:00
Daniel Beck 45a3280c43 Remove partial (5% or less) translations 2017-03-19 19:01:12 +01:00
Oleg Nenashev 4ac7c0850b [JENKINS-42724] - Restore the windows-service/jenkins.xml resource to restore compatibility with windows-slaves 1.2 (#2803)
* [JENKINS-42724] - Restore the jenkins-slave.xml file

Windows Slaves plugin performs a direct access to the resources bundled into the core.
Hence the file removal was a bad idea though I have not seen the issue in automatic tests and ATH.

This change also was a last-minute change in https://github.com/jenkinsci/jenkins/pull/2765/ in order to address suggestions from @daniel-beck, hence I didn't test it properly

* [JENKINS-42724] - Update the Windows Agents plugin dependency to 1.3.1

* [JENKINS-42724]  -Revert the war/pom.xml upgrade
2017-03-19 18:42:59 +01:00
Daniel Beck ba46c681c3 Clean up localizations 2017-03-19 17:59:17 +01:00
Akbashev Alexander e8efc96f3d [JENKINS-42319] - Fix broken compareTo method of Run (#2762)
* JENKINS-42319: Fix broken compareTo method of Run

Previous implementation relied on fact that users always compare run
objects with same parent. But this is not always the case.
So, it was not safe to put runs from different parents to TreeSet, i.e.

* Make comparasion more performance friendly
2017-03-19 00:10:37 +01:00
Jesse Glick 7baf81d8d4 Allowing build -p fileParam= prj to load a file from standard input so as to work without -remoting. 2017-03-17 17:15:28 -04:00
Jesse Glick 7174e3e52e Allowing install-plugin to load a file from standard input so as to work without -remoting. 2017-03-17 16:43:48 -04:00
Jesse Glick f3dae1962e Fixed locale handling. 2017-03-17 15:35:53 -04:00
Jesse Glick 289db88154 Using Logger consistently for all messages that are not expected to be stdout/stderr. 2017-03-17 11:20:44 -04:00