Skip to content

Conversation

@dg-nvm
Copy link
Contributor

@dg-nvm dg-nvm commented Feb 6, 2020

I believe this was the intention as 2.199 has the conflicting check too

@dg-nvm dg-nvm requested a review from a team as a code owner February 6, 2020 13:21
@timja timja added the documentation A PR that adds to documentation - used by Release Drafter label Feb 6, 2020
@timja timja merged commit 0e45556 into jenkinsci:master Feb 6, 2020
LinuxSuRen pushed a commit to alauda/configuration-as-code-plugin that referenced this pull request Feb 21, 2020
* Add support to backup and restore automatically

* Fix the potential output resource leak

* Add configs about deploy into alauda update-center

* Set alauda as the main branch

* Add sonarqube properties file

* Fix the potentital issues

* Add a merge strategy extension point for the YAML config (#1)

* Add YAML merge strategy

* Add a new merge strategy

* Remove override merge strategy

* Clean the unused code lines

* Clean the unused imports

* Add test cases for merge strategy

* Fix the wrong test cases

* Take merge strategy name everytime

* Give the default strategy a more readable name

* Validate top README with the Integrations tests (jenkinsci#1229)

* Fix the compilation error caused by merge strategy

* Fix issues which found by spotbugs

* Remove unused imports

* Move profiles from pom.xml into settings file

* Remove empty line

* rename the shared-library

* Schema Generation for nested yml configurations (jenkinsci#1027)

* Trying to diagnose some flaky tests (jenkinsci#1243)

* Update ci to include code coverage after jenkinsci#1215 (jenkinsci#1241)

Co-authored-by: Oleg Nenashev <o.v.nenashev@gmail.com>

* Checkstyle ignore release.properties (jenkinsci#1245)

* [maven-release-plugin] prepare release configuration-as-code-1.35

* [maven-release-plugin] prepare for next development iteration

* Bump jackson.version from 2.10.1 to 2.10.2

Bumps `jackson.version` from 2.10.1 to 2.10.2.

Updates `jackson-databind` from 2.10.1 to 2.10.2
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `jackson-dataformat-yaml` from 2.10.1 to 2.10.2
- [Release notes](https://github.com/FasterXML/jackson-dataformats-text/releases)
- [Commits](FasterXML/jackson-dataformats-text@jackson-dataformats-text-2.10.1...jackson-dataformats-text-2.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Correct spelling of hpi.pluginChangelogUrl tag (jenkinsci#1248)

* Automatically request code reviews from all JCasC plugin developers (jenkinsci#1249)

* [Security] Bump checkstyle from 8.26 to 8.29

Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.26 to 8.29. **This update includes a security fix.**
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](checkstyle/checkstyle@checkstyle-8.26...checkstyle-8.29)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* It has been renamed to `master.componentName` (jenkinsci#1256)

Co-authored-by: Tim Jacomb <t.jacomb@kainos.com>

* Fix the version specification for Jenkins 2.199 (jenkinsci#1268)

* Added example for credentials certificate (jenkinsci#1270)

* Use the latest shared-library branch

* Update test to match latest plugin version (jenkinsci#1273)

* Update the integration test for active-directory (jenkinsci#1274)

* Add integration test for pipeline-model-definition (jenkinsci#1276)

* Fix the error when no casc user dir (#5)

* Add missing of mode in the context

* Use the same version of jackson-core

* Use the same version of jackson-core

* Use 2.8 as the major version

* Fix the wrong parent id for the plugin releasing

* Move the user config into a backup dir

* Run build under java pod

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Sladyn <sladynnunes98@gmail.com>
Co-authored-by: Jesse Glick <jglick@cloudbees.com>
Co-authored-by: Joseph Petersen <josephp90@gmail.com>
Co-authored-by: Oleg Nenashev <o.v.nenashev@gmail.com>
Co-authored-by: Tim Jacomb <t.jacomb@kainos.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
Co-authored-by: Jhon Mike <jhon.msdev@gmail.com>
Co-authored-by: Dawid Gosławski <50369002+dg-nvm@users.noreply.github.com>
Co-authored-by: choeffer <33625292+choeffer@users.noreply.github.com>
Co-authored-by: Francisco Fernández <31063239+fcojfernandez@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation A PR that adds to documentation - used by Release Drafter

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants