This is an automated email from the ASF dual-hosted git repository. emkornfield pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push: new f7fb49c ARROW-8478: [Java] Revert "ARROW-7534 f7fb49c is described below commit f7fb49cfa19fe2d39dd54a426b1288d33342faf5 Author: Micah Kornfield <emkornfi...@gmail.com> AuthorDate: Wed Apr 15 23:11:07 2020 -0700 ARROW-8478: [Java] Revert "ARROW-7534 This reverts commit 5a94b5d6f6c170a02ac1da2dcf98c5dbc8ea1ccb. I don't think this will unblock the release candidate but we should wait until the release is cut. Closes #6955 from emkornfield/revert_contrib Authored-by: Micah Kornfield <emkornfi...@gmail.com> Signed-off-by: Micah Kornfield <emkornfi...@gmail.com> --- ci/scripts/java_build.sh | 2 +- ci/scripts/java_test.sh | 2 +- cpp/src/jni/orc/CMakeLists.txt | 2 +- java/{contrib => }/adapter/avro/pom.xml | 2 +- .../avro/src/main/java/org/apache/arrow/AvroToArrow.java | 0 .../avro/src/main/java/org/apache/arrow/AvroToArrowConfig.java | 0 .../main/java/org/apache/arrow/AvroToArrowConfigBuilder.java | 0 .../avro/src/main/java/org/apache/arrow/AvroToArrowUtils.java | 0 .../main/java/org/apache/arrow/AvroToArrowVectorIterator.java | 0 .../java/org/apache/arrow/consumers/AvroArraysConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroBooleanConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroBytesConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroDoubleConsumer.java | 0 .../main/java/org/apache/arrow/consumers/AvroEnumConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroFixedConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroFloatConsumer.java | 0 .../main/java/org/apache/arrow/consumers/AvroIntConsumer.java | 0 .../main/java/org/apache/arrow/consumers/AvroLongConsumer.java | 0 .../main/java/org/apache/arrow/consumers/AvroMapConsumer.java | 0 .../main/java/org/apache/arrow/consumers/AvroNullConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroStringConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroStructConsumer.java | 0 .../java/org/apache/arrow/consumers/AvroUnionsConsumer.java | 0 .../main/java/org/apache/arrow/consumers/BaseAvroConsumer.java | 0 .../java/org/apache/arrow/consumers/CompositeAvroConsumer.java | 0 .../src/main/java/org/apache/arrow/consumers/Consumer.java | 0 .../src/main/java/org/apache/arrow/consumers/SkipConsumer.java | 0 .../src/main/java/org/apache/arrow/consumers/SkipFunction.java | 0 .../org/apache/arrow/consumers/logical/AvroDateConsumer.java | 0 .../apache/arrow/consumers/logical/AvroDecimalConsumer.java | 0 .../apache/arrow/consumers/logical/AvroTimeMicroConsumer.java | 0 .../apache/arrow/consumers/logical/AvroTimeMillisConsumer.java | 0 .../arrow/consumers/logical/AvroTimestampMicrosConsumer.java | 0 .../arrow/consumers/logical/AvroTimestampMillisConsumer.java | 0 .../src/test/java/org/apache/arrow/AvroLogicalTypesTest.java | 0 .../avro/src/test/java/org/apache/arrow/AvroSkipFieldTest.java | 0 .../avro/src/test/java/org/apache/arrow/AvroTestBase.java | 0 .../test/java/org/apache/arrow/AvroToArrowIteratorTest.java | 0 .../avro/src/test/java/org/apache/arrow/AvroToArrowTest.java | 0 .../test/java/org/apache/arrow/TestWriteReadAvroRecord.java | 0 .../avro/src/test/resources/schema/attrs/test_enum_attrs.avsc | 0 .../avro/src/test/resources/schema/attrs/test_fixed_attr.avsc | 0 .../src/test/resources/schema/attrs/test_record_attrs.avsc | 0 .../avro/src/test/resources/schema/logical/test_date.avsc | 0 .../test/resources/schema/logical/test_decimal_invalid1.avsc | 0 .../test/resources/schema/logical/test_decimal_invalid2.avsc | 0 .../test/resources/schema/logical/test_decimal_invalid3.avsc | 0 .../test/resources/schema/logical/test_decimal_invalid4.avsc | 0 .../schema/logical/test_decimal_with_original_bytes.avsc | 0 .../schema/logical/test_decimal_with_original_fixed.avsc | 0 .../src/test/resources/schema/logical/test_time_micros.avsc | 0 .../src/test/resources/schema/logical/test_time_millis.avsc | 0 .../test/resources/schema/logical/test_timestamp_micros.avsc | 0 .../test/resources/schema/logical/test_timestamp_millis.avsc | 0 .../src/test/resources/schema/skip/test_skip_array_before.avsc | 0 .../test/resources/schema/skip/test_skip_array_expected.avsc | 0 .../avro/src/test/resources/schema/skip/test_skip_base1.avsc | 0 .../avro/src/test/resources/schema/skip/test_skip_base2.avsc | 0 .../test/resources/schema/skip/test_skip_boolean_expected.avsc | 0 .../test/resources/schema/skip/test_skip_bytes_expected.avsc | 0 .../test/resources/schema/skip/test_skip_double_expected.avsc | 0 .../test/resources/schema/skip/test_skip_enum_expected.avsc | 0 .../test/resources/schema/skip/test_skip_fixed_expected.avsc | 0 .../test/resources/schema/skip/test_skip_float_expected.avsc | 0 .../src/test/resources/schema/skip/test_skip_int_expected.avsc | 0 .../test/resources/schema/skip/test_skip_long_expected.avsc | 0 .../src/test/resources/schema/skip/test_skip_map_before.avsc | 0 .../src/test/resources/schema/skip/test_skip_map_expected.avsc | 0 .../resources/schema/skip/test_skip_multi_fields_expected.avsc | 0 .../test/resources/schema/skip/test_skip_record_before.avsc | 0 .../test/resources/schema/skip/test_skip_record_expected.avsc | 0 .../resources/schema/skip/test_skip_second_level_expected.avsc | 0 .../resources/schema/skip/test_skip_single_field_expected.avsc | 0 .../test/resources/schema/skip/test_skip_string_expected.avsc | 0 .../resources/schema/skip/test_skip_third_level_expected.avsc | 0 .../src/test/resources/schema/skip/test_skip_union_before.avsc | 0 .../schema/skip/test_skip_union_multi_fields_expected.avsc | 0 .../schema/skip/test_skip_union_nullable_field_expected.avsc | 0 .../schema/skip/test_skip_union_one_field_expected.avsc | 0 .../adapter/avro/src/test/resources/schema/test.avsc | 0 .../adapter/avro/src/test/resources/schema/test_array.avsc | 0 .../adapter/avro/src/test/resources/schema/test_fixed.avsc | 0 .../avro/src/test/resources/schema/test_large_data.avsc | 0 .../adapter/avro/src/test/resources/schema/test_map.avsc | 0 .../avro/src/test/resources/schema/test_nested_record.avsc | 0 .../avro/src/test/resources/schema/test_nullable_boolean.avsc | 0 .../avro/src/test/resources/schema/test_nullable_bytes.avsc | 0 .../avro/src/test/resources/schema/test_nullable_double.avsc | 0 .../avro/src/test/resources/schema/test_nullable_float.avsc | 0 .../avro/src/test/resources/schema/test_nullable_int.avsc | 0 .../avro/src/test/resources/schema/test_nullable_long.avsc | 0 .../avro/src/test/resources/schema/test_nullable_string.avsc | 0 .../avro/src/test/resources/schema/test_nullable_union.avsc | 0 .../avro/src/test/resources/schema/test_primitive_boolean.avsc | 0 .../avro/src/test/resources/schema/test_primitive_bytes.avsc | 0 .../avro/src/test/resources/schema/test_primitive_double.avsc | 0 .../avro/src/test/resources/schema/test_primitive_enum.avsc | 0 .../avro/src/test/resources/schema/test_primitive_float.avsc | 0 .../avro/src/test/resources/schema/test_primitive_int.avsc | 0 .../avro/src/test/resources/schema/test_primitive_long.avsc | 0 .../avro/src/test/resources/schema/test_primitive_string.avsc | 0 .../adapter/avro/src/test/resources/schema/test_record.avsc | 0 .../adapter/avro/src/test/resources/schema/test_union.avsc | 0 java/{contrib => }/adapter/jdbc/pom.xml | 2 +- .../org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java | 0 .../src/main/java/org/apache/arrow/adapter/jdbc/Constants.java | 0 .../main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java | 0 .../main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java | 0 .../java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java | 0 .../apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java | 0 .../java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java | 0 .../arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java | 0 .../apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java | 0 .../apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java | 0 .../apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java | 0 .../apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java | 0 .../apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java | 0 .../org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java | 0 .../java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java | 0 .../org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java | 0 .../org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java | 0 .../src/test/java/org/apache/arrow/adapter/jdbc/Table.java | 0 .../org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java | 0 .../apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java | 0 .../apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java | 0 .../org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java | 0 .../java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java | 0 .../apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java | 0 .../arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java | 0 .../jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml | 0 .../jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml | 0 .../resources/h2/test1_all_datatypes_selected_null_rows_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_bigint_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_binary_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_bit_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_blob_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_bool_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_char_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_clob_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_date_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_decimal_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_double_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_est_date_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_est_time_h2.yml | 0 .../jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml | 0 .../jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_int_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_null_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml | 0 .../jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_real_h2.yml | 0 .../src/test/resources/h2/test1_selected_datatypes_null_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_smallint_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_time_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_timestamp_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_tinyint_h2.yml | 0 .../adapter/jdbc/src/test/resources/h2/test1_varchar_h2.yml | 0 .../plasma => adapter/jdbc}/src/test/resources/logback.xml | 0 java/{contrib => }/adapter/orc/CMakeLists.txt | 0 java/{contrib => }/adapter/orc/pom.xml | 4 ++-- .../main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java | 0 .../main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java | 0 .../java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java | 0 .../src/main/java/org/apache/arrow/adapter/orc/OrcReader.java | 0 .../java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java | 0 .../main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java | 0 .../java/org/apache/arrow/adapter/orc/OrcReferenceManager.java | 0 .../java/org/apache/arrow/adapter/orc/OrcStripeReader.java | 0 .../apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java | 0 .../test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java | 0 java/{contrib => }/algorithm/pom.xml | 1 - .../apache/arrow/algorithm/deduplicate/DeduplicationUtils.java | 0 .../arrow/algorithm/deduplicate/VectorRunDeduplicator.java | 0 .../apache/arrow/algorithm/dictionary/DictionaryBuilder.java | 0 .../algorithm/dictionary/HashTableBasedDictionaryBuilder.java | 0 .../arrow/algorithm/dictionary/HashTableDictionaryEncoder.java | 0 .../arrow/algorithm/dictionary/LinearDictionaryEncoder.java | 0 .../arrow/algorithm/dictionary/SearchDictionaryEncoder.java | 0 .../algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java | 0 .../java/org/apache/arrow/algorithm/misc/PartialSumUtils.java | 0 .../main/java/org/apache/arrow/algorithm/rank/VectorRank.java | 0 .../org/apache/arrow/algorithm/search/ParallelSearcher.java | 0 .../org/apache/arrow/algorithm/search/VectorRangeSearcher.java | 0 .../java/org/apache/arrow/algorithm/search/VectorSearcher.java | 0 .../apache/arrow/algorithm/sort/CompositeVectorComparator.java | 0 .../apache/arrow/algorithm/sort/DefaultVectorComparators.java | 0 .../arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java | 0 .../arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java | 0 .../org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java | 0 .../main/java/org/apache/arrow/algorithm/sort/IndexSorter.java | 0 .../java/org/apache/arrow/algorithm/sort/InsertionSorter.java | 0 .../java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java | 0 .../apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java | 0 .../apache/arrow/algorithm/sort/StableVectorComparator.java | 0 .../algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java | 0 .../org/apache/arrow/algorithm/sort/VectorValueComparator.java | 0 .../arrow/algorithm/deduplicate/TestDeduplicationUtils.java | 0 .../arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java | 0 .../dictionary/TestHashTableBasedDictionaryBuilder.java | 0 .../algorithm/dictionary/TestHashTableDictionaryEncoder.java | 0 .../algorithm/dictionary/TestLinearDictionaryEncoder.java | 0 .../algorithm/dictionary/TestSearchDictionaryEncoder.java | 0 .../dictionary/TestSearchTreeBasedDictionaryBuilder.java | 0 .../org/apache/arrow/algorithm/misc/TestPartialSumUtils.java | 0 .../java/org/apache/arrow/algorithm/rank/TestVectorRank.java | 0 .../apache/arrow/algorithm/search/TestParallelSearcher.java | 0 .../apache/arrow/algorithm/search/TestVectorRangeSearcher.java | 0 .../org/apache/arrow/algorithm/search/TestVectorSearcher.java | 0 .../arrow/algorithm/sort/TestCompositeVectorComparator.java | 0 .../arrow/algorithm/sort/TestDefaultVectorComparator.java | 0 .../algorithm/sort/TestFixedWidthInPlaceVectorSorter.java | 0 .../algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java | 0 .../java/org/apache/arrow/algorithm/sort/TestIndexSorter.java | 0 .../org/apache/arrow/algorithm/sort/TestInsertionSorter.java | 0 .../org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java | 0 .../arrow/algorithm/sort/TestStableVectorComparator.java | 0 .../sort/TestVariableWidthOutOfPlaceVectorSorter.java | 0 java/{contrib => }/plasma/README.md | 0 java/{contrib => }/plasma/pom.xml | 1 - .../src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java | 0 .../src/main/java/org/apache/arrow/plasma/PlasmaClient.java | 0 .../src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java | 0 .../arrow/plasma/exceptions/DuplicateObjectException.java | 0 .../apache/arrow/plasma/exceptions/PlasmaClientException.java | 0 .../arrow/plasma/exceptions/PlasmaOutOfMemoryException.java | 0 .../test/java/org/apache/arrow/plasma/PlasmaClientTest.java | 0 .../adapter/jdbc => plasma}/src/test/resources/logback.xml | 0 java/{contrib => }/plasma/test.sh | 0 java/pom.xml | 10 +++++----- 250 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh index bf4d883..acb109c 100755 --- a/ci/scripts/java_build.sh +++ b/ci/scripts/java_build.sh @@ -38,7 +38,7 @@ if [ "${ARROW_GANDIVA_JAVA}" = "ON" ]; then fi if [ "${ARROW_PLASMA}" = "ON" ]; then - pushd ${source_dir}/contrib/plasma + pushd ${source_dir}/plasma ${mvn} clean install popd fi diff --git a/ci/scripts/java_test.sh b/ci/scripts/java_test.sh index b9780bc..1383388 100755 --- a/ci/scripts/java_test.sh +++ b/ci/scripts/java_test.sh @@ -37,7 +37,7 @@ if [ "${ARROW_GANDIVA_JAVA}" = "ON" ]; then fi if [ "${ARROW_PLASMA}" = "ON" ]; then - pushd ${source_dir}/contrib/plasma + pushd ${source_dir}/plasma java -cp target/test-classes:target/classes \ -Djava.library.path=${cpp_build_dir} \ org.apache.arrow.plasma.PlasmaClientTest diff --git a/cpp/src/jni/orc/CMakeLists.txt b/cpp/src/jni/orc/CMakeLists.txt index 87bbe84..68da11f 100644 --- a/cpp/src/jni/orc/CMakeLists.txt +++ b/cpp/src/jni/orc/CMakeLists.txt @@ -29,7 +29,7 @@ add_custom_target(arrow_orc_jni) set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -add_subdirectory(../../../../java/contrib/adapter/orc ./java) +add_subdirectory(../../../../java/adapter/orc ./java) set(ARROW_BUILD_STATIC OFF) diff --git a/java/contrib/adapter/avro/pom.xml b/java/adapter/avro/pom.xml similarity index 97% rename from java/contrib/adapter/avro/pom.xml rename to java/adapter/avro/pom.xml index 66c75c3..d9c6182 100644 --- a/java/contrib/adapter/avro/pom.xml +++ b/java/adapter/avro/pom.xml @@ -17,7 +17,7 @@ <groupId>org.apache.arrow</groupId> <artifactId>arrow-java-root</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>arrow-avro</artifactId> diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrow.java b/java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrow.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrow.java rename to java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrow.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfig.java b/java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfig.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfig.java rename to java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfig.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfigBuilder.java b/java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfigBuilder.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfigBuilder.java rename to java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfigBuilder.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowUtils.java b/java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowUtils.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowUtils.java rename to java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowUtils.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowVectorIterator.java b/java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowVectorIterator.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowVectorIterator.java rename to java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowVectorIterator.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroArraysConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroArraysConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroArraysConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroArraysConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBooleanConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBooleanConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBooleanConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBooleanConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBytesConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBytesConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBytesConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroBytesConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroDoubleConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroDoubleConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroDoubleConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroDoubleConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroEnumConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroEnumConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroEnumConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroEnumConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFixedConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFixedConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFixedConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFixedConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFloatConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFloatConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFloatConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroFloatConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroIntConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroIntConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroIntConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroIntConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroLongConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroLongConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroLongConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroLongConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroMapConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroMapConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroMapConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroMapConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroNullConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroNullConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroNullConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroNullConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStringConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStringConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStringConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStringConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStructConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStructConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStructConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroStructConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroUnionsConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroUnionsConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroUnionsConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroUnionsConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/BaseAvroConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/BaseAvroConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/BaseAvroConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/BaseAvroConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/CompositeAvroConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/CompositeAvroConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/CompositeAvroConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/CompositeAvroConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/Consumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/Consumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/Consumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/Consumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipFunction.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipFunction.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipFunction.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/SkipFunction.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDateConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDateConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDateConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDateConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDecimalConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDecimalConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDecimalConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroDecimalConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMicroConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMicroConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMicroConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMicroConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMillisConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMillisConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMillisConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimeMillisConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMicrosConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMicrosConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMicrosConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMicrosConsumer.java diff --git a/java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMillisConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMillisConsumer.java similarity index 100% rename from java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMillisConsumer.java rename to java/adapter/avro/src/main/java/org/apache/arrow/consumers/logical/AvroTimestampMillisConsumer.java diff --git a/java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroLogicalTypesTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/AvroLogicalTypesTest.java similarity index 100% rename from java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroLogicalTypesTest.java rename to java/adapter/avro/src/test/java/org/apache/arrow/AvroLogicalTypesTest.java diff --git a/java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroSkipFieldTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/AvroSkipFieldTest.java similarity index 100% rename from java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroSkipFieldTest.java rename to java/adapter/avro/src/test/java/org/apache/arrow/AvroSkipFieldTest.java diff --git a/java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroTestBase.java b/java/adapter/avro/src/test/java/org/apache/arrow/AvroTestBase.java similarity index 100% rename from java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroTestBase.java rename to java/adapter/avro/src/test/java/org/apache/arrow/AvroTestBase.java diff --git a/java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowIteratorTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowIteratorTest.java similarity index 100% rename from java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowIteratorTest.java rename to java/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowIteratorTest.java diff --git a/java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowTest.java similarity index 100% rename from java/contrib/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowTest.java rename to java/adapter/avro/src/test/java/org/apache/arrow/AvroToArrowTest.java diff --git a/java/contrib/adapter/avro/src/test/java/org/apache/arrow/TestWriteReadAvroRecord.java b/java/adapter/avro/src/test/java/org/apache/arrow/TestWriteReadAvroRecord.java similarity index 100% rename from java/contrib/adapter/avro/src/test/java/org/apache/arrow/TestWriteReadAvroRecord.java rename to java/adapter/avro/src/test/java/org/apache/arrow/TestWriteReadAvroRecord.java diff --git a/java/contrib/adapter/avro/src/test/resources/schema/attrs/test_enum_attrs.avsc b/java/adapter/avro/src/test/resources/schema/attrs/test_enum_attrs.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/attrs/test_enum_attrs.avsc rename to java/adapter/avro/src/test/resources/schema/attrs/test_enum_attrs.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/attrs/test_fixed_attr.avsc b/java/adapter/avro/src/test/resources/schema/attrs/test_fixed_attr.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/attrs/test_fixed_attr.avsc rename to java/adapter/avro/src/test/resources/schema/attrs/test_fixed_attr.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/attrs/test_record_attrs.avsc b/java/adapter/avro/src/test/resources/schema/attrs/test_record_attrs.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/attrs/test_record_attrs.avsc rename to java/adapter/avro/src/test/resources/schema/attrs/test_record_attrs.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_date.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_date.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_date.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_date.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid1.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid1.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid1.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid1.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid2.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid2.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid2.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid2.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid3.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid3.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid3.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid3.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid4.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid4.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid4.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_decimal_invalid4.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_bytes.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_bytes.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_bytes.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_bytes.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_fixed.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_fixed.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_fixed.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_decimal_with_original_fixed.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_time_micros.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_time_micros.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_time_micros.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_time_micros.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_time_millis.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_time_millis.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_time_millis.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_time_millis.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_timestamp_micros.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_timestamp_micros.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_timestamp_micros.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_timestamp_micros.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/logical/test_timestamp_millis.avsc b/java/adapter/avro/src/test/resources/schema/logical/test_timestamp_millis.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/logical/test_timestamp_millis.avsc rename to java/adapter/avro/src/test/resources/schema/logical/test_timestamp_millis.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_array_before.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_array_before.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_array_before.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_array_before.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_array_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_array_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_array_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_array_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_base1.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_base1.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_base1.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_base1.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_base2.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_base2.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_base2.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_base2.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_boolean_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_boolean_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_boolean_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_boolean_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_bytes_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_bytes_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_bytes_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_bytes_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_double_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_double_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_double_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_double_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_enum_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_enum_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_enum_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_enum_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_fixed_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_fixed_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_fixed_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_fixed_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_float_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_float_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_float_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_float_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_int_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_int_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_int_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_int_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_long_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_long_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_long_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_long_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_map_before.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_map_before.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_map_before.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_map_before.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_map_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_map_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_map_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_map_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_multi_fields_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_multi_fields_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_multi_fields_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_multi_fields_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_record_before.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_record_before.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_record_before.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_record_before.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_record_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_record_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_record_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_record_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_second_level_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_second_level_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_second_level_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_second_level_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_single_field_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_single_field_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_single_field_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_single_field_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_string_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_string_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_string_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_string_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_third_level_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_third_level_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_third_level_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_third_level_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_before.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_union_before.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_before.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_union_before.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_multi_fields_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_union_multi_fields_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_multi_fields_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_union_multi_fields_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_nullable_field_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_union_nullable_field_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_nullable_field_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_union_nullable_field_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_one_field_expected.avsc b/java/adapter/avro/src/test/resources/schema/skip/test_skip_union_one_field_expected.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/skip/test_skip_union_one_field_expected.avsc rename to java/adapter/avro/src/test/resources/schema/skip/test_skip_union_one_field_expected.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test.avsc b/java/adapter/avro/src/test/resources/schema/test.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test.avsc rename to java/adapter/avro/src/test/resources/schema/test.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_array.avsc b/java/adapter/avro/src/test/resources/schema/test_array.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_array.avsc rename to java/adapter/avro/src/test/resources/schema/test_array.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_fixed.avsc b/java/adapter/avro/src/test/resources/schema/test_fixed.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_fixed.avsc rename to java/adapter/avro/src/test/resources/schema/test_fixed.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_large_data.avsc b/java/adapter/avro/src/test/resources/schema/test_large_data.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_large_data.avsc rename to java/adapter/avro/src/test/resources/schema/test_large_data.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_map.avsc b/java/adapter/avro/src/test/resources/schema/test_map.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_map.avsc rename to java/adapter/avro/src/test/resources/schema/test_map.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nested_record.avsc b/java/adapter/avro/src/test/resources/schema/test_nested_record.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nested_record.avsc rename to java/adapter/avro/src/test/resources/schema/test_nested_record.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_boolean.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_boolean.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_boolean.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_boolean.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_bytes.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_bytes.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_bytes.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_bytes.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_double.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_double.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_double.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_double.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_float.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_float.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_float.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_float.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_int.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_int.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_int.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_int.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_long.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_long.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_long.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_long.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_string.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_string.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_string.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_string.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_nullable_union.avsc b/java/adapter/avro/src/test/resources/schema/test_nullable_union.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_nullable_union.avsc rename to java/adapter/avro/src/test/resources/schema/test_nullable_union.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_boolean.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_boolean.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_boolean.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_boolean.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_bytes.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_bytes.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_bytes.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_bytes.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_double.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_double.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_double.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_double.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_enum.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_enum.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_enum.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_enum.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_float.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_float.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_float.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_float.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_int.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_int.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_int.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_int.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_long.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_long.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_long.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_long.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_primitive_string.avsc b/java/adapter/avro/src/test/resources/schema/test_primitive_string.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_primitive_string.avsc rename to java/adapter/avro/src/test/resources/schema/test_primitive_string.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_record.avsc b/java/adapter/avro/src/test/resources/schema/test_record.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_record.avsc rename to java/adapter/avro/src/test/resources/schema/test_record.avsc diff --git a/java/contrib/adapter/avro/src/test/resources/schema/test_union.avsc b/java/adapter/avro/src/test/resources/schema/test_union.avsc similarity index 100% rename from java/contrib/adapter/avro/src/test/resources/schema/test_union.avsc rename to java/adapter/avro/src/test/resources/schema/test_union.avsc diff --git a/java/contrib/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml similarity index 98% rename from java/contrib/adapter/jdbc/pom.xml rename to java/adapter/jdbc/pom.xml index 7fa5290..eec274f 100644 --- a/java/contrib/adapter/jdbc/pom.xml +++ b/java/adapter/jdbc/pom.xml @@ -17,7 +17,7 @@ <groupId>org.apache.arrow</groupId> <artifactId>arrow-java-root</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>arrow-jdbc</artifactId> diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java diff --git a/java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java similarity index 100% rename from java/contrib/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java rename to java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java diff --git a/java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java similarity index 100% rename from java/contrib/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java rename to java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_selected_null_rows_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_selected_null_rows_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_selected_null_rows_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_selected_null_rows_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_bigint_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_bigint_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_bigint_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_bigint_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_binary_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_binary_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_binary_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_binary_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_bit_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_bit_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_bit_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_bit_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_blob_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_blob_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_blob_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_blob_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_bool_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_bool_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_bool_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_bool_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_char_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_char_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_char_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_char_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_clob_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_clob_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_clob_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_clob_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_date_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_date_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_date_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_date_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_decimal_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_decimal_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_decimal_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_decimal_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_double_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_double_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_double_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_double_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_est_date_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_est_date_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_est_date_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_est_date_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_est_time_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_est_time_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_est_time_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_est_time_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_real_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_real_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_real_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_real_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_smallint_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_smallint_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_smallint_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_smallint_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_time_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_time_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_time_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_time_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_timestamp_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_timestamp_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_timestamp_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_timestamp_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_tinyint_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_tinyint_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_tinyint_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_tinyint_h2.yml diff --git a/java/contrib/adapter/jdbc/src/test/resources/h2/test1_varchar_h2.yml b/java/adapter/jdbc/src/test/resources/h2/test1_varchar_h2.yml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/h2/test1_varchar_h2.yml rename to java/adapter/jdbc/src/test/resources/h2/test1_varchar_h2.yml diff --git a/java/contrib/plasma/src/test/resources/logback.xml b/java/adapter/jdbc/src/test/resources/logback.xml similarity index 100% rename from java/contrib/plasma/src/test/resources/logback.xml rename to java/adapter/jdbc/src/test/resources/logback.xml diff --git a/java/contrib/adapter/orc/CMakeLists.txt b/java/adapter/orc/CMakeLists.txt similarity index 100% rename from java/contrib/adapter/orc/CMakeLists.txt rename to java/adapter/orc/CMakeLists.txt diff --git a/java/contrib/adapter/orc/pom.xml b/java/adapter/orc/pom.xml similarity index 97% rename from java/contrib/adapter/orc/pom.xml rename to java/adapter/orc/pom.xml index 6c59c6f..b753cf6 100644 --- a/java/contrib/adapter/orc/pom.xml +++ b/java/adapter/orc/pom.xml @@ -82,7 +82,7 @@ <groupId>org.apache.arrow</groupId> <artifactId>arrow-java-root</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.arrow.orc</groupId> @@ -91,7 +91,7 @@ <description>(Experimental/Contrib)A JNI wrapper for the C++ ORC reader implementation.</description> <packaging>jar</packaging> <properties> - <arrow.cpp.build.dir>../../../../cpp/release-build/</arrow.cpp.build.dir> + <arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir> </properties> <build> diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java diff --git a/java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java similarity index 100% rename from java/contrib/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java rename to java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java diff --git a/java/contrib/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java b/java/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java similarity index 100% rename from java/contrib/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java rename to java/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java diff --git a/java/contrib/algorithm/pom.xml b/java/algorithm/pom.xml similarity index 97% rename from java/contrib/algorithm/pom.xml rename to java/algorithm/pom.xml index c6834b7..774fdd5 100644 --- a/java/contrib/algorithm/pom.xml +++ b/java/algorithm/pom.xml @@ -15,7 +15,6 @@ <groupId>org.apache.arrow</groupId> <artifactId>arrow-java-root</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <artifactId>arrow-algorithm</artifactId> <name>Arrow Algorithms</name> diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java diff --git a/java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java similarity index 100% rename from java/contrib/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java rename to java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java diff --git a/java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java similarity index 100% rename from java/contrib/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java rename to java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java diff --git a/java/contrib/plasma/README.md b/java/plasma/README.md similarity index 100% rename from java/contrib/plasma/README.md rename to java/plasma/README.md diff --git a/java/contrib/plasma/pom.xml b/java/plasma/pom.xml similarity index 97% rename from java/contrib/plasma/pom.xml rename to java/plasma/pom.xml index 8f6e1ff..c97c205 100644 --- a/java/contrib/plasma/pom.xml +++ b/java/plasma/pom.xml @@ -15,7 +15,6 @@ <groupId>org.apache.arrow</groupId> <artifactId>arrow-java-root</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <artifactId>arrow-plasma</artifactId> <name>Arrow Plasma Client</name> diff --git a/java/contrib/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java b/java/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java similarity index 100% rename from java/contrib/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java rename to java/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java diff --git a/java/contrib/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java b/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java similarity index 100% rename from java/contrib/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java rename to java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java diff --git a/java/contrib/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java b/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java similarity index 100% rename from java/contrib/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java rename to java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java diff --git a/java/contrib/plasma/src/main/java/org/apache/arrow/plasma/exceptions/DuplicateObjectException.java b/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/DuplicateObjectException.java similarity index 100% rename from java/contrib/plasma/src/main/java/org/apache/arrow/plasma/exceptions/DuplicateObjectException.java rename to java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/DuplicateObjectException.java diff --git a/java/contrib/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaClientException.java b/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaClientException.java similarity index 100% rename from java/contrib/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaClientException.java rename to java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaClientException.java diff --git a/java/contrib/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException.java b/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException.java similarity index 100% rename from java/contrib/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException.java rename to java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException.java diff --git a/java/contrib/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java b/java/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java similarity index 100% rename from java/contrib/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java rename to java/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java diff --git a/java/contrib/adapter/jdbc/src/test/resources/logback.xml b/java/plasma/src/test/resources/logback.xml similarity index 100% rename from java/contrib/adapter/jdbc/src/test/resources/logback.xml rename to java/plasma/src/test/resources/logback.xml diff --git a/java/contrib/plasma/test.sh b/java/plasma/test.sh similarity index 100% rename from java/contrib/plasma/test.sh rename to java/plasma/test.sh diff --git a/java/pom.xml b/java/pom.xml index c0a9d45..acbfdd4 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -679,13 +679,13 @@ <module>memory</module> <module>vector</module> <module>tools</module> - <module>contrib/adapter/jdbc</module> - <module>contrib/plasma</module> + <module>adapter/jdbc</module> + <module>plasma</module> <module>flight/flight-core</module> <module>flight/flight-grpc</module> <module>performance</module> - <module>contrib/algorithm</module> - <module>contrib/adapter/avro</module> + <module>algorithm</module> + <module>adapter/avro</module> </modules> <profiles> @@ -705,7 +705,7 @@ <id>arrow-jni</id> <modules> <!-- these have dependency on cpp --> - <module>contrib/adapter/orc</module> + <module>adapter/orc</module> <module>gandiva</module> </modules> </profile>