Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

do not bundle a library whose classes are already provideded by core #96

Merged
merged 3 commits into from
Oct 1, 2021
Merged

do not bundle a library whose classes are already provideded by core #96

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecfe47d
do not bundle a library whose classes are already provideded by core
jtnord Oct 1, 2021
a2f5037
fix the version for the release
jtnord Oct 1, 2021
bca7c64
set the revision of the plugin to the version of jackson
jtnord Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
</scm>

<properties>
<revision>2.12.5</revision>
<revision>${jackson.version}-1</revision>
<changelist>-SNAPSHOT</changelist>
<java.level>8</java.level>
<jenkins.version>2.222.4</jenkins.version>
<jenkins.version>2.249.1</jenkins.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jenkinsci/jenkins#4660 was in 2.235 using an LTS that is newer than that

<jackson.version>2.12.4</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
</properties>
Expand All @@ -89,8 +89,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.222.x</artifactId>
<version>887.vae9c8ac09ff7</version>
<artifactId>bom-2.249.x</artifactId>
<version>966.v3857b7c82032</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -144,6 +144,17 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
<exclusions>
<exclusion>
<!--
Jenkins core ships jakarta.activation:jakarta.activation (ie the impl which contains both api and impl classes) version 1.2.1
since https://github.com/jenkinsci/jenkins/pull/4660 via transitive dependency on jakarta-mail
Need to be careful here if the annotations (or core) pick up newer versions that change the package names.
-->
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down