diff --git a/FIPS/pom.xml b/FIPS/pom.xml index 13e7db8f4..0b874551d 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -589,7 +589,9 @@ - + + + META-INF/io.netty.versions.properties diff --git a/TestOnly/pom.xml b/TestOnly/pom.xml index 0b8143b5f..e03f87ef1 100644 --- a/TestOnly/pom.xml +++ b/TestOnly/pom.xml @@ -27,12 +27,12 @@ io.netty netty-common - 4.1.111.Final + 4.1.115.Final io.netty netty-buffer - 4.1.111.Final + 4.1.115.Final org.apache.maven.plugins diff --git a/dependencies/Readme.md b/dependencies/Readme.md index 5abaea2ae..28afe4031 100644 --- a/dependencies/Readme.md +++ b/dependencies/Readme.md @@ -1,2 +1,2 @@ -Arrow dependencies are built from internal branch `upgradeTo17.0.0-v2`. This build was applied the AIX fix and the customer logger instead of slf4j logger. +Arrow dependencies are built from internal branch `upgradeTo17.0.0-v3`. This build was applied the AIX fix and the customer logger instead of slf4j logger. diff --git a/dependencies/arrow-format-17.0.0.jar b/dependencies/arrow-format-17.0.0.jar index b4a34e86f..103c9c00d 100644 Binary files a/dependencies/arrow-format-17.0.0.jar and b/dependencies/arrow-format-17.0.0.jar differ diff --git a/dependencies/arrow-memory-core-17.0.0.jar b/dependencies/arrow-memory-core-17.0.0.jar index 12d9c9116..916e38238 100644 Binary files a/dependencies/arrow-memory-core-17.0.0.jar and b/dependencies/arrow-memory-core-17.0.0.jar differ diff --git a/dependencies/arrow-memory-netty-buffer-patch-17.0.0.jar b/dependencies/arrow-memory-netty-buffer-patch-17.0.0.jar index 72d374247..63f032a2b 100644 Binary files a/dependencies/arrow-memory-netty-buffer-patch-17.0.0.jar and b/dependencies/arrow-memory-netty-buffer-patch-17.0.0.jar differ diff --git a/dependencies/arrow-memory-unsafe-17.0.0.jar b/dependencies/arrow-memory-unsafe-17.0.0.jar index 65aac2a7b..174af274e 100644 Binary files a/dependencies/arrow-memory-unsafe-17.0.0.jar and b/dependencies/arrow-memory-unsafe-17.0.0.jar differ diff --git a/dependencies/arrow-vector-17.0.0.jar b/dependencies/arrow-vector-17.0.0.jar index 29055d603..73061da73 100644 Binary files a/dependencies/arrow-vector-17.0.0.jar and b/dependencies/arrow-vector-17.0.0.jar differ diff --git a/parent-pom.xml b/parent-pom.xml index 17b6103f1..d69c49cbf 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -66,7 +66,7 @@ 1.3.6 2.2.0 4.11.0 - 4.1.111.Final + 4.1.115.Final 9.37.3 0.31.1 1.0-alpha-9-stable-1 diff --git a/pom.xml b/pom.xml index 96f2a65b6..45e57505b 100644 --- a/pom.xml +++ b/pom.xml @@ -724,6 +724,9 @@ + + META-INF/io.netty.versions.properties + @@ -1023,6 +1026,9 @@ + + META-INF/io.netty.versions.properties + diff --git a/thin_public_pom.xml b/thin_public_pom.xml index 1d3d26fdd..09c6bf079 100644 --- a/thin_public_pom.xml +++ b/thin_public_pom.xml @@ -58,7 +58,7 @@ 2.4.9 1.15.3 2.2.0 - 4.1.111.Final + 4.1.115.Final 9.37.3 UTF-8 UTF-8