Fixups to recent changes #1873
Fixups to recent changes #1873
Conversation
| <dependency> | ||
| <groupId>io.jenkins.plugins</groupId> | ||
| <artifactId>jquery3-api</artifactId> | ||
| <version>3.6.1-2</version> | ||
| </dependency> |
There was a problem hiding this comment.
Duplicate of the preceding 5 lines.
| <dependency> | ||
| <groupId>io.jenkins.plugins</groupId> | ||
| <artifactId>plugin-util-api</artifactId> | ||
| <version>${plugin-util-api.version}</version> | ||
| </dependency> |
There was a problem hiding this comment.
Duplicate of the subsequent 5 lines.
| # TODO remove when email-ext merges and releases https://github.com/jenkinsci/email-ext-plugin/pull/431 | ||
| hudson.plugins.emailext.ExtendedEmailPublisherDescriptorTest |
There was a problem hiding this comment.
No longer needed after the release of jenkinsci/email-ext-plugin#431 and its subsequent adoption in this repository.
| @@ -15,7 +15,6 @@ | |||
| <changelist>999999-SNAPSHOT</changelist> | |||
| <bom>weekly</bom> | |||
| <jenkins.version>2.395</jenkins.version> | |||
| <kotlin.version>1.8.10</kotlin.version> | |||
There was a problem hiding this comment.
#1851 was incomplete: it removed the last consumer of this property but not the property itself.
| <exclusions> | ||
| <!-- TODO conflict with configuration-as-code --> | ||
| <exclusion> | ||
| <groupId>org.jetbrains</groupId> | ||
| <artifactId>annotations</artifactId> | ||
| </exclusion> | ||
| </exclusions> |
There was a problem hiding this comment.
No longer needed after jenkinsci/okhttp-api-plugin#144 and its subsequent adoption in this repository.
There was a problem hiding this comment.
Thanks very much for the repairs. My enthusiasm to merge the backlog of pull requests allowed me to make mistakes during the merge processing.
The need for the first two changes has also been applied to pending pull request in
I missed the other changes completely. Thanks again for fixing the mistakes!
Recent changes have left this repository in a bit of a mess.