diff --git a/FIPS/pom.xml b/FIPS/pom.xml index 05bd22a08..292eb1161 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -37,12 +37,12 @@ UTF-8 UTF-8 - 0.15.1 + 7.0.0 1.7.25 1.14.2 1.25 - 2.11.0 - 2.11.0 + 2.13.2 + 2.13.2.2 4.5.5 0.8.4 true @@ -264,6 +264,30 @@ org.apache.arrow arrow-vector ${arrow.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + + + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} com.google.auth @@ -332,16 +356,61 @@ 3.0.0-M1 - install-arrow-memory + install-arrow-memory-pom validate install-file - ${basedir}/../dependencies/arrow-memory-${arrow.version}.jar + ${basedir}/../dependencies/arrow-memory-${arrow.version}.pom org.apache.arrow arrow-memory ${arrow.version} + pom + true + + + + install-arrow-memory-core + validate + + install-file + + + ${basedir}/../dependencies/arrow-memory-core-${arrow.version}.jar + org.apache.arrow + arrow-memory-core + ${arrow.version} + jar + true + + + + install-arrow-memory-unsafe + validate + + install-file + + + ${basedir}/../dependencies/arrow-memory-unsafe-${arrow.version}.jar + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + jar + true + + + + install-arrow-memory-netty + validate + + install-file + + + ${basedir}/../dependencies/arrow-memory-netty-${arrow.version}.jar + org.apache.arrow + arrow-memory-netty + ${arrow.version} jar true diff --git a/TestOnly/pom.xml b/TestOnly/pom.xml index e21788fdc..be71cb459 100644 --- a/TestOnly/pom.xml +++ b/TestOnly/pom.xml @@ -12,7 +12,7 @@ UTF-8 UTF-8 - 0.15.1 + 7.0.0 2.11.0 0.8.4 true @@ -131,6 +131,16 @@ arrow-vector ${arrow.version} + + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + com.zaxxer HikariCP @@ -199,10 +209,55 @@ install-file - ${project.basedir}/../dependencies/arrow-memory-${arrow.version}.jar + ${project.basedir}/../dependencies/arrow-memory-${arrow.version}.pom org.apache.arrow arrow-memory ${arrow.version} + pom + true + + + + install-arrow-memory-core + validate + + install-file + + + ${project.basedir}/../dependencies/arrow-memory-core-${arrow.version}.jar + org.apache.arrow + arrow-memory-core + ${arrow.version} + jar + true + + + + install-arrow-memory-unsafe + validate + + install-file + + + ${project.basedir}/../dependencies/arrow-memory-unsafe-${arrow.version}.jar + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + jar + true + + + + install-arrow-memory-netty + validate + + install-file + + + ${project.basedir}/../dependencies/arrow-memory-netty-${arrow.version}.jar + org.apache.arrow + arrow-memory-netty + ${arrow.version} jar true diff --git a/dependencies/arrow-format-0.15.1.jar b/dependencies/arrow-format-0.15.1.jar deleted file mode 100644 index 4ac8900c9..000000000 Binary files a/dependencies/arrow-format-0.15.1.jar and /dev/null differ diff --git a/dependencies/arrow-format-7.0.0.jar b/dependencies/arrow-format-7.0.0.jar new file mode 100644 index 000000000..d9dc0927f Binary files /dev/null and b/dependencies/arrow-format-7.0.0.jar differ diff --git a/dependencies/arrow-memory-0.15.1.jar b/dependencies/arrow-memory-0.15.1.jar deleted file mode 100644 index d3d9d470f..000000000 Binary files a/dependencies/arrow-memory-0.15.1.jar and /dev/null differ diff --git a/dependencies/arrow-memory-7.0.0.pom b/dependencies/arrow-memory-7.0.0.pom new file mode 100644 index 000000000..8a9c0b56d --- /dev/null +++ b/dependencies/arrow-memory-7.0.0.pom @@ -0,0 +1,29 @@ + + + + 4.0.0 + + org.apache.arrow + arrow-java-root + 7.0.0 + + arrow-memory + Arrow Memory + pom + + + memory-core + memory-unsafe + memory-netty + + + diff --git a/dependencies/arrow-memory-core-7.0.0.jar b/dependencies/arrow-memory-core-7.0.0.jar new file mode 100644 index 000000000..bc23d0e2a Binary files /dev/null and b/dependencies/arrow-memory-core-7.0.0.jar differ diff --git a/dependencies/arrow-memory-netty-7.0.0.jar b/dependencies/arrow-memory-netty-7.0.0.jar new file mode 100644 index 000000000..ae7fc6430 Binary files /dev/null and b/dependencies/arrow-memory-netty-7.0.0.jar differ diff --git a/dependencies/arrow-memory-unsafe-7.0.0.jar b/dependencies/arrow-memory-unsafe-7.0.0.jar new file mode 100644 index 000000000..a7543b5eb Binary files /dev/null and b/dependencies/arrow-memory-unsafe-7.0.0.jar differ diff --git a/dependencies/arrow-vector-0.15.1.jar b/dependencies/arrow-vector-0.15.1.jar deleted file mode 100644 index 4431de93e..000000000 Binary files a/dependencies/arrow-vector-0.15.1.jar and /dev/null differ diff --git a/dependencies/arrow-vector-7.0.0.jar b/dependencies/arrow-vector-7.0.0.jar new file mode 100644 index 000000000..bddb68e37 Binary files /dev/null and b/dependencies/arrow-vector-7.0.0.jar differ diff --git a/pom.xml b/pom.xml index 88a71ab91..8ebbd0306 100644 --- a/pom.xml +++ b/pom.xml @@ -37,12 +37,12 @@ UTF-8 UTF-8 - 0.15.1 + 7.0.0 1.7.25 1.14.2 1.25 - 2.12.1 - 2.12.1 + 2.13.2 + 2.13.2.2 4.5.11 0.8.4 @@ -290,8 +290,30 @@ commons-codec commons-codec + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + com.google.auth google-auth-library-oauth2-http @@ -352,16 +374,61 @@ 3.0.0-M1 - install-arrow-memory + install-arrow-memory-pom validate install-file - ${project.basedir}/dependencies/arrow-memory-${arrow.version}.jar + ${project.basedir}/dependencies/arrow-memory-${arrow.version}.pom org.apache.arrow arrow-memory ${arrow.version} + pom + true + + + + install-arrow-memory-core + validate + + install-file + + + ${project.basedir}/dependencies/arrow-memory-core-${arrow.version}.jar + org.apache.arrow + arrow-memory-core + ${arrow.version} + jar + true + + + + install-arrow-memory-unsafe + validate + + install-file + + + ${project.basedir}/dependencies/arrow-memory-unsafe-${arrow.version}.jar + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + jar + true + + + + install-arrow-memory-netty + validate + + install-file + + + ${project.basedir}/dependencies/arrow-memory-netty-${arrow.version}.jar + org.apache.arrow + arrow-memory-netty + ${arrow.version} jar true