Commit Graph
4173 Commits
Author SHA1 Message Date
Baptiste Mathus 0c17e82e82 Merge pull request #3185 from mikecirioli/OSS-2590
[JENKINS-48463] Update jenkins core to use  XML v1.1
2018-02-04 11:31:53 +01:00
mike cirioli 5f0f9f2b87 [JENKINS-48463] added try-with-resources to XmlFileTest to ensure proper
file handle cleanup in the event of failure

Fixed small nits regarding typo's and code cleanup
Added comment explaining why Xpp3 is still included as a dep
2018-01-30 09:31:15 -05:00
Kohsuke Kawaguchi 53b9bdff75 [maven-release-plugin] prepare for next development iteration 2018-01-29 03:35:21 -08:00
Kohsuke Kawaguchi 4176b0c05e [maven-release-plugin] prepare release jenkins-2.104 2018-01-29 03:35:21 -08:00
Oleg Nenashev dbc75125c5 Merge pull request #3250 from oleg-nenashev/feature/JENKINS-48766-minimum-remoting-version
[JENKINS-48766] - Expose information about Remoting versions via API
2018-01-28 10:08:38 +01:00
mike cirioli 17f74fc713 Merge branch 'master' into OSS-2590 2018-01-24 09:27:57 -05:00
mike cirioli a0f419120b [JENKINS-48463] It appears that the KXml2Driver is more tolerant of
technically illegal xml (ie. it doesn't complain if an Xml v1.0 file
contains special characters).  Added a unit test that proves this, as well
as fixing silentlyMigrateConfigsTest so that it starts with technically
valid Xml 1.0 content
2018-01-24 09:25:34 -05:00
mike cirioli b9c2148d6e [JENKINS-48463] Added a unit test that validates jenkins xml v1.0 configs
are silently migrated to xml v1.1 as they are persisted
2018-01-24 09:25:33 -05:00
mike cirioli 24a1852fc2 [JENKINS-48463] Added additional unit tests for verifying xml v1.1 compatibility
- verify can still read xml 1.0
  - verify can read xml 1.1
  - verify can read xml 1.1 with 'special' characters
  - verify that jenkins can start with a config.xml having
    <?xml version='1.1'> and special characters
2018-01-24 09:25:33 -05:00
mike cirioli 570b52dbcc [JENKINS-48463] refactored XStream2 to default to KXml2Driver by default.
Changed all explicit references of the hierarchical driver to use a static
convinience method XStream2.getDefaultDriver() to ensure all XML operations
are using the same driver.
2018-01-24 09:25:32 -05:00
mike cirioli 9a4a913e38 [JENKINS-48463] - update jenkins core to use xml v1.1
- switched to KxmlDriver (needed for xml 1.1 support)
  - updated to create xml v1.1 headers
  - updated test to use KXml2Driver explicitly
  - updated unit tests to support xml v1.1
2018-01-24 09:24:56 -05:00
Oleg Nenashev 07d8f4e3e6 [JENKINS-48766] - Add info about remoting to the WAR manifest file 2018-01-22 12:04:54 +01:00
Kohsuke Kawaguchi adb3c86c75 [maven-release-plugin] prepare for next development iteration 2018-01-21 13:22:47 -08:00
Kohsuke Kawaguchi c03253b9b4 [maven-release-plugin] prepare release jenkins-2.103 2018-01-21 13:22:46 -08:00
Devin Nusbaum d629897958 [JENKINS-48899] Do not downgrade detached plugins when upgrading Jenkins (#3229)
* Reproduce JENKINS-48899

* Do not downgrade installed detached plugins
2018-01-21 15:33:03 +01:00
Manuel Recena 6f2769e69a [JENKINS-43786] Overhaul of Manage Jenkins page (#2857)
* [JENKINS-43786] Initial source code modifications

* [JENKINS-43786] Adding a customized Bootstrap version and some messages were adapted

* [JENKINS-43786] Some Monitors included in the core have been adapted

* [JENKINS-43786] Reverting an unexisting typo

* [JENKINS-43786] Applying final styles

* [JENKINS-43786] Addressing more use cases

* [JENKINS-43786] Revisiting how the buttons are shown

* [JENKINS-43786] Adjustments in the administrative monitor pop-up

* [JENKINS-43786] Added more use cases related with administrative messages

* [JENKINS-43786] Adapted the Administrative Monitors provided by Jenkins core

* [JENKINS-43786] Addressed the @daniel-beck's review

* [JENKINS-43786] Wrong indent

* [JENKINS-43786] Better semantic HTML

* [JENKINS-43786] Better semantic HTML

* [JENKINS-43786] Applying the same criteria for listing items

* [JENKINS-43786] Adapted tests

* [JENKINS-43786] Removing redirect links in the administrative monitor descriptions

* [JENKINS-43786] Adapted Administrative Monitor

* [JENKINS-43786] Reverted Redirect URLs

* [JENKINS-43786] Applying the same code style

* [JENKINS-43786] Applying the same code style

* [JENKINS-43786] Apply a common HTML markup to the Administrative Monitors in core

* [JENKINS-43786] One more Administrative Monitor updated

* [JENKINS-43786] Polishing some details

* [JENKINS-43786] Deprecating CSS Styles

* [JENKINS-43786] We are ready for deprecating anything

* [JENKINS-43786] We are ready for deprecating anything

* [JENKINS-43786] Details
2018-01-21 14:28:51 +01:00
Vincent Latombe 0311b2dffa [FIXES JENKINS-47406] Milestone JOB_LOADED is now attained after cleaning up obsolete items (#3078)
* [FIXES JENKINS-47406] Milestone JOB_LOADED is now attained after cleaning up obsolete items

This allows @Initializer(after=InitMilestone.JOB_LOADED) implementations
to create items safely without risking them to be removed.

* [JENKINS-47406] Add test with an initializer creating a job

* Revert "[FIXES JENKINS-47406] Milestone JOB_LOADED is now attained after cleaning up obsolete items"

This reverts commit 79ce796b00.

* [JENKINS-47406] Reinstate the test with Jesse's solution

* Reverted this commit by mistake

Revert "Revert "[FIXES JENKINS-47406] Milestone JOB_LOADED is now attained after cleaning up obsolete items""

This reverts commit 36c499c58c.

* Add link to hpi sources

* Fix Mix-up after the previous merge
2018-01-21 08:38:52 +01:00
Jesse Glick 64d5e84074 Confirming that RobustReflectionConverter gracefully handles loading of configuration fields now blocked by JEP-200. 2018-01-19 15:27:05 -05:00
Jesse Glick 01c46ba29d Removing XStream2Security247Test as it no longer reproduces SECURITY-247. 2018-01-16 18:53:09 -05:00
Oleg Nenashev 260a2576f2 [JENKINS-48946] - Move whitelist ordering test to core to fail fast 2018-01-15 20:02:58 +01:00
Kohsuke Kawaguchi d50004fa4e [maven-release-plugin] prepare for next development iteration 2018-01-14 18:13:39 -08:00
Kohsuke Kawaguchi 066252ee56 [maven-release-plugin] prepare release jenkins-2.102 2018-01-14 18:13:39 -08:00
Jesse Glick 3a99c2c6fd Merge branch 'master' of github.com:jenkinsci/jenkins 2018-01-12 17:40:48 -05:00
Baptiste Mathus 438e9296f0 Merge pull request #3170 from batmat/JENKINS-34855
[FIX JENKINS-34855] Create a FileChannelWriter and use it for AtomicFileWriter "enforced" flushing
2018-01-12 10:30:32 +01:00
Jesse Glick 5a24186d3c Merge branch 'master' into whitelist-JENKINS-47736 2018-01-08 10:48:06 -05:00
Kohsuke Kawaguchi 4dbe772a0b [maven-release-plugin] prepare for next development iteration 2018-01-07 18:20:10 -08:00
Kohsuke Kawaguchi 235a9bad68 [maven-release-plugin] prepare release jenkins-2.101 2018-01-07 18:20:10 -08:00
Oleg Nenashev a79fdaa4b3 Revert "[JENKINS-46911] createProjectFromXML not recognizing unsafe character…" (#3218)
* Revert "[JENKINS-48447] Fixed HTTP 404 error when clicking on newView sidebar link from an other view. (#3178)"

This reverts commit 6df06fc19a.

* Revert "[JENKINS-46911] createProjectFromXML not recognizing unsafe character… (#3057)"

This reverts commit ac2a1aaf89.
2018-01-07 18:26:57 +01:00
godfath3r ac2a1aaf89 [JENKINS-46911] createProjectFromXML not recognizing unsafe character… (#3057)
* [JENKINS-46911] createProjectFromXML not recognizing unsafe character '/'

* Better place for testCreateProjectCheckGoodName()

* Fix failed test

* Make changes suggested on PR review.

* Remove Failure exception, instead throw IOException. Add javadoc

* [JENKINS-46911] - Add TODO according to the comment from @jtnord.
2018-01-07 14:39:10 +01:00
Jesse Glick ba5516aa7c Merge branch 'master' into whitelist-JENKINS-47736 2018-01-04 14:03:26 -05:00
Kohsuke Kawaguchi c4e912900b [maven-release-plugin] prepare for next development iteration 2018-01-03 15:48:04 -08:00
Kohsuke Kawaguchi 5707ff1766 [maven-release-plugin] prepare release jenkins-2.100 2018-01-03 15:48:04 -08:00
Jesse Glick 710c6e4b30 Merge branch 'master' into whitelist-JENKINS-47736 2018-01-03 17:54:45 -05:00
Oleg Nenashev 8eb4254b0f Merge pull request #3212 from oleg-nenashev/bug/JENKINS-48761-remoting-API
[JENKINS-48761] - Restore binary compatibility with agents running old Remoting versions
2018-01-03 23:35:56 +01:00
Oleg Nenashev 01b8ed8c71 [JENKINS-48761] - Address review comments from @jglick 2018-01-03 20:59:11 +01:00
Oleg Nenashev 8a34983d45 [JENKINS-48761] - Create a smoke test for old agents 2018-01-03 13:19:48 +01:00
Jesse Glick a544cb79f8 Merge branch 'master' into whitelist-JENKINS-47736 2018-01-02 10:12:28 -05:00
Kohsuke Kawaguchi 99ca101143 [maven-release-plugin] prepare for next development iteration 2017-12-31 18:15:37 -08:00
Kohsuke Kawaguchi 7975ee0cf9 [maven-release-plugin] prepare release jenkins-2.99 2017-12-31 18:15:37 -08:00
Oleg Nenashev 16042bd57b Merge pull request #3196 from jglick/unmarshal-JENKINS-21017
[JENKINS-21017] When unmarshalling into an existing object, reset missing fields
2017-12-29 11:56:08 +01:00
Oleg Nenashev 7e67c03a9b Merge branch 'master' into whitelist-JENKINS-47736
# Conflicts:
#	pom.xml
2017-12-28 22:30:37 +01:00
Kohsuke Kawaguchi 0ac93deba0 [maven-release-plugin] prepare for next development iteration 2017-12-25 01:03:42 -08:00
Kohsuke Kawaguchi 101a6cd44a [maven-release-plugin] prepare release jenkins-2.98 2017-12-25 01:03:41 -08:00
Oleg Nenashev cb3990a4d6 Update to Remoting 3.15 and Cleanup issues in Channel#current() usages (#3145)
Pulls in fixes for: JENKINS-48133, JENKINS-48055, JENKINS-37566, JENKINS-48309, JENKINS-47965, JENKINS-48130, JENKINS-37670, JENKINS-37566, JENKINS-46724 

This change also adds some missing null/closing channel checks in the core.
In some cases the change prevents spawning threads if the channel is in the invalid state.
2017-12-22 18:02:44 +01:00
Wadeck Follonier 02035017b6 Ensure all Jelly view have escape-by-default. (#3180)
* Ensure all Jelly view have escape-by-default.
- all those views escape the content theirself, so no vulnerability corrected here (for TextParameterDefinition, it's done by textarea.jelly)

* - just a line break at end

* - just a line break at end (part 2)

* - change from st:out to j:out because their content is expected to be html tags

* - st => j for all finally
2017-12-22 17:27:13 +01:00
Jesse Glick b8d236c658 Merge branch 'master' into whitelist-JENKINS-47736 2017-12-21 12:08:58 -05:00
Jesse Glick 837d0c90ac Allow whitelists to contain blank lines and comments. 2017-12-19 15:05:11 -05:00
Kohsuke Kawaguchi 90f778d281 [maven-release-plugin] prepare for next development iteration 2017-12-19 11:48:27 -08:00
Kohsuke Kawaguchi 5f2a40ba96 [maven-release-plugin] prepare release jenkins-2.97 2017-12-19 11:48:27 -08:00
Jesse Glick dfc1940eee Merge branch 'master' into whitelist-JENKINS-47736 2017-12-19 14:34:57 -05:00