(beam) branch fixjava11test created (now 11146e7484c)

[yh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yhu pushed a change to branch fixjava11test
in repository https://gitbox.apache.org/repos/asf/beam.git


      at 11146e7484c More Java11 test fix

This branch includes the following new commits:

     new 11146e7484c More Java11 test fix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(beam) 01/01: More Java11 test fix

[yh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yhu pushed a commit to branch fixjava11test
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 11146e7484c66af6279d2f2489be1898e3637cb9
Author: Yi Hu <ya...@google.com>
AuthorDate: Thu Aug 15 16:31:46 2024 -0400

    More Java11 test fix
    
    * Fix Java IOs/HCatalogIO PreCommit typo
    
    * Run Spark3 Version PreCommit on Java8
    
    * Bump Samza version to support Java8 / Java11 and also M1 Mac
---
 .../workflows/beam_PreCommit_Java_HCatalog_IO_Direct.yml  |  2 +-
 .github/workflows/beam_PreCommit_Java_IOs_Direct.yml      |  2 +-
 .github/workflows/beam_PreCommit_Java_Spark3_Versions.yml | 10 ++++++++--
 runners/samza/build.gradle                                | 15 ++++++++-------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/beam_PreCommit_Java_HCatalog_IO_Direct.yml b/.github/workflows/beam_PreCommit_Java_HCatalog_IO_Direct.yml
index 66ca5c0650e..6d45ba82aa4 100644
--- a/.github/workflows/beam_PreCommit_Java_HCatalog_IO_Direct.yml
+++ b/.github/workflows/beam_PreCommit_Java_HCatalog_IO_Direct.yml
@@ -108,7 +108,7 @@ jobs:
             -PdisableCheckStyle=true \
             -Dfile.encoding=UTF-8 \
             -PtestJavaVersion=8 \
-            -Pjava17Home=$JAVA_HOME_8_X64 \
+            -Pjava8Home=$JAVA_HOME_8_X64 \
       - name: Archive JUnit Test Results
         uses: actions/upload-artifact@v4
         if: ${{ !success() }}
diff --git a/.github/workflows/beam_PreCommit_Java_IOs_Direct.yml b/.github/workflows/beam_PreCommit_Java_IOs_Direct.yml
index b084c48de04..810451802ff 100644
--- a/.github/workflows/beam_PreCommit_Java_IOs_Direct.yml
+++ b/.github/workflows/beam_PreCommit_Java_IOs_Direct.yml
@@ -107,7 +107,7 @@ jobs:
             -PdisableCheckStyle=true \
             -Dfile.encoding=UTF-8 \
             -PtestJavaVersion=8 \
-            -Pjava17Home=$JAVA_HOME_8_X64 \
+            -Pjava8Home=$JAVA_HOME_8_X64 \
       - name: Archive JUnit Test Results
         uses: actions/upload-artifact@v4
         if: ${{ !success() }}
diff --git a/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml b/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml
index 418ca71b81a..cf2d956e3bf 100644
--- a/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml
+++ b/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml
@@ -88,12 +88,18 @@ jobs:
       - name: Setup environment
         uses: ./.github/actions/setup-environment-action
         with:
-          java-version: default
+          java-version: |
+            8
+            11
+      # TODO(https://github.com/apache/beam/issues/32207) Run test with Java11
       - name: run sparkVersionsTest script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
           gradle-command: :runners:spark:3:sparkVersionsTest
-          arguments: -PdisableSpotlessCheck=true
+          arguments:
+            -PdisableSpotlessCheck=true \
+            -PtestJavaVersion=8 \
+            -Pjava8Home=$JAVA_HOME_8_X64 \
       - name: Archive JUnit Test Results
         uses: actions/upload-artifact@v4
         if: ${{ !success() }}
diff --git a/runners/samza/build.gradle b/runners/samza/build.gradle
index fc590172f11..aca1c2b786e 100644
--- a/runners/samza/build.gradle
+++ b/runners/samza/build.gradle
@@ -40,7 +40,8 @@ configurations {
   validatesRunner
 }
 
-def samza_version = "1.6.0"
+def samza_version = "1.8.0"
+def samza_scala = "2.12"
 
 dependencies {
   implementation library.java.vendored_guava_32_1_2_jre
@@ -57,12 +58,12 @@ dependencies {
   runtimeOnly "org.rocksdb:rocksdbjni:6.15.2"
   runtimeOnly "org.scala-lang:scala-library:2.11.8"
   implementation "org.apache.samza:samza-api:$samza_version"
-  implementation "org.apache.samza:samza-core_2.11:$samza_version"
-  runtimeOnly "org.apache.samza:samza-kafka_2.11:$samza_version"
-  runtimeOnly "org.apache.samza:samza-kv_2.11:$samza_version"
-  implementation "org.apache.samza:samza-kv-rocksdb_2.11:$samza_version"
-  implementation "org.apache.samza:samza-kv-inmemory_2.11:$samza_version"
-  implementation "org.apache.samza:samza-yarn_2.11:$samza_version"
+  implementation "org.apache.samza:samza-core_$samza_scala:$samza_version"
+  runtimeOnly "org.apache.samza:samza-kafka_$samza_scala:$samza_version"
+  runtimeOnly "org.apache.samza:samza-kv_$samza_scala:$samza_version"
+  implementation "org.apache.samza:samza-kv-rocksdb_$samza_scala:$samza_version"
+  implementation "org.apache.samza:samza-kv-inmemory_$samza_scala:$samza_version"
+  implementation "org.apache.samza:samza-yarn3_$samza_scala:$samza_version"
   compileOnly library.java.error_prone_annotations
   runtimeOnly "org.apache.kafka:kafka-clients:2.0.1"
   implementation library.java.vendored_grpc_1_60_1