Commit Graph

26784 Commits

Author SHA1 Message Date
Oleg Nenashev d004eea0ca
Merge pull request #3429 from jglick/revision
Fix revision after bad merge
2018-05-09 20:31:40 +02:00
Jesse Glick 67b1328385
Fix revision. 2018-05-09 14:17:12 -04:00
Kohsuke Kawaguchi 91e1cf2d3e Merge remote-tracking branch 'origin/master' 2018-05-09 02:44:41 -07:00
Jesse Glick afb71c005a
Merge pull request #3427 from jglick/reincrementalify-robustness
Avoid CI failures pending reincrementalifization
2018-05-07 17:53:01 -04:00
Kohsuke Kawaguchi e1132fd4ed [maven-release-plugin] prepare for next development iteration 2018-05-07 12:09:24 -07:00
Kohsuke Kawaguchi 9bc3aa68b1 [maven-release-plugin] prepare release jenkins-2.121 2018-05-07 12:09:24 -07:00
Jesse Glick e216995ee0
Avoid CI failures pending reincrementalifization. 2018-05-07 09:39:26 -04:00
Daniel Beck e992e1153b Merge commit '7250d8b875366ae90fa6aec13b5a5c86720e23a3' into security-master 2018-05-07 14:12:09 +02:00
Jesse Glick b414e3f23b Reincrementalify core. (#3426)
* Reincrementalify core.

* Pick up released version
2018-05-07 13:50:19 +02:00
Kohsuke Kawaguchi 7250d8b875 [maven-release-plugin] prepare for next development iteration 2018-05-06 02:34:22 -07:00
Kohsuke Kawaguchi 23c44bdbfa [maven-release-plugin] prepare release jenkins-2.120 2018-05-06 02:34:21 -07:00
Hangsu Ma 081e400a5b [FIXED JENKINS-14713] make Cancel independent from Build permission (#882)
A script in the confluence page below will make sure configuration is
compatible after this change:
https://wiki.jenkins-ci.org/x/fAAhB
2018-05-05 21:27:15 +02:00
aviadatsnyk 8ede53387e [JENKINS-32778] - Prevent extracting archived plugins outside of target path (#3402) 2018-05-05 14:32:34 +02:00
Oleg Nenashev 4278461c90
Merge pull request #3408 from batmat/JENKINS-50969
[JENKINS-50969] core site build is broken, needed for core taglibs reference
2018-05-05 14:27:52 +02:00
Wadeck Follonier e7eec1cbe6 [JENKINS-51064] Lenient URL validator for Root URL (#3415)
* [JENKINS-51064] Lenient URL validator for Root URL
- especially with the TLDs
- more test cases

* add blank line

* Adjust comment

* Correction typo
2018-05-04 16:03:22 -04:00
Matt Sicker e229f37dd9 JENKINS-13128: Preserve copied file permissions and mtime (#3400)
* JENKINS-13128: Preserve copied file permissions and mtime

This fixes a bug where files copied locally do not preserve file permissions or last modification time.

* Use IO utility methods for exception handling

* Fix invalid path exception propagation

* Revert hudson.Util
2018-05-04 15:36:33 -04:00
Jeff Thompson a9eafdb973 [JENKINS-50412] Fingerprints logs should be less verbose (#3373)
* JENKINS-50412 - Fingerprints logs should be less verbose

Eliminate the logging line that says
possibly trimming /var/jenkins_home/fingerprints/[...]
This line fills up the fingerprints log file with repetitive, useless information.
The operation it calls provides its own logging that can be turned on if detailed
logging is actually needed instead of running this one repeatedly.

Also, while in the area, convert a couple of FileFilter inner classes to lambdas
and inline them. This reduces unnecessary boilerplate and improves clarity.

In order to make this change testable, I elected to remove the final restriction on the
class and annotate the class as restricted. This allows me to create unit tests for
this change and also verify existing capability at the appropriate level.

* Watch out for varying line endings.

Use a reliable check.

* Correct a few minor issues caught in review.

* Change to correct access modifier.
2018-05-04 14:51:12 -04:00
Wadeck Follonier a03254b99f Admin monitor message: separation between content and display (#3416)
* Better separation between content and display
- also put the version for the RootUrlNotSetMonitor and the HttpResponses new method

* Add blank line
2018-05-04 20:28:59 +02:00
Oleg Nenashev 541c31f75c
Merge branch 'master' into JENKINS-50969 2018-05-04 20:22:15 +02:00
Oleg Nenashev a4a1355f51
Merge pull request #3420 from jglick/gradle-plugin-under-test-JENKINS-51062
[JENKINS-51062] Extend ClassFilterImpl.isLocationWhitelisted Maven-oriented exclusions to plugin under test during Gradle builds
2018-05-04 11:18:16 +02:00
Jesse Glick d1eaafb28b
Merge pull request #3405 from jglick/InstallState-madness-redux
Simplify Jenkins.installState serial form to avoid relying on readResolve
2018-05-03 14:42:36 -04:00
Jesse Glick b14ba46a14
[JENKINS-51062] Extend ClassFilterImpl.isLocationWhitelisted Maven-oriented exclusions to plugin under test during Gradle builds. 2018-05-03 13:57:28 -04:00
Jesse Glick 101f972d41
Merge branch 'master' into InstallState-madness-redux 2018-05-03 10:43:24 -04:00
Jesse Glick 3fb17fb0bb
[JENKINS-50692] [INFRA-1571] #3394: JEP-305 Incrementals in core 2018-05-03 10:13:39 -04:00
Jesse Glick 3465da4764
Merge pull request #3419 from dwnusbaum/JENKINS-9104-test-fix
Fix test failure by cleaning up static state after tests
2018-05-02 18:47:23 -04:00
Devin Nusbaum 828a7e0225 Fix test failure by cleaning up static state after tests 2018-05-02 16:28:30 -04:00
Baptiste Mathus ddbc4bbce7
Merge pull request #3412 from batmat/add-version-and-batch-mode
Set ATH mvn run: set batch mode, and show versions
2018-05-01 17:22:35 +02:00
Kohsuke Kawaguchi b094f9c2eb Merge branch 'master' of github.com:jenkinsci/jenkins 2018-04-30 12:03:52 -07:00
Kohsuke Kawaguchi a669e240af [maven-release-plugin] prepare for next development iteration 2018-04-30 11:56:44 -07:00
Kohsuke Kawaguchi 0a7543c443 [maven-release-plugin] prepare release jenkins-2.119 2018-04-30 11:56:44 -07:00
Baptiste Mathus f94ecf2c9f Set ATH mvn run: set batch mode, and show versions 2018-04-30 09:53:49 +02:00
Andy Neebel 701485e86b [JENKINS-9104] Move process killing veto checks to master (#3357)
* [JENKINS-9104] Add a test method to show that vetos aren't processed on slaves

* Move the veto check to always run on the master

* Add a flag to skip master call if empty list
2018-04-29 12:50:30 +02:00
Wadeck Follonier 79ec930a8e [JENKINS-49839] correct annotation check (#3321)
- also correct a bad annotation in Run
2018-04-29 00:58:35 +02:00
Oleg Nenashev c7bc10341f
Merge pull request #3409 from daniel-beck/at-since-201804
Cleanup since Javadoc tags
2018-04-27 21:16:46 +02:00
Baptiste Mathus b3c5c402e6 [JENKINS-50969] core site build is broken, needed for core taglibs reference
The special old module for doxia seems not needed.
I suspect that it is because since 2012 when it was released, the Markdown
support got done in standard.

IIUC this was pulling in some very old doxia versions, which was
incompatible with maven-fluido-skin which I needed to bump from current
1.3.0 to 1.7 for https://github.com/jenkins-infra/core-taglibs-report-generator
to work again.
2018-04-27 14:14:51 +02:00
Baptiste Mathus 621ef567b2
Merge pull request #3410 from batmat/bump-to-parent-1.41-add-junit-to-depMgmt
Pick-up parent pom 1.41 adding junit to dependencyManagement
2018-04-27 13:59:50 +02:00
Baptiste Mathus 7a986fb642 Remove junit totally from depMgmt 2018-04-27 11:03:42 +02:00
Oleg Nenashev b15c21d5b0
Merge pull request #3407 from Jochen-A-Fuerbacher/fixEndcoding
Fixed encoding in German translation (log recorder levels)
2018-04-27 10:47:47 +02:00
Baptiste Mathus 1866fe1fdd Pick-up parent pom 1.41 adding junit to dependencyManagement 2018-04-27 10:18:39 +02:00
Daniel Beck 6e037bfa39 Cleanup since Javadoc tags 2018-04-26 17:21:30 +02:00
Wadeck Follonier 17b94a044a [JENKINS-31661] Check the root url (Admin monitor + Wizard) (#3082)
* [JENKINS-31661] Add an administrative monitor to check the root url configuration
- add the monitor + test

* - corrections requested by Oleg in code review

* - add a field to fill during SetupWizard for the rootUrl (default value using javascript but editable)
- WIP : missing the translation

* - revert whitespace change

* - little refactoring of js methods

* - translation added

* - modification requested during PR by Jesse

* - renaming proposed by Keith

* - rework to have a new page in the SetupWizard for the root URL

* Correct relevant non-conflicting merge changes

* - in case of skip => also skip the instance configuration
- terminate => finish (+ uppercase)
- replace double single quotes
- add help message in the wizard to inform admins
- correct the installState serialization problem
- update working (admin monitor + wizard)

* address Daniel's comment
- skip all steps will show two messages instead of one (like before when clicking on skip twice)
- skip => not now
- remove margin and adjust padding for the wizard forms
- add the "if possible"

* address Arnaud's comment on the sauter vs passer

* address Liam's comment

* correct previous commit typo

* correct previous commit typo (2)

* add blank end line

* address James' comment

* address Daniel's comment

* address Devin's comment
- implement error management in the wizard
- provide different message in the monitor in case of null / invalid url
- add an helper to validate URL (even with _ in domain)
- add @Restricted

* - also update the monitor test to be consistent with its new behavior

* address Devin's comments

* correct header files

* include relevant classes for the url validation from commons-validator:1.6

* Move Apache classes in a more standard package
2018-04-26 16:58:29 +02:00
Jochen Fürbacher 3a124bfdb6 Fixed regression of ed8d905 2018-04-26 12:28:55 +02:00
Daniel Beck dfdc4bc305 Merge branch 'security-stable-2.107' into security-master 2018-04-26 12:08:17 +02:00
Daniel Beck fbea395ed7 Merge branch 'stable-2.107' into security-stable-2.107 2018-04-26 12:07:15 +02:00
Daniel Beck 9241bc28ed Merge branch 'stable-2.107' of git://github.com/jenkinsci/jenkins into stable-2.107 2018-04-26 12:06:54 +02:00
Oliver Gondža 3485779ec2
Merge pull request #3406 from Wadeck/FIX_CLI_LOGOUT_TEST_FAILURE
Fix the CLI test failure
2018-04-26 10:51:21 +02:00
Jochen Fürbacher aaa068a305 Fixed encoding in German translation (log recorder levels) 2018-04-26 10:45:01 +02:00
Wadeck Follonier df137f099e Fix the CLI test failure 2018-04-26 10:39:53 +02:00
Daniel Beck c5497c9a57 Merge branch 'security-stable-2.107' into security-master 2018-04-26 01:49:42 +02:00
Daniel Beck 7e6c0637b1 Merge branch 'security-stable-2.89' into security-stable-2.107 2018-04-26 01:20:01 +02:00