From e3e74554145ace06bbed73cabf180269d5a43929 Mon Sep 17 00:00:00 2001 From: Timothy Brown Date: Mon, 6 Jan 2025 14:55:50 -0600 Subject: [PATCH] update dependencies, fix test class names --- pom.xml | 23 ++++++++++++------- ...urce.java => ITDeltaConversionSource.java} | 2 +- ...ource.java => ITHudiConversionSource.java} | 2 +- ...arget.java => ITHudiConversionTarget.java} | 2 +- ...get.java => TestHudiConversionTarget.java} | 4 ++-- ...ce.java => ITIcebergConversionSource.java} | 2 +- ....java => TestIcebergConversionSource.java} | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) rename xtable-core/src/test/java/org/apache/xtable/delta/{ITDeltaConversionTargetSource.java => ITDeltaConversionSource.java} (99%) rename xtable-core/src/test/java/org/apache/xtable/hudi/{ITHudiConversionSourceSource.java => ITHudiConversionSource.java} (99%) rename xtable-core/src/test/java/org/apache/xtable/hudi/{ITHudiConversionSourceTarget.java => ITHudiConversionTarget.java} (99%) rename xtable-core/src/test/java/org/apache/xtable/hudi/{TestHudiConversionSourceTarget.java => TestHudiConversionTarget.java} (99%) rename xtable-core/src/test/java/org/apache/xtable/iceberg/{ITIcebergConversionTargetSource.java => ITIcebergConversionSource.java} (99%) rename xtable-core/src/test/java/org/apache/xtable/iceberg/{TestIcebergConversionTargetSource.java => TestIcebergConversionSource.java} (99%) diff --git a/pom.xml b/pom.xml index 5777a7807..46641deef 100644 --- a/pom.xml +++ b/pom.xml @@ -58,8 +58,8 @@ 8 1.11.4 2.22.0 - 5.9.0 - 1.18.30 + 5.11.4 + 1.18.36 1.18.20.0 3.4.1 0.14.0 @@ -69,18 +69,18 @@ 3.2.4 3.1.1 2.5.3 - 5.2.0 - 1.12.2 + 5.15.2 + 1.12.3 3.25.5 2.12.20 - 2.13.14 + 2.13.15 ${scala12.version} 2.12 3.4.2 3.4 1.4.2 2.4.0 - 2.17.1 + 2.18.2 2.43.0 0.16.1 1.8 @@ -90,7 +90,7 @@ ${project.build.directory}/delombok 1.7 1.7 - 2.8.1 + 2.12.0 false @@ -436,7 +436,7 @@ org.junit.platform junit-platform-runner - 1.8.2 + 1.11.4 test @@ -650,6 +650,13 @@ org.apache.maven.plugins maven-surefire-plugin + + + + test + + + ${skipUTs} true diff --git a/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionTargetSource.java b/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionSource.java similarity index 99% rename from xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionTargetSource.java rename to xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionSource.java index ca8bc3fa0..3b1cc5294 100644 --- a/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionTargetSource.java +++ b/xtable-core/src/test/java/org/apache/xtable/delta/ITDeltaConversionSource.java @@ -71,7 +71,7 @@ import org.apache.xtable.model.storage.*; import org.apache.xtable.model.storage.InternalDataFile; -public class ITDeltaConversionTargetSource { +public class ITDeltaConversionSource { private static final InternalField COL1_INT_FIELD = InternalField.builder() diff --git a/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSourceSource.java b/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSource.java similarity index 99% rename from xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSourceSource.java rename to xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSource.java index 3debf9043..376ccedae 100644 --- a/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSourceSource.java +++ b/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSource.java @@ -79,7 +79,7 @@ /** * A suite of functional tests that the extraction from Hudi to Intermediate representation works. */ -public class ITHudiConversionSourceSource { +public class ITHudiConversionSource { @TempDir public static Path tempDir; private static JavaSparkContext jsc; private static SparkSession sparkSession; diff --git a/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSourceTarget.java b/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionTarget.java similarity index 99% rename from xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSourceTarget.java rename to xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionTarget.java index 128855672..03bb6e2ca 100644 --- a/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionSourceTarget.java +++ b/xtable-core/src/test/java/org/apache/xtable/hudi/ITHudiConversionTarget.java @@ -93,7 +93,7 @@ * A suite of functional tests that assert that the metadata for the hudi table is properly written * to disk. */ -public class ITHudiConversionSourceTarget { +public class ITHudiConversionTarget { @TempDir public static Path tempDir; private static final Configuration CONFIGURATION = new Configuration(); private static final HoodieEngineContext CONTEXT = new HoodieJavaEngineContext(CONFIGURATION); diff --git a/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionSourceTarget.java b/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionTarget.java similarity index 99% rename from xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionSourceTarget.java rename to xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionTarget.java index 0e79f74f3..fe20db054 100644 --- a/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionSourceTarget.java +++ b/xtable-core/src/test/java/org/apache/xtable/hudi/TestHudiConversionTarget.java @@ -54,9 +54,9 @@ /** * Unit tests that focus on the basic control flow of the HudiConversionTarget. Functional tests are - * in {@link ITHudiConversionSourceTarget}. + * in {@link ITHudiConversionTarget}. */ -public class TestHudiConversionSourceTarget { +public class TestHudiConversionTarget { private static final int RETENTION_IN_HOURS = 1; private static final int MAX_DELTA_COMMITS = 2; private static final Instant COMMIT_TIME = Instant.ofEpochMilli(1598644800000L); diff --git a/xtable-core/src/test/java/org/apache/xtable/iceberg/ITIcebergConversionTargetSource.java b/xtable-core/src/test/java/org/apache/xtable/iceberg/ITIcebergConversionSource.java similarity index 99% rename from xtable-core/src/test/java/org/apache/xtable/iceberg/ITIcebergConversionTargetSource.java rename to xtable-core/src/test/java/org/apache/xtable/iceberg/ITIcebergConversionSource.java index acd886887..210b6f9d6 100644 --- a/xtable-core/src/test/java/org/apache/xtable/iceberg/ITIcebergConversionTargetSource.java +++ b/xtable-core/src/test/java/org/apache/xtable/iceberg/ITIcebergConversionSource.java @@ -62,7 +62,7 @@ import org.apache.xtable.model.storage.DataLayoutStrategy; import org.apache.xtable.model.storage.TableFormat; -public class ITIcebergConversionTargetSource { +public class ITIcebergConversionSource { private static final Configuration hadoopConf = new Configuration(); @TempDir public static Path tempDir; diff --git a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionTargetSource.java b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionSource.java similarity index 99% rename from xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionTargetSource.java rename to xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionSource.java index 784d6585b..12a02a115 100644 --- a/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionTargetSource.java +++ b/xtable-core/src/test/java/org/apache/xtable/iceberg/TestIcebergConversionSource.java @@ -61,7 +61,7 @@ import org.apache.xtable.model.storage.FileFormat; import org.apache.xtable.model.storage.InternalDataFile; -class TestIcebergConversionTargetSource { +class TestIcebergConversionSource { private IcebergTableManager tableManager; private Schema csSchema;