Skip to content

Commit

Permalink
Update to the latest Jackson versions (#41329)
Browse files Browse the repository at this point in the history
Update to the latest Jackson versions
  • Loading branch information
alzimmermsft authored Jul 30, 2024
1 parent 3097285 commit b9d8683
Show file tree
Hide file tree
Showing 32 changed files with 181 additions and 93 deletions.
4 changes: 2 additions & 2 deletions common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<rules>
<bannedDependencies>
<includes combine.children="append">
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.82]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand Down
2 changes: 1 addition & 1 deletion eng/bomgenerator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
32 changes: 20 additions & 12 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@
# groupId:artifactId;dependency-version
ch.qos.logback:logback-classic;1.3.14
com.azure.tools:azure-autorest-customization;1.0.0-beta.8
com.fasterxml.jackson.core:jackson-annotations;2.13.5
com.fasterxml.jackson.core:jackson-core;2.13.5
com.fasterxml.jackson.core:jackson-databind;2.13.5
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.5
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.5
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.5
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.5
com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.5
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.5
com.fasterxml.woodstox:woodstox-core;6.4.0
com.fasterxml.jackson.core:jackson-annotations;2.17.2
com.fasterxml.jackson.core:jackson-core;2.17.2
com.fasterxml.jackson.core:jackson-databind;2.17.2
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.17.2
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.17.2
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.17.2
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.17.2
com.fasterxml.jackson.module:jackson-module-afterburner;2.17.2
com.fasterxml.jackson.module:jackson-module-blackbird;2.17.2
com.fasterxml.jackson.module:jackson-module-parameter-names;2.17.2
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.17.2
com.github.spotbugs:spotbugs;4.8.3
com.github.spotbugs:spotbugs-annotations;4.8.3
com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0
Expand Down Expand Up @@ -351,8 +352,6 @@ org.testcontainers:junit-jupiter;1.17.6
test_jar_com.microsoft.azure:azure-mgmt-resources;1.3.1-SNAPSHOT

# everything under sdk\cosmos
cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.13.5
cosmos_com.fasterxml.jackson.module:jackson-module-blackbird;2.13.5
cosmos_com.google.guava:guava;33.0.0-jre
cosmos_com.microsoft.data.encryption:cryptography;0.2.2.jre8-preview
cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.2.2.jre8-preview
Expand All @@ -364,6 +363,7 @@ cosmos_org.hdrhistogram:HdrHistogram;2.1.12
cosmos_org.codehaus.mojo:build-helper-maven-plugin;3.5.0
cosmos_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.15.2
cosmos_com.fasterxml.jackson.core:jackson-databind;2.15.2
cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.15.2
cosmos_com.fasterxml.jackson.module:jackson-module-scala_2.12;2.15.2

## Cosmos Spark connector under sdk\cosmos\azure-cosmos-spark_3-1_2-12\pom.xml
Expand Down Expand Up @@ -546,3 +546,11 @@ springboot3_org.springframework:spring-webmvc;6.1.11
springboot3_org.testcontainers:testcontainers;1.19.8
springboot3_org.testcontainers:junit-jupiter;1.19.8
springboot3_org.testcontainers:azure;1.19.8

# Java 7 support

# Jackson dropped support for Java 7 with the release of 2.14.0.
# Add custom Jackson dependencies for Track 1 libraries using Jackson.
java7support_com.fasterxml.jackson.core:jackson-annotations;2.13.5
java7support_com.fasterxml.jackson.core:jackson-core;2.13.5
java7support_com.fasterxml.jackson.core:jackson-databind;2.13.5
2 changes: 1 addition & 1 deletion sdk/batch/microsoft-azure-batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<version>2.13.5</version> <!-- {x-version-update;java7support_com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions sdk/clientcore/core-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
</dependency>
</dependencies>

Expand Down Expand Up @@ -211,7 +211,7 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-core:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-core:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
4 changes: 2 additions & 2 deletions sdk/clientcore/http-stress/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.38.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<version>1.40.0</version> <!-- {x-version-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -89,7 +89,7 @@
<include>io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:[2.6.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;external_dependency} -->
<include>io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0:[2.6.0-alpha]</include> <!-- {x-include-update;io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;external_dependency} -->
<include>ch.qos.logback:logback-classic:[1.3.14]</include> <!-- {x-include-update;ch.qos.logback:logback-classic;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.38.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
<include>io.opentelemetry:opentelemetry-api:[1.40.0]</include> <!-- {x-include-update;io.opentelemetry:opentelemetry-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-perf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
Expand Down Expand Up @@ -113,7 +113,7 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.github.tomakehurst:wiremock-jre8-standalone:[2.35.1]</include> <!-- {x-include-update;com.github.tomakehurst:wiremock-jre8-standalone;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-serializer-avro-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-avro</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -120,7 +120,7 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
20 changes: 10 additions & 10 deletions sdk/core/azure-core-serializer-json-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,28 +97,28 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -166,11 +166,11 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-annotations:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-core:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-annotations:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-core:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
10 changes: 10 additions & 0 deletions sdk/core/azure-core-serializer-json-jackson/spotbugs-exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,14 @@
<Class name="com.azure.core.serializer.json.jackson.implementation.ObjectMapperShim" />
<Method name="&lt;init&gt;" />
</Match>

<Match>
<Bug pattern="SE_INNER_CLASS" />
<Class name="com.azure.core.serializer.json.jackson.implementation.JacksonDatabind212$1$1" />
</Match>

<Match>
<Bug pattern="SE_NO_SERIALVERSIONID" />
<Class name="com.azure.core.serializer.json.jackson.implementation.OptionPropertiesModifier" />
</Match>
</FindBugsFilter>
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public void serialize(Person person, JsonGenerator generator, SerializerProvider

private static final class PersonDeserializer extends JsonDeserializer<Person> {

@SuppressWarnings("deprecation")
@Override
public Person deserialize(JsonParser parser, DeserializationContext context) throws IOException {
String name = "John Doe";
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.17.2</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -156,7 +156,7 @@
<bannedDependencies>
<includes>
<include>io.projectreactor:reactor-test:[3.4.38]</include> <!-- {x-include-update;io.projectreactor:reactor-test;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty-http:[1.0.45]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
<!-- special allowance for azure-core-test as it is not a shipping library: -->
<include>org.junit.jupiter:junit-jupiter-api:[5.9.3]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
Expand Down
Loading

0 comments on commit b9d8683

Please sign in to comment.