Skip to content

Commit

Permalink
[TFMonhHx] Forces new version of netty (#450)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ncordon
ncordon committed Jul 4, 2023
1 parent 6816dbe commit fe30339
Show file tree
Hide file tree
Showing 4 changed files with 344 additions and 5 deletions.
29 changes: 29 additions & 0 deletions LICENSES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,19 @@ Apache-2.0
WMI4Java-1.6.3.jar
accessors-smart-2.4.9.jar
annotations-17.0.0.jar
<<<<<<< HEAD
apiguardian-api-1.1.0.jar
=======
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
arrow-format-12.0.1.jar
arrow-memory-core-12.0.1.jar
arrow-memory-netty-12.0.1.jar
arrow-vector-12.0.1.jar
<<<<<<< HEAD
assertj-core-3.18.1.jar
=======
assertj-core-3.24.2.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
audience-annotations-0.5.0.jar
avro-1.7.7.jar
awaitility-4.1.0.jar
Expand Down Expand Up @@ -101,6 +108,7 @@ Apache-2.0
jackson-core-2.13.4.jar
jackson-core-2.15.1.jar
jackson-core-asl-1.9.13.jar
<<<<<<< HEAD
jackson-databind-2.13.4.2.jar
jackson-databind-2.15.1.jar
jackson-dataformat-cbor-2.15.1.jar
Expand All @@ -110,6 +118,15 @@ Apache-2.0
jackson-jaxrs-base-2.15.1.jar
jackson-jaxrs-json-provider-2.13.4.jar
jackson-jaxrs-json-provider-2.15.1.jar
=======
jackson-databind-2.15.2.jar
jackson-dataformat-cbor-2.15.2.jar
jackson-dataformat-csv-2.15.2.jar
jackson-datatype-jsr310-2.15.1.jar
jackson-datatype-jsr310-2.15.2.jar
jackson-jaxrs-base-2.15.2.jar
jackson-jaxrs-json-provider-2.15.2.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
jackson-mapper-asl-1.9.13.jar
jackson-module-jaxb-annotations-2.13.4.jar
jackson-module-jaxb-annotations-2.15.1.jar
Expand Down Expand Up @@ -173,10 +190,16 @@ Apache-2.0
metrics-core-3.2.4.jar
netty-3.10.6.Final.jar
netty-all-4.1.89.Final.jar
<<<<<<< HEAD
netty-buffer-4.1.86.Final.jar
netty-buffer-4.1.89.Final.jar
netty-codec-4.1.86.Final.jar
netty-codec-4.1.89.Final.jar
=======
netty-buffer-4.1.93.Final.jar
netty-buffer-4.1.94.Final.jar
netty-codec-4.1.93.Final.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
netty-codec-dns-4.1.89.Final.jar
netty-codec-haproxy-4.1.89.Final.jar
netty-codec-http-4.1.86.Final.jar
Expand All @@ -189,10 +212,16 @@ Apache-2.0
netty-codec-socks-4.1.89.Final.jar
netty-codec-stomp-4.1.89.Final.jar
netty-codec-xml-4.1.89.Final.jar
<<<<<<< HEAD
netty-common-4.1.86.Final.jar
netty-common-4.1.89.Final.jar
netty-handler-4.1.86.Final.jar
netty-handler-4.1.89.Final.jar
=======
netty-common-4.1.93.Final.jar
netty-common-4.1.94.Final.jar
netty-handler-4.1.93.Final.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
netty-handler-proxy-4.1.89.Final.jar
netty-handler-ssl-ocsp-4.1.89.Final.jar
netty-resolver-4.1.86.Final.jar
Expand Down
29 changes: 29 additions & 0 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,19 @@ Apache-2.0
WMI4Java-1.6.3.jar
accessors-smart-2.4.9.jar
annotations-17.0.0.jar
<<<<<<< HEAD
apiguardian-api-1.1.0.jar
=======
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
arrow-format-12.0.1.jar
arrow-memory-core-12.0.1.jar
arrow-memory-netty-12.0.1.jar
arrow-vector-12.0.1.jar
<<<<<<< HEAD
assertj-core-3.18.1.jar
=======
assertj-core-3.24.2.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
audience-annotations-0.5.0.jar
avro-1.7.7.jar
awaitility-4.1.0.jar
Expand Down Expand Up @@ -131,6 +138,7 @@ Apache-2.0
jackson-core-2.13.4.jar
jackson-core-2.15.1.jar
jackson-core-asl-1.9.13.jar
<<<<<<< HEAD
jackson-databind-2.13.4.2.jar
jackson-databind-2.15.1.jar
jackson-dataformat-cbor-2.15.1.jar
Expand All @@ -140,6 +148,15 @@ Apache-2.0
jackson-jaxrs-base-2.15.1.jar
jackson-jaxrs-json-provider-2.13.4.jar
jackson-jaxrs-json-provider-2.15.1.jar
=======
jackson-databind-2.15.2.jar
jackson-dataformat-cbor-2.15.2.jar
jackson-dataformat-csv-2.15.2.jar
jackson-datatype-jsr310-2.15.1.jar
jackson-datatype-jsr310-2.15.2.jar
jackson-jaxrs-base-2.15.2.jar
jackson-jaxrs-json-provider-2.15.2.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
jackson-mapper-asl-1.9.13.jar
jackson-module-jaxb-annotations-2.13.4.jar
jackson-module-jaxb-annotations-2.15.1.jar
Expand Down Expand Up @@ -203,10 +220,16 @@ Apache-2.0
metrics-core-3.2.4.jar
netty-3.10.6.Final.jar
netty-all-4.1.89.Final.jar
<<<<<<< HEAD
netty-buffer-4.1.86.Final.jar
netty-buffer-4.1.89.Final.jar
netty-codec-4.1.86.Final.jar
netty-codec-4.1.89.Final.jar
=======
netty-buffer-4.1.93.Final.jar
netty-buffer-4.1.94.Final.jar
netty-codec-4.1.93.Final.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
netty-codec-dns-4.1.89.Final.jar
netty-codec-haproxy-4.1.89.Final.jar
netty-codec-http-4.1.86.Final.jar
Expand All @@ -219,10 +242,16 @@ Apache-2.0
netty-codec-socks-4.1.89.Final.jar
netty-codec-stomp-4.1.89.Final.jar
netty-codec-xml-4.1.89.Final.jar
<<<<<<< HEAD
netty-common-4.1.86.Final.jar
netty-common-4.1.89.Final.jar
netty-handler-4.1.86.Final.jar
netty-handler-4.1.89.Final.jar
=======
netty-common-4.1.93.Final.jar
netty-common-4.1.94.Final.jar
netty-handler-4.1.93.Final.jar
>>>>>>> a312e4495 ([TFMonhHx] Forces new version of netty (#450))
netty-handler-proxy-4.1.89.Final.jar
netty-handler-ssl-ocsp-4.1.89.Final.jar
netty-resolver-4.1.86.Final.jar
Expand Down
13 changes: 8 additions & 5 deletions core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,19 @@ dependencies {

compile group: 'xerces', name: 'xercesImpl', version: '2.12.2'

compile group: 'org.apache.arrow', name: 'arrow-vector', version: '12.0.1', {
def arrowExclusions = {
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
exclude group: 'io.netty', module: 'netty-common'
}
compile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '12.0.1', {
exclude group: 'com.google.guava', module: 'guava'
exclude group: 'io.netty', module: 'netty-common'
exclude group: 'io.netty', module: 'netty-buffer'

compile group: 'org.apache.arrow', name: 'arrow-vector', version: '12.0.1', arrowExclusions
compile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '12.0.1', arrowExclusions
compile group: 'io.netty', name: 'netty-buffer', {
version {
strictly '4.1.94.Final'
}
}
testCompile group: 'org.apache.arrow', name: 'arrow-vector', version: '12.0.1'
testCompile group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '12.0.1'
Expand Down
Loading

0 comments on commit fe30339

Please sign in to comment.