Skip to content

Commit

Permalink
Upgrade Jackson and Netty Patch Versions (Azure#20206)
Browse files Browse the repository at this point in the history
  • Loading branch information
alzimmermsft authored Mar 29, 2021
1 parent 767628a commit 7a97320
Show file tree
Hide file tree
Showing 24 changed files with 114 additions and 114 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 @@ -51,7 +51,7 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

<!-- special allowance for perf-test-core as it is not a shipping library: -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
Expand All @@ -69,7 +69,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand Down
38 changes: 19 additions & 19 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

# Format;
# groupId:artifactId;dependency-version
com.fasterxml.jackson.core:jackson-annotations;2.12.1
com.fasterxml.jackson.core:jackson-core;2.12.1
com.fasterxml.jackson.core:jackson-databind;2.12.1
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.1
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.1
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.1
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.1
com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.1
com.fasterxml.jackson.core:jackson-annotations;2.12.2
com.fasterxml.jackson.core:jackson-core;2.12.2
com.fasterxml.jackson.core:jackson-databind;2.12.2
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.2
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.2
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.2
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.2
com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.2
com.github.spotbugs:spotbugs;4.2.0
com.github.spotbugs:spotbugs-annotations;4.2.0
com.github.spotbugs:spotbugs-maven-plugin;4.2.0
Expand Down Expand Up @@ -46,18 +46,18 @@ io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.6.4
io.micrometer:micrometer-registry-azure-monitor;1.6.4
io.micrometer:micrometer-registry-graphite;1.6.4
io.netty:netty-buffer;4.1.59.Final
io.netty:netty-common;4.1.59.Final
io.netty:netty-codec-http;4.1.59.Final
io.netty:netty-codec-http2;4.1.59.Final
io.netty:netty-transport;4.1.59.Final
io.netty:netty-handler;4.1.59.Final
io.netty:netty-handler-proxy;4.1.59.Final
io.netty:netty-buffer;4.1.60.Final
io.netty:netty-common;4.1.60.Final
io.netty:netty-codec-http;4.1.60.Final
io.netty:netty-codec-http2;4.1.60.Final
io.netty:netty-transport;4.1.60.Final
io.netty:netty-handler;4.1.60.Final
io.netty:netty-handler-proxy;4.1.60.Final
io.netty:netty-tcnative;2.0.36.Final
io.netty:netty-tcnative-boringssl-static;2.0.36.Final
io.netty:netty-transport-native-epoll;4.1.59.Final
io.netty:netty-transport-native-unix-common;4.1.59.Final
io.netty:netty-transport-native-kqueue;4.1.59.Final
io.netty:netty-transport-native-epoll;4.1.60.Final
io.netty:netty-transport-native-unix-common;4.1.60.Final
io.netty:netty-transport-native-kqueue;4.1.60.Final
io.projectreactor.netty:reactor-netty;1.0.4
io.projectreactor:reactor-core;3.4.3
io.reactivex:rxjava;1.3.8
Expand Down Expand Up @@ -278,7 +278,7 @@ org.revapi:revapi-maven-plugin;0.11.2
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.12.1
cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.12.2
cosmos_com.google.guava:guava;25.0-jre
cosmos_com.microsoft.data.encryption:cryptography;0.1.0.jre8-preview
cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.1.0.jre8-preview
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -160,8 +160,8 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-annotations:[2.12.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-annotations:[2.12.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>javax.annotation:javax.annotation-api:[1.3.2]</include> <!-- {x-include-update;javax.annotation:javax.annotation-api;external_dependency} -->
<include>org.apache.commons:commons-lang3:[3.11]</include> <!-- {x-include-update;org.apache.commons:commons-lang3;external_dependency} -->
<include>org.apache.httpcomponents:httpclient:[4.5.13]</include> <!-- {x-include-update;org.apache.httpcomponents:httpclient;external_dependency} -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
Expand Down Expand Up @@ -82,8 +82,8 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-annotations:[2.12.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-annotations:[2.12.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[1.0.4]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter:[2.4.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework:spring-context:[5.3.4]</include> <!-- {x-include-update;org.springframework:spring-context;external_dependency} -->
Expand Down
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.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
<scope>test</scope>
</dependency>

Expand Down
32 changes: 16 additions & 16 deletions sdk/core/azure-core-http-netty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,44 +66,44 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.59.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.60.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>

Expand Down Expand Up @@ -184,15 +184,15 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[1.0.4]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.59.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.60.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
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 @@ -69,7 +69,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-avro</artifactId>
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -108,7 +108,7 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.12.1]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.12.2]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-avro;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
Loading

0 comments on commit 7a97320

Please sign in to comment.