diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index c4ce4fa821..ee5fd5a397 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -22,8 +22,7 @@ jobs:
         java:
           - 1.8
           - 11
-          - 16
-          - 17-ea
+          - 17
     env:
       MAVEN_OPTS: -Xmx2g
       MAVEN_SKIP_RC: true
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 2e8f21129d..6f5c0b2e29 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -38,6 +38,19 @@ else()
   set(JAVA_PROFILE "-Pcmake,benchmark")
 endif()
 
+execute_process(
+  COMMAND java --add-opens java.base/java.nio=ALL-UNNAMED -version
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  RESULT_VARIABLE RET
+  OUTPUT_QUIET
+  ERROR_QUIET)
+if(RET EQUAL 0)
+  set(JAVA_PROFILE ${JAVA_PROFILE},java17)
+  set(JAVA_TEST_PROFILE -Pcmake,java17)
+  set(ADD_OPENS --add-opens)
+  set(JAVA_NIO java.base/java.nio=ALL-UNNAMED)
+endif()
+
 add_custom_command(
    OUTPUT ${ORC_JARS}
    COMMAND ./mvnw ${NO_DOWNLOAD_MSG} ${JAVA_PROFILE}
@@ -50,31 +63,21 @@ add_custom_target(java_build ALL DEPENDS ${ORC_JARS})
 
 add_test(
   NAME java-test
-  COMMAND ./mvnw ${NO_DOWNLOAD_MSG} -Pcmake
+  COMMAND ./mvnw ${NO_DOWNLOAD_MSG} ${JAVA_TEST_PROFILE}
            -Dbuild.dir=${CMAKE_CURRENT_BINARY_DIR} test
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_test(
-  NAME java-examples-test
-  COMMAND java -jar examples/orc-examples-${ORC_VERSION}-uber.jar write
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+# TOOD(ORC-1003)
+# add_test(
+#   NAME java-examples-test
+#   COMMAND java -jar examples/orc-examples-${ORC_VERSION}-uber.jar write
+#   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_test(
   NAME java-tools-test
   COMMAND java -jar tools/orc-tools-${ORC_VERSION}-uber.jar version
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
-execute_process(
-  COMMAND java --add-opens java.base/java.nio=ALL-UNNAMED -version
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  RESULT_VARIABLE RET
-  OUTPUT_QUIET
-  ERROR_QUIET)
-if(RET EQUAL 0)
-  set(ADD_OPENS --add-opens)
-  set(JAVA_NIO java.base/java.nio=ALL-UNNAMED)
-endif()
-
 add_test(
   NAME java-bench-gen-test
   COMMAND java ${ADD_OPENS} ${JAVA_NIO} -jar bench/core/orc-benchmarks-core-${ORC_VERSION}-uber.jar generate data -d sales -s 1
diff --git a/java/shims/pom.xml b/java/shims/pom.xml
index 9552b9bdb3..ff31a99084 100644
--- a/java/shims/pom.xml
+++ b/java/shims/pom.xml
@@ -85,6 +85,15 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <ignoredDependencies>
+            <ignoredDependency>org.apache.hadoop:hadoop-hdfs</ignoredDependency>
+          </ignoredDependencies>
+        </configuration>
+      </plugin>
     </plugins>
   </build>