You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by et...@apache.org on 2023/07/20 12:26:42 UTC

[iceberg] branch master updated: Spark, Flink: Fix running integration tests with JDK17 (#8114)

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

etudenhoefner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b95a2ca6a Spark, Flink: Fix running integration tests with JDK17 (#8114)
0b95a2ca6a is described below

commit 0b95a2ca6a4c83d46caf62baf5dda8e9fa349369
Author: Eduard Tudenhoefner <et...@gmail.com>
AuthorDate: Thu Jul 20 14:26:36 2023 +0200

    Spark, Flink: Fix running integration tests with JDK17 (#8114)
---
 flink/v1.15/build.gradle | 1 +
 flink/v1.16/build.gradle | 1 +
 flink/v1.17/build.gradle | 1 +
 spark/v3.1/build.gradle  | 2 ++
 spark/v3.2/build.gradle  | 2 ++
 spark/v3.3/build.gradle  | 1 +
 spark/v3.4/build.gradle  | 1 +
 7 files changed, 9 insertions(+)

diff --git a/flink/v1.15/build.gradle b/flink/v1.15/build.gradle
index 36da6bc065..d064bb8c4d 100644
--- a/flink/v1.15/build.gradle
+++ b/flink/v1.15/build.gradle
@@ -240,6 +240,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
   task integrationTest(type: Test) {
     description = "Test Flink Runtime Jar against Flink ${flinkMajorVersion}"
     group = "verification"
+    jvmArgs += project.property('extraJvmArgs')
     testClassesDirs = sourceSets.integration.output.classesDirs
     classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path)
     inputs.file(shadowJar.archiveFile.get().asFile.path)
diff --git a/flink/v1.16/build.gradle b/flink/v1.16/build.gradle
index 2e6e1b8605..085b05161e 100644
--- a/flink/v1.16/build.gradle
+++ b/flink/v1.16/build.gradle
@@ -240,6 +240,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
   task integrationTest(type: Test) {
     description = "Test Flink Runtime Jar against Flink ${flinkMajorVersion}"
     group = "verification"
+    jvmArgs += project.property('extraJvmArgs')
     testClassesDirs = sourceSets.integration.output.classesDirs
     classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path)
     inputs.file(shadowJar.archiveFile.get().asFile.path)
diff --git a/flink/v1.17/build.gradle b/flink/v1.17/build.gradle
index af1306b22a..be34348a8d 100644
--- a/flink/v1.17/build.gradle
+++ b/flink/v1.17/build.gradle
@@ -240,6 +240,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
   task integrationTest(type: Test) {
     description = "Test Flink Runtime Jar against Flink ${flinkMajorVersion}"
     group = "verification"
+    jvmArgs += project.property('extraJvmArgs')
     testClassesDirs = sourceSets.integration.output.classesDirs
     classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path)
     inputs.file(shadowJar.archiveFile.get().asFile.path)
diff --git a/spark/v3.1/build.gradle b/spark/v3.1/build.gradle
index b595b93594..f60ca6b8e2 100644
--- a/spark/v3.1/build.gradle
+++ b/spark/v3.1/build.gradle
@@ -229,6 +229,7 @@ project(':iceberg-spark:iceberg-spark-runtime-3.1_2.12') {
     integrationImplementation "org.apache.spark:spark-hive_2.12:${sparkVersion}"
     integrationImplementation 'org.junit.vintage:junit-vintage-engine'
     integrationImplementation 'org.slf4j:slf4j-simple'
+    integrationImplementation 'org.assertj:assertj-core'
     integrationImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     integrationImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     integrationImplementation project(path: ':iceberg-spark:iceberg-spark-3.1_2.12', configuration: 'testArtifacts')
@@ -276,6 +277,7 @@ project(':iceberg-spark:iceberg-spark-runtime-3.1_2.12') {
   task integrationTest(type: Test) {
     description = "Test Spark3 Runtime Jar against Spark 3.1"
     group = "verification"
+    jvmArgs += project.property('extraJvmArgs')
     testClassesDirs = sourceSets.integration.output.classesDirs
     classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path)
     inputs.file(shadowJar.archiveFile.get().asFile.path)
diff --git a/spark/v3.2/build.gradle b/spark/v3.2/build.gradle
index 2b57f49075..49ef3e3c31 100644
--- a/spark/v3.2/build.gradle
+++ b/spark/v3.2/build.gradle
@@ -225,6 +225,7 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
     integrationImplementation "org.apache.spark:spark-hive_${scalaVersion}:${sparkVersion}"
     integrationImplementation 'org.junit.vintage:junit-vintage-engine'
     integrationImplementation 'org.slf4j:slf4j-simple'
+    integrationImplementation 'org.assertj:assertj-core'
     integrationImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     integrationImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     integrationImplementation project(path: ":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts')
@@ -272,6 +273,7 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
   task integrationTest(type: Test) {
     description = "Test Spark3 Runtime Jar against Spark ${sparkMajorVersion}"
     group = "verification"
+    jvmArgs += project.property('extraJvmArgs')
     testClassesDirs = sourceSets.integration.output.classesDirs
     classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path)
     inputs.file(shadowJar.archiveFile.get().asFile.path)
diff --git a/spark/v3.3/build.gradle b/spark/v3.3/build.gradle
index f3cb291033..efa4942fa2 100644
--- a/spark/v3.3/build.gradle
+++ b/spark/v3.3/build.gradle
@@ -230,6 +230,7 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
     integrationImplementation "org.apache.spark:spark-hive_${scalaVersion}:${sparkVersion}"
     integrationImplementation 'org.junit.vintage:junit-vintage-engine'
     integrationImplementation 'org.slf4j:slf4j-simple'
+    integrationImplementation 'org.assertj:assertj-core'
     integrationImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     integrationImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     integrationImplementation project(path: ":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts')
diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle
index c6d9a08f76..0ef9aff4ed 100644
--- a/spark/v3.4/build.gradle
+++ b/spark/v3.4/build.gradle
@@ -230,6 +230,7 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
     integrationImplementation "org.apache.spark:spark-hive_${scalaVersion}:${sparkVersion}"
     integrationImplementation 'org.junit.vintage:junit-vintage-engine'
     integrationImplementation 'org.slf4j:slf4j-simple'
+    integrationImplementation 'org.assertj:assertj-core'
     integrationImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     integrationImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     integrationImplementation project(path: ":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts')