Skip to content

Commit 5a94b5d

Browse files
liyafan82emkornfield
liyafan82
authored and
emkornfield
committed
ARROW-7534: [Java] Create a new java/contrib module
To better clarify the status of java sub-modules, create a contrib module and move the following modules underneath it. - algorithm - adapter - plasma Closes apache#6812 from liyafan82/fly_0402_mv Authored-by: liyafan82 <fan_li_ya@foxmail.com> Signed-off-by: Micah Kornfield <emkornfield@gmail.com>
1 parent 83462a1 commit 5a94b5d

250 files changed

Lines changed: 14 additions & 12 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ci/scripts/java_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if [ "${ARROW_GANDIVA_JAVA}" = "ON" ]; then
3838
fi
3939

4040
if [ "${ARROW_PLASMA}" = "ON" ]; then
41-
pushd ${source_dir}/plasma
41+
pushd ${source_dir}/contrib/plasma
4242
${mvn} clean install
4343
popd
4444
fi

‎ci/scripts/java_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ "${ARROW_GANDIVA_JAVA}" = "ON" ]; then
3737
fi
3838

3939
if [ "${ARROW_PLASMA}" = "ON" ]; then
40-
pushd ${source_dir}/plasma
40+
pushd ${source_dir}/contrib/plasma
4141
java -cp target/test-classes:target/classes \
4242
-Djava.library.path=${cpp_build_dir} \
4343
org.apache.arrow.plasma.PlasmaClientTest

‎cpp/src/jni/orc/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ add_custom_target(arrow_orc_jni)
2929

3030
set(JNI_HEADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
3131

32-
add_subdirectory(../../../../java/adapter/orc ./java)
32+
add_subdirectory(../../../../java/contrib/adapter/orc ./java)
3333

3434
set(ARROW_BUILD_STATIC OFF)
3535

java/adapter/avro/pom.xml renamed to java/contrib/adapter/avro/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<groupId>org.apache.arrow</groupId>
1818
<artifactId>arrow-java-root</artifactId>
1919
<version>1.0.0-SNAPSHOT</version>
20-
<relativePath>../../pom.xml</relativePath>
20+
<relativePath>../../../pom.xml</relativePath>
2121
</parent>
2222

2323
<artifactId>arrow-avro</artifactId>

java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrow.java renamed to java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrow.java

File renamed without changes.

java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfig.java renamed to java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfig.java

File renamed without changes.

java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfigBuilder.java renamed to java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowConfigBuilder.java

File renamed without changes.

java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowUtils.java renamed to java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowUtils.java

File renamed without changes.

java/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowVectorIterator.java renamed to java/contrib/adapter/avro/src/main/java/org/apache/arrow/AvroToArrowVectorIterator.java

File renamed without changes.

java/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroArraysConsumer.java renamed to java/contrib/adapter/avro/src/main/java/org/apache/arrow/consumers/AvroArraysConsumer.java

File renamed without changes.

0 commit comments

Comments
 (0)