Skip to content

Commit bb43658

Browse files
authored
Merge pull request #340 from jonesbusy/feature/jackson-update
Update to 2.22.0 and combinate several deps update
2 parents 29efdb7 + 6c2c517 commit bb43658

1 file changed

Lines changed: 20 additions & 19 deletions

File tree

pom.xml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.jenkins-ci.plugins</groupId>
2323
<artifactId>plugin</artifactId>
24-
<version>6.2138.v03274d462c13</version>
24+
<version>6.2189.v695a_c41f5249</version>
2525
<relativePath />
2626
</parent>
2727

@@ -70,14 +70,15 @@
7070
</scm>
7171

7272
<properties>
73-
<revision>2.21.2</revision>
73+
<revision>2.22.0</revision>
7474
<changelist>999999-SNAPSHOT</changelist>
7575
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
76-
<jenkins.baseline>2.479</jenkins.baseline>
77-
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
76+
<jenkins.baseline>2.528</jenkins.baseline>
77+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
7878
<hpi.bundledArtifacts>jackson-core,jackson-databind,jackson-dataformat-cbor,jackson-dataformat-csv,jackson-dataformat-toml,jackson-dataformat-xml,jackson-dataformat-yaml,jackson-datatype-jdk8,jackson-datatype-json-org,jackson-datatype-jsr310,jackson-module-jakarta-xmlbind-annotations,jackson-module-jaxb-annotations,jackson-module-parameter-names</hpi.bundledArtifacts>
7979
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
8080
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
81+
<banObsoleteDependencyOverrides.skip>false</banObsoleteDependencyOverrides.skip>
8182
</properties>
8283

8384
<repositories>
@@ -105,35 +106,29 @@
105106
<dependency>
106107
<groupId>io.jenkins.tools.bom</groupId>
107108
<artifactId>bom-${jenkins.baseline}.x</artifactId>
108-
<version>4136.vca_c3202a_7fd1</version>
109+
<version>6607.v3ed3d8ddfed8</version>
109110
<scope>import</scope>
110111
<type>pom</type>
111112
</dependency>
112-
<!-- TODO until in BOM -->
113-
<dependency>
114-
<groupId>io.jenkins.plugins</groupId>
115-
<artifactId>jakarta-xml-bind-api</artifactId>
116-
<version>4.0.5-3.v3d5b_a_73965b_9</version>
117-
</dependency>
118-
<!-- TODO until in BOM -->
119-
<dependency>
120-
<groupId>io.jenkins.plugins</groupId>
121-
<artifactId>woodstox-core-api</artifactId>
122-
<version>7.1.1-1.v4d297985f397</version>
123-
</dependency>
124113
</dependencies>
125114
</dependencyManagement>
126115

127116
<dependencies>
128117
<dependency>
129118
<groupId>io.jenkins.plugins</groupId>
130119
<artifactId>jackson-annotations2-api</artifactId>
131-
<version>2.21-7.v4777a_f3a_a_d47</version>
132120
</dependency>
133121

134122
<dependency>
135123
<groupId>com.fasterxml.jackson.core</groupId>
136124
<artifactId>jackson-databind</artifactId>
125+
<exclusions>
126+
<!-- Provided by jackson-annotations2-api plugin -->
127+
<exclusion>
128+
<groupId>com.fasterxml.jackson.core</groupId>
129+
<artifactId>jackson-annotations</artifactId>
130+
</exclusion>
131+
</exclusions>
137132
</dependency>
138133

139134
<dependency>
@@ -215,16 +210,22 @@
215210
<dependency>
216211
<groupId>com.fasterxml.jackson.dataformat</groupId>
217212
<artifactId>jackson-dataformat-xml</artifactId>
218-
<!-- Provided by woodstox-core API plugin -->
219213
<exclusions>
214+
<!-- Provided by woodstox-core API plugin -->
220215
<exclusion>
221216
<groupId>com.fasterxml.woodstox</groupId>
222217
<artifactId>woodstox-core</artifactId>
223218
</exclusion>
219+
<!-- Provided by woodstox-core API plugin -->
224220
<exclusion>
225221
<groupId>org.codehaus.woodstox</groupId>
226222
<artifactId>stax2-api</artifactId>
227223
</exclusion>
224+
<!-- Provided by jackson-annotations2-api plugin -->
225+
<exclusion>
226+
<groupId>com.fasterxml.jackson.core</groupId>
227+
<artifactId>jackson-annotations</artifactId>
228+
</exclusion>
228229
</exclusions>
229230
</dependency>
230231

0 commit comments

Comments
 (0)