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

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

commit 820fc3ceda386149f42db8b54e6db9171d1a3a6d
Author: Rodrigo Meneses <[email protected]>
AuthorDate: Mon Dec 4 09:51:02 2023 -0800

    Flink: Move flink/v1.17 to flink/v1.18
---
 flink/{v1.17 => v1.18}/build.gradle                                       | 0
 flink/{v1.17 => v1.18}/flink-runtime/LICENSE                              | 0
 flink/{v1.17 => v1.18}/flink-runtime/NOTICE                               | 0
 .../java/org/apache/iceberg/flink/IcebergConnectorSmokeTest.java          | 0
 .../flink/src/main/java/org/apache/iceberg/flink/CatalogLoader.java       | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java        | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkCatalogFactory.java | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkConfParser.java     | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkConfigOptions.java  | 0
 .../src/main/java/org/apache/iceberg/flink/FlinkDynamicTableFactory.java  | 0
 .../src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java   | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkFilters.java        | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkFixupTypes.java     | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkReadConf.java       | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkReadOptions.java    | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java     | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkSourceFilter.java   | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkTypeToType.java     | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkTypeVisitor.java    | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkWriteConf.java      | 0
 .../flink/src/main/java/org/apache/iceberg/flink/FlinkWriteOptions.java   | 0
 .../flink/src/main/java/org/apache/iceberg/flink/IcebergTableSink.java    | 0
 .../flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java      | 0
 .../flink/src/main/java/org/apache/iceberg/flink/TableLoader.java         | 0
 .../flink/src/main/java/org/apache/iceberg/flink/TypeToFlinkType.java     | 0
 .../flink/src/main/java/org/apache/iceberg/flink/actions/Actions.java     | 0
 .../java/org/apache/iceberg/flink/actions/RewriteDataFilesAction.java     | 0
 .../java/org/apache/iceberg/flink/data/AvroWithFlinkSchemaVisitor.java    | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkAvroReader.java      | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkAvroWriter.java      | 0
 .../flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReader.java | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkOrcReaders.java      | 0
 .../flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriter.java | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriters.java      | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java  | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkParquetWriters.java  | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkSchemaVisitor.java   | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkValueReaders.java    | 0
 .../src/main/java/org/apache/iceberg/flink/data/FlinkValueWriters.java    | 0
 .../java/org/apache/iceberg/flink/data/ParquetWithFlinkSchemaVisitor.java | 0
 .../src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java    | 0
 .../flink/src/main/java/org/apache/iceberg/flink/data/RowDataUtil.java    | 0
 .../flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java  | 0
 .../org/apache/iceberg/flink/sink/AvroGenericRecordToRowDataMapper.java   | 0
 .../src/main/java/org/apache/iceberg/flink/sink/BaseDeltaTaskWriter.java  | 0
 .../java/org/apache/iceberg/flink/sink/BucketPartitionKeySelector.java    | 0
 .../src/main/java/org/apache/iceberg/flink/sink/BucketPartitioner.java    | 0
 .../main/java/org/apache/iceberg/flink/sink/BucketPartitionerUtil.java    | 0
 .../src/main/java/org/apache/iceberg/flink/sink/CachingTableSupplier.java | 0
 .../flink/src/main/java/org/apache/iceberg/flink/sink/CommitSummary.java  | 0
 .../flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifests.java | 0
 .../main/java/org/apache/iceberg/flink/sink/DeltaManifestsSerializer.java | 0
 .../main/java/org/apache/iceberg/flink/sink/EqualityFieldKeySelector.java | 0
 .../src/main/java/org/apache/iceberg/flink/sink/FlinkAppenderFactory.java | 0
 .../main/java/org/apache/iceberg/flink/sink/FlinkFileWriterFactory.java   | 0
 .../src/main/java/org/apache/iceberg/flink/sink/FlinkManifestUtil.java    | 0
 .../flink/src/main/java/org/apache/iceberg/flink/sink/FlinkSink.java      | 0
 .../main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitter.java    | 0
 .../java/org/apache/iceberg/flink/sink/IcebergFilesCommitterMetrics.java  | 0
 .../src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriter.java  | 0
 .../java/org/apache/iceberg/flink/sink/IcebergStreamWriterMetrics.java    | 0
 .../java/org/apache/iceberg/flink/sink/ManifestOutputFileFactory.java     | 0
 .../src/main/java/org/apache/iceberg/flink/sink/PartitionKeySelector.java | 0
 .../main/java/org/apache/iceberg/flink/sink/PartitionedDeltaWriter.java   | 0
 .../main/java/org/apache/iceberg/flink/sink/RowDataTaskWriterFactory.java | 0
 .../src/main/java/org/apache/iceberg/flink/sink/TaskWriterFactory.java    | 0
 .../main/java/org/apache/iceberg/flink/sink/UnpartitionedDeltaWriter.java | 0
 .../java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatistics.java  | 0
 .../apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java    | 0
 .../main/java/org/apache/iceberg/flink/sink/shuffle/DataStatistics.java   | 0
 .../org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinator.java  | 0
 .../iceberg/flink/sink/shuffle/DataStatisticsCoordinatorProvider.java     | 0
 .../java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsEvent.java   | 0
 .../org/apache/iceberg/flink/sink/shuffle/DataStatisticsOperator.java     | 0
 .../org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecord.java     | 0
 .../iceberg/flink/sink/shuffle/DataStatisticsOrRecordSerializer.java      | 0
 .../java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsUtil.java    | 0
 .../java/org/apache/iceberg/flink/sink/shuffle/MapDataStatistics.java     | 0
 .../apache/iceberg/flink/sink/shuffle/MapDataStatisticsSerializer.java    | 0
 .../apache/iceberg/flink/source/AvroGenericRecordFileScanTaskReader.java  | 0
 .../flink/src/main/java/org/apache/iceberg/flink/source/DataIterator.java | 0
 .../src/main/java/org/apache/iceberg/flink/source/DataTaskReader.java     | 0
 .../src/main/java/org/apache/iceberg/flink/source/FileScanTaskReader.java | 0
 .../src/main/java/org/apache/iceberg/flink/source/FlinkInputFormat.java   | 0
 .../src/main/java/org/apache/iceberg/flink/source/FlinkInputSplit.java    | 0
 .../flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java  | 0
 .../src/main/java/org/apache/iceberg/flink/source/FlinkSplitPlanner.java  | 0
 .../src/main/java/org/apache/iceberg/flink/source/IcebergSource.java      | 0
 .../src/main/java/org/apache/iceberg/flink/source/IcebergTableSource.java | 0
 .../java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java   | 0
 .../src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java    | 0
 .../apache/iceberg/flink/source/RowDataToAvroGenericRecordConverter.java  | 0
 .../flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java  | 0
 .../flink/src/main/java/org/apache/iceberg/flink/source/SourceUtil.java   | 0
 .../java/org/apache/iceberg/flink/source/StreamingMonitorFunction.java    | 0
 .../java/org/apache/iceberg/flink/source/StreamingReaderOperator.java     | 0
 .../java/org/apache/iceberg/flink/source/StreamingStartingStrategy.java   | 0
 .../org/apache/iceberg/flink/source/assigner/DefaultSplitAssigner.java    | 0
 .../java/org/apache/iceberg/flink/source/assigner/GetSplitResult.java     | 0
 .../apache/iceberg/flink/source/assigner/OrderedSplitAssignerFactory.java | 0
 .../apache/iceberg/flink/source/assigner/SimpleSplitAssignerFactory.java  | 0
 .../main/java/org/apache/iceberg/flink/source/assigner/SplitAssigner.java | 0
 .../org/apache/iceberg/flink/source/assigner/SplitAssignerFactory.java    | 0
 .../java/org/apache/iceberg/flink/source/assigner/SplitAssignerType.java  | 0
 .../apache/iceberg/flink/source/enumerator/AbstractIcebergEnumerator.java | 0
 .../iceberg/flink/source/enumerator/ContinuousEnumerationResult.java      | 0
 .../iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java      | 0
 .../apache/iceberg/flink/source/enumerator/ContinuousSplitPlanner.java    | 0
 .../iceberg/flink/source/enumerator/ContinuousSplitPlannerImpl.java       | 0
 .../org/apache/iceberg/flink/source/enumerator/EnumerationHistory.java    | 0
 .../apache/iceberg/flink/source/enumerator/IcebergEnumeratorPosition.java | 0
 .../flink/source/enumerator/IcebergEnumeratorPositionSerializer.java      | 0
 .../apache/iceberg/flink/source/enumerator/IcebergEnumeratorState.java    | 0
 .../iceberg/flink/source/enumerator/IcebergEnumeratorStateSerializer.java | 0
 .../apache/iceberg/flink/source/enumerator/StaticIcebergEnumerator.java   | 0
 .../java/org/apache/iceberg/flink/source/reader/ArrayBatchRecords.java    | 0
 .../apache/iceberg/flink/source/reader/ArrayPoolDataIteratorBatcher.java  | 0
 .../iceberg/flink/source/reader/AvroGenericRecordReaderFunction.java      | 0
 .../apache/iceberg/flink/source/reader/ColumnStatsWatermarkExtractor.java | 0
 .../java/org/apache/iceberg/flink/source/reader/DataIteratorBatcher.java  | 0
 .../apache/iceberg/flink/source/reader/DataIteratorReaderFunction.java    | 0
 .../java/org/apache/iceberg/flink/source/reader/IcebergSourceReader.java  | 0
 .../apache/iceberg/flink/source/reader/IcebergSourceReaderMetrics.java    | 0
 .../org/apache/iceberg/flink/source/reader/IcebergSourceSplitReader.java  | 0
 .../java/org/apache/iceberg/flink/source/reader/ListBatchRecords.java     | 0
 .../org/apache/iceberg/flink/source/reader/ListDataIteratorBatcher.java   | 0
 .../org/apache/iceberg/flink/source/reader/MetaDataReaderFunction.java    | 0
 .../main/java/org/apache/iceberg/flink/source/reader/ReaderFunction.java  | 0
 .../java/org/apache/iceberg/flink/source/reader/RecordAndPosition.java    | 0
 .../main/java/org/apache/iceberg/flink/source/reader/RecordFactory.java   | 0
 .../org/apache/iceberg/flink/source/reader/RowDataReaderFunction.java     | 0
 .../java/org/apache/iceberg/flink/source/reader/RowDataRecordFactory.java | 0
 .../org/apache/iceberg/flink/source/reader/SerializableRecordEmitter.java | 0
 .../org/apache/iceberg/flink/source/reader/SplitWatermarkExtractor.java   | 0
 .../iceberg/flink/source/reader/WatermarkExtractorRecordEmitter.java      | 0
 .../java/org/apache/iceberg/flink/source/split/IcebergSourceSplit.java    | 0
 .../apache/iceberg/flink/source/split/IcebergSourceSplitSerializer.java   | 0
 .../org/apache/iceberg/flink/source/split/IcebergSourceSplitState.java    | 0
 .../org/apache/iceberg/flink/source/split/IcebergSourceSplitStatus.java   | 0
 .../org/apache/iceberg/flink/source/split/SerializableComparator.java     | 0
 .../main/java/org/apache/iceberg/flink/source/split/SplitComparators.java | 0
 .../java/org/apache/iceberg/flink/source/split/SplitRequestEvent.java     | 0
 .../src/main/java/org/apache/iceberg/flink/util/FlinkAlterTableUtil.java  | 0
 .../main/java/org/apache/iceberg/flink/util/FlinkCompatibilityUtil.java   | 0
 .../flink/src/main/java/org/apache/iceberg/flink/util/FlinkPackage.java   | 0
 .../resources/META-INF/services/org.apache.flink.table.factories.Factory  | 0
 .../META-INF/services/org.apache.flink.table.factories.TableFactory       | 0
 .../java/org/apache/iceberg/flink/AvroGenericRecordConverterBase.java     | 0
 .../flink/src/test/java/org/apache/iceberg/flink/DataGenerator.java       | 0
 .../flink/src/test/java/org/apache/iceberg/flink/DataGenerators.java      | 0
 .../src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java      | 0
 .../flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java       | 0
 .../src/test/java/org/apache/iceberg/flink/HadoopCatalogExtension.java    | 0
 .../src/test/java/org/apache/iceberg/flink/HadoopCatalogResource.java     | 0
 .../flink/src/test/java/org/apache/iceberg/flink/HadoopTableResource.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/MiniClusterResource.java | 0
 .../src/test/java/org/apache/iceberg/flink/MiniFlinkClusterExtension.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/RowDataConverter.java    | 0
 .../flink/src/test/java/org/apache/iceberg/flink/SimpleDataUtil.java      | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestBase.java            | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestCatalogLoader.java   | 0
 .../src/test/java/org/apache/iceberg/flink/TestCatalogTableLoader.java    | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java  | 0
 .../src/test/java/org/apache/iceberg/flink/TestDataFileSerialization.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestFixtures.java        | 0
 .../src/test/java/org/apache/iceberg/flink/TestFlinkAnonymousTable.java   | 0
 .../src/test/java/org/apache/iceberg/flink/TestFlinkCatalogDatabase.java  | 0
 .../src/test/java/org/apache/iceberg/flink/TestFlinkCatalogFactory.java   | 0
 .../src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java     | 0
 .../java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java    | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestFlinkConfParser.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestFlinkFilters.java    | 0
 .../src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java      | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestFlinkSchemaUtil.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java  | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestFlinkUpsert.java     | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestHelpers.java         | 0
 .../src/test/java/org/apache/iceberg/flink/TestIcebergConnector.java      | 0
 .../test/java/org/apache/iceberg/flink/TestManifestFileSerialization.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestRowDataWrapper.java  | 0
 .../flink/src/test/java/org/apache/iceberg/flink/TestTableLoader.java     | 0
 .../src/test/java/org/apache/iceberg/flink/TestTableSerialization.java    | 0
 .../java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/data/RandomRowData.java  | 0
 .../src/test/java/org/apache/iceberg/flink/data/RowDataToRowMapper.java   | 0
 .../java/org/apache/iceberg/flink/data/TestFlinkAvroReaderWriter.java     | 0
 .../test/java/org/apache/iceberg/flink/data/TestFlinkOrcReaderWriter.java | 0
 .../test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java   | 0
 .../test/java/org/apache/iceberg/flink/data/TestFlinkParquetWriter.java   | 0
 .../test/java/org/apache/iceberg/flink/data/TestRowDataProjection.java    | 0
 .../src/test/java/org/apache/iceberg/flink/data/TestRowProjection.java    | 0
 .../src/test/java/org/apache/iceberg/flink/data/TestStructRowData.java    | 0
 .../apache/iceberg/flink/sink/TestAvroGenericRecordToRowDataMapper.java   | 0
 .../org/apache/iceberg/flink/sink/TestBucketPartitionKeySelector.java     | 0
 .../test/java/org/apache/iceberg/flink/sink/TestBucketPartitioner.java    | 0
 .../apache/iceberg/flink/sink/TestBucketPartitionerFlinkIcebergSink.java  | 0
 .../java/org/apache/iceberg/flink/sink/TestBucketPartitionerUtil.java     | 0
 .../test/java/org/apache/iceberg/flink/sink/TestCachingTableSupplier.java | 0
 .../test/java/org/apache/iceberg/flink/sink/TestCompressionSettings.java  | 0
 .../src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java  | 0
 .../test/java/org/apache/iceberg/flink/sink/TestFlinkAppenderFactory.java | 0
 .../java/org/apache/iceberg/flink/sink/TestFlinkFileWriterFactory.java    | 0
 .../src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java | 0
 .../test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBase.java | 0
 .../java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBranch.java    | 0
 .../test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java   | 0
 .../java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Base.java    | 0
 .../java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Branch.java  | 0
 .../src/test/java/org/apache/iceberg/flink/sink/TestFlinkManifest.java    | 0
 .../java/org/apache/iceberg/flink/sink/TestFlinkPartitioningWriters.java  | 0
 .../java/org/apache/iceberg/flink/sink/TestFlinkPositionDeltaWriters.java | 0
 .../java/org/apache/iceberg/flink/sink/TestFlinkRollingFileWriters.java   | 0
 .../test/java/org/apache/iceberg/flink/sink/TestFlinkWriterMetrics.java   | 0
 .../java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java     | 0
 .../test/java/org/apache/iceberg/flink/sink/TestIcebergStreamWriter.java  | 0
 .../test/java/org/apache/iceberg/flink/sink/TestRowDataPartitionKey.java  | 0
 .../src/test/java/org/apache/iceberg/flink/sink/TestTaskWriters.java      | 0
 .../org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatistics.java   | 0
 .../iceberg/flink/sink/shuffle/TestAggregatedStatisticsTracker.java       | 0
 .../apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinator.java  | 0
 .../iceberg/flink/sink/shuffle/TestDataStatisticsCoordinatorProvider.java | 0
 .../org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsOperator.java | 0
 .../test/java/org/apache/iceberg/flink/source/BoundedTableFactory.java    | 0
 .../src/test/java/org/apache/iceberg/flink/source/BoundedTestSource.java  | 0
 .../test/java/org/apache/iceberg/flink/source/ChangeLogTableTestBase.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/source/SplitHelpers.java | 0
 .../flink/src/test/java/org/apache/iceberg/flink/source/SqlHelpers.java   | 0
 .../java/org/apache/iceberg/flink/source/TestBoundedTableFactory.java     | 0
 .../test/java/org/apache/iceberg/flink/source/TestFlinkInputFormat.java   | 0
 .../apache/iceberg/flink/source/TestFlinkInputFormatReaderDeletes.java    | 0
 .../java/org/apache/iceberg/flink/source/TestFlinkMergingMetrics.java     | 0
 .../test/java/org/apache/iceberg/flink/source/TestFlinkMetaDataTable.java | 0
 .../java/org/apache/iceberg/flink/source/TestFlinkReaderDeletesBase.java  | 0
 .../src/test/java/org/apache/iceberg/flink/source/TestFlinkScan.java      | 0
 .../src/test/java/org/apache/iceberg/flink/source/TestFlinkScanSql.java   | 0
 .../src/test/java/org/apache/iceberg/flink/source/TestFlinkSource.java    | 0
 .../test/java/org/apache/iceberg/flink/source/TestFlinkSourceConfig.java  | 0
 .../src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceSql.java | 0
 .../test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java   | 0
 .../java/org/apache/iceberg/flink/source/TestIcebergSourceBounded.java    | 0
 .../iceberg/flink/source/TestIcebergSourceBoundedGenericRecord.java       | 0
 .../java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedSql.java | 0
 .../java/org/apache/iceberg/flink/source/TestIcebergSourceContinuous.java | 0
 .../java/org/apache/iceberg/flink/source/TestIcebergSourceFailover.java   | 0
 .../flink/source/TestIcebergSourceFailoverWithWatermarkExtractor.java     | 0
 .../org/apache/iceberg/flink/source/TestIcebergSourceReaderDeletes.java   | 0
 .../test/java/org/apache/iceberg/flink/source/TestIcebergSourceSql.java   | 0
 .../iceberg/flink/source/TestIcebergSourceWithWatermarkExtractor.java     | 0
 .../org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java | 0
 .../test/java/org/apache/iceberg/flink/source/TestProjectMetaColumn.java  | 0
 .../iceberg/flink/source/TestRowDataToAvroGenericRecordConverter.java     | 0
 .../src/test/java/org/apache/iceberg/flink/source/TestSourceUtil.java     | 0
 .../flink/src/test/java/org/apache/iceberg/flink/source/TestSqlBase.java  | 0
 .../src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java  | 0
 .../org/apache/iceberg/flink/source/TestStreamingMonitorFunction.java     | 0
 .../java/org/apache/iceberg/flink/source/TestStreamingReaderOperator.java | 0
 .../org/apache/iceberg/flink/source/assigner/SplitAssignerTestBase.java   | 0
 .../apache/iceberg/flink/source/assigner/TestDefaultSplitAssigner.java    | 0
 .../flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java   | 0
 .../iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java    | 0
 .../iceberg/flink/source/enumerator/ManualContinuousSplitPlanner.java     | 0
 .../iceberg/flink/source/enumerator/TestContinuousIcebergEnumerator.java  | 0
 .../iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java   | 0
 .../source/enumerator/TestContinuousSplitPlannerImplStartStrategy.java    | 0
 .../apache/iceberg/flink/source/enumerator/TestEnumerationHistory.java    | 0
 .../flink/source/enumerator/TestIcebergEnumeratorStateSerializer.java     | 0
 .../org/apache/iceberg/flink/source/reader/ReaderFunctionTestBase.java    | 0
 .../src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java  | 0
 .../org/apache/iceberg/flink/source/reader/TestArrayBatchRecords.java     | 0
 .../flink/source/reader/TestArrayPoolDataIteratorBatcherRowData.java      | 0
 .../iceberg/flink/source/reader/TestColumnStatsWatermarkExtractor.java    | 0
 .../org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java   | 0
 .../org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java | 0
 .../java/org/apache/iceberg/flink/source/reader/TestingMetricGroup.java   | 0
 .../iceberg/flink/source/split/TestIcebergSourceSplitSerializer.java      | 0
 .../src/test/java/org/apache/iceberg/flink/util/TestFlinkPackage.java     | 0
 .../resources/META-INF/services/org.apache.flink.table.factories.Factory  | 0
 277 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/flink/v1.17/build.gradle b/flink/v1.18/build.gradle
similarity index 100%
rename from flink/v1.17/build.gradle
rename to flink/v1.18/build.gradle
diff --git a/flink/v1.17/flink-runtime/LICENSE 
b/flink/v1.18/flink-runtime/LICENSE
similarity index 100%
rename from flink/v1.17/flink-runtime/LICENSE
rename to flink/v1.18/flink-runtime/LICENSE
diff --git a/flink/v1.17/flink-runtime/NOTICE b/flink/v1.18/flink-runtime/NOTICE
similarity index 100%
rename from flink/v1.17/flink-runtime/NOTICE
rename to flink/v1.18/flink-runtime/NOTICE
diff --git 
a/flink/v1.17/flink-runtime/src/integration/java/org/apache/iceberg/flink/IcebergConnectorSmokeTest.java
 
b/flink/v1.18/flink-runtime/src/integration/java/org/apache/iceberg/flink/IcebergConnectorSmokeTest.java
similarity index 100%
rename from 
flink/v1.17/flink-runtime/src/integration/java/org/apache/iceberg/flink/IcebergConnectorSmokeTest.java
rename to 
flink/v1.18/flink-runtime/src/integration/java/org/apache/iceberg/flink/IcebergConnectorSmokeTest.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/CatalogLoader.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/CatalogLoader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/CatalogLoader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/CatalogLoader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalogFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalogFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalogFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalogFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkConfParser.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkConfParser.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkConfParser.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkConfParser.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkConfigOptions.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkConfigOptions.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkConfigOptions.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkConfigOptions.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkDynamicTableFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkDynamicTableFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkDynamicTableFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkDynamicTableFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkEnvironmentContext.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkFilters.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkFilters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkFilters.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkFilters.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkFixupTypes.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkFixupTypes.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkFixupTypes.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkFixupTypes.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkReadConf.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkReadConf.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkReadConf.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkReadConf.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkReadOptions.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkReadOptions.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkReadOptions.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkReadOptions.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkSourceFilter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSourceFilter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkSourceFilter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSourceFilter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeToType.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeToType.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeToType.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeToType.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeVisitor.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeVisitor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeVisitor.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkTypeVisitor.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteConf.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteConf.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteConf.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteConf.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteOptions.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteOptions.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteOptions.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkWriteOptions.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/IcebergTableSink.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/IcebergTableSink.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/IcebergTableSink.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/IcebergTableSink.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/TableLoader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/TypeToFlinkType.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/TypeToFlinkType.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/TypeToFlinkType.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/TypeToFlinkType.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/actions/Actions.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/actions/Actions.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/actions/Actions.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/actions/Actions.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/actions/RewriteDataFilesAction.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/actions/RewriteDataFilesAction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/actions/RewriteDataFilesAction.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/actions/RewriteDataFilesAction.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/AvroWithFlinkSchemaVisitor.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/AvroWithFlinkSchemaVisitor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/AvroWithFlinkSchemaVisitor.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/AvroWithFlinkSchemaVisitor.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroWriter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroWriter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkAvroWriter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReaders.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReaders.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReaders.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReaders.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriters.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriters.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcWriters.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetWriters.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetWriters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetWriters.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetWriters.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkSchemaVisitor.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkSchemaVisitor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkSchemaVisitor.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkSchemaVisitor.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueReaders.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueReaders.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueReaders.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueReaders.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueWriters.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueWriters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueWriters.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/FlinkValueWriters.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/ParquetWithFlinkSchemaVisitor.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/ParquetWithFlinkSchemaVisitor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/ParquetWithFlinkSchemaVisitor.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/ParquetWithFlinkSchemaVisitor.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/RowDataProjection.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/RowDataUtil.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/RowDataUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/RowDataUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/RowDataUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/data/StructRowData.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/AvroGenericRecordToRowDataMapper.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/AvroGenericRecordToRowDataMapper.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/AvroGenericRecordToRowDataMapper.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/AvroGenericRecordToRowDataMapper.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BaseDeltaTaskWriter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BaseDeltaTaskWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BaseDeltaTaskWriter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BaseDeltaTaskWriter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionKeySelector.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionKeySelector.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionKeySelector.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionKeySelector.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitioner.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitioner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitioner.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitioner.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionerUtil.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionerUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionerUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/BucketPartitionerUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/CachingTableSupplier.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/CachingTableSupplier.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/CachingTableSupplier.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/CachingTableSupplier.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/CommitSummary.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/CommitSummary.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/CommitSummary.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/CommitSummary.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifests.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifests.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifests.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifests.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifestsSerializer.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifestsSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifestsSerializer.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/DeltaManifestsSerializer.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/EqualityFieldKeySelector.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/EqualityFieldKeySelector.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/EqualityFieldKeySelector.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/EqualityFieldKeySelector.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkAppenderFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkAppenderFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkAppenderFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkAppenderFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkFileWriterFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkFileWriterFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkFileWriterFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkFileWriterFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkManifestUtil.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkManifestUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkManifestUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkManifestUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkSink.java 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkSink.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkSink.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/FlinkSink.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitterMetrics.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitterMetrics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitterMetrics.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergFilesCommitterMetrics.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriterMetrics.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriterMetrics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriterMetrics.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/IcebergStreamWriterMetrics.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/ManifestOutputFileFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/ManifestOutputFileFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/ManifestOutputFileFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/ManifestOutputFileFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionKeySelector.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionKeySelector.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionKeySelector.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionKeySelector.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionedDeltaWriter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionedDeltaWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionedDeltaWriter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/PartitionedDeltaWriter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/RowDataTaskWriterFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/RowDataTaskWriterFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/RowDataTaskWriterFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/RowDataTaskWriterFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/TaskWriterFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/TaskWriterFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/TaskWriterFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/TaskWriterFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/UnpartitionedDeltaWriter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/UnpartitionedDeltaWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/UnpartitionedDeltaWriter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/UnpartitionedDeltaWriter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatistics.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatistics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatistics.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatistics.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatistics.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatistics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatistics.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatistics.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinatorProvider.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinatorProvider.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinatorProvider.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsCoordinatorProvider.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsEvent.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsEvent.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsEvent.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsEvent.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOperator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOperator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOperator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOperator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecord.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecord.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecord.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecord.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecordSerializer.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecordSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecordSerializer.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsOrRecordSerializer.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsUtil.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/DataStatisticsUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatistics.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatistics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatistics.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatistics.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatisticsSerializer.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatisticsSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatisticsSerializer.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/MapDataStatisticsSerializer.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/AvroGenericRecordFileScanTaskReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/AvroGenericRecordFileScanTaskReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/AvroGenericRecordFileScanTaskReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/AvroGenericRecordFileScanTaskReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/DataIterator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/DataIterator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/DataIterator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/DataIterator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/DataTaskReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/DataTaskReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/DataTaskReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/DataTaskReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FileScanTaskReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FileScanTaskReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FileScanTaskReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FileScanTaskReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputFormat.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputFormat.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputFormat.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputFormat.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputSplit.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputSplit.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputSplit.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkInputSplit.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSplitPlanner.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSplitPlanner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSplitPlanner.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSplitPlanner.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/IcebergTableSource.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergTableSource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/IcebergTableSource.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergTableSource.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataFileScanTaskReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataRewriter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/RowDataToAvroGenericRecordConverter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataToAvroGenericRecordConverter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/RowDataToAvroGenericRecordConverter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/RowDataToAvroGenericRecordConverter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/SourceUtil.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/SourceUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/SourceUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/SourceUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/StreamingMonitorFunction.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/StreamingMonitorFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/StreamingMonitorFunction.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/StreamingMonitorFunction.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/StreamingReaderOperator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/StreamingReaderOperator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/StreamingReaderOperator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/StreamingReaderOperator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/StreamingStartingStrategy.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/StreamingStartingStrategy.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/StreamingStartingStrategy.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/StreamingStartingStrategy.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/DefaultSplitAssigner.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/DefaultSplitAssigner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/DefaultSplitAssigner.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/DefaultSplitAssigner.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/GetSplitResult.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/GetSplitResult.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/GetSplitResult.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/GetSplitResult.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/OrderedSplitAssignerFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/OrderedSplitAssignerFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/OrderedSplitAssignerFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/OrderedSplitAssignerFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SimpleSplitAssignerFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SimpleSplitAssignerFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SimpleSplitAssignerFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SimpleSplitAssignerFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssigner.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssigner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssigner.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssigner.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerType.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerType.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerType.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/assigner/SplitAssignerType.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/AbstractIcebergEnumerator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/AbstractIcebergEnumerator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/AbstractIcebergEnumerator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/AbstractIcebergEnumerator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousEnumerationResult.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousEnumerationResult.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousEnumerationResult.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousEnumerationResult.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlanner.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlanner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlanner.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlanner.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlannerImpl.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlannerImpl.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlannerImpl.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousSplitPlannerImpl.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/EnumerationHistory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/EnumerationHistory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/EnumerationHistory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/EnumerationHistory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPosition.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPosition.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPosition.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPosition.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPositionSerializer.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPositionSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPositionSerializer.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorPositionSerializer.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorState.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorState.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorState.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorState.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorStateSerializer.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorStateSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorStateSerializer.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/IcebergEnumeratorStateSerializer.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/StaticIcebergEnumerator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/StaticIcebergEnumerator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/StaticIcebergEnumerator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/StaticIcebergEnumerator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayBatchRecords.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayBatchRecords.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayBatchRecords.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayBatchRecords.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayPoolDataIteratorBatcher.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayPoolDataIteratorBatcher.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayPoolDataIteratorBatcher.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ArrayPoolDataIteratorBatcher.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/AvroGenericRecordReaderFunction.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/AvroGenericRecordReaderFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/AvroGenericRecordReaderFunction.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/AvroGenericRecordReaderFunction.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ColumnStatsWatermarkExtractor.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ColumnStatsWatermarkExtractor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ColumnStatsWatermarkExtractor.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ColumnStatsWatermarkExtractor.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorBatcher.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorBatcher.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorBatcher.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorBatcher.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorReaderFunction.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorReaderFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorReaderFunction.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/DataIteratorReaderFunction.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReaderMetrics.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReaderMetrics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReaderMetrics.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceReaderMetrics.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceSplitReader.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceSplitReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceSplitReader.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/IcebergSourceSplitReader.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListBatchRecords.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListBatchRecords.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListBatchRecords.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListBatchRecords.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListDataIteratorBatcher.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListDataIteratorBatcher.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListDataIteratorBatcher.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ListDataIteratorBatcher.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/MetaDataReaderFunction.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/MetaDataReaderFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/MetaDataReaderFunction.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/MetaDataReaderFunction.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ReaderFunction.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ReaderFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/ReaderFunction.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/ReaderFunction.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordAndPosition.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordAndPosition.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordAndPosition.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordAndPosition.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RecordFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataReaderFunction.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataReaderFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataReaderFunction.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataReaderFunction.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataRecordFactory.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataRecordFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataRecordFactory.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/RowDataRecordFactory.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/SerializableRecordEmitter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/SerializableRecordEmitter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/SerializableRecordEmitter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/SerializableRecordEmitter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/SplitWatermarkExtractor.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/SplitWatermarkExtractor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/SplitWatermarkExtractor.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/SplitWatermarkExtractor.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/WatermarkExtractorRecordEmitter.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/WatermarkExtractorRecordEmitter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/reader/WatermarkExtractorRecordEmitter.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/reader/WatermarkExtractorRecordEmitter.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplit.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplit.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplit.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplit.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitSerializer.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitSerializer.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitSerializer.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitState.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitState.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitState.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitState.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitStatus.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitStatus.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitStatus.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/IcebergSourceSplitStatus.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/SerializableComparator.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SerializableComparator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/SerializableComparator.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SerializableComparator.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitComparators.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitRequestEvent.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitRequestEvent.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitRequestEvent.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/split/SplitRequestEvent.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/util/FlinkAlterTableUtil.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/util/FlinkAlterTableUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/util/FlinkAlterTableUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/util/FlinkAlterTableUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/util/FlinkCompatibilityUtil.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/util/FlinkCompatibilityUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/util/FlinkCompatibilityUtil.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/util/FlinkCompatibilityUtil.java
diff --git 
a/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/util/FlinkPackage.java
 
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/util/FlinkPackage.java
similarity index 100%
rename from 
flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/util/FlinkPackage.java
rename to 
flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/util/FlinkPackage.java
diff --git 
a/flink/v1.17/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
 
b/flink/v1.18/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 100%
rename from 
flink/v1.17/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
rename to 
flink/v1.18/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
diff --git 
a/flink/v1.17/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
 
b/flink/v1.18/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
similarity index 100%
rename from 
flink/v1.17/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
rename to 
flink/v1.18/flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/AvroGenericRecordConverterBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/AvroGenericRecordConverterBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/AvroGenericRecordConverterBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/AvroGenericRecordConverterBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/DataGenerator.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/DataGenerator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/DataGenerator.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/DataGenerator.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/DataGenerators.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/DataGenerators.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/DataGenerators.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/DataGenerators.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogExtension.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogExtension.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogExtension.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogExtension.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogResource.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogResource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogResource.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/HadoopCatalogResource.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/HadoopTableResource.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/HadoopTableResource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/HadoopTableResource.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/HadoopTableResource.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/MiniClusterResource.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/MiniClusterResource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/MiniClusterResource.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/MiniClusterResource.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/MiniFlinkClusterExtension.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/MiniFlinkClusterExtension.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/MiniFlinkClusterExtension.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/MiniFlinkClusterExtension.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/RowDataConverter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/RowDataConverter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/RowDataConverter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/RowDataConverter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/SimpleDataUtil.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/SimpleDataUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/SimpleDataUtil.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/SimpleDataUtil.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestBase.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestBase.java
rename to flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestCatalogLoader.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestCatalogLoader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestCatalogLoader.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestCatalogLoader.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestCatalogTableLoader.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestCatalogTableLoader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestCatalogTableLoader.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestCatalogTableLoader.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestDataFileSerialization.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestDataFileSerialization.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestDataFileSerialization.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestDataFileSerialization.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFixtures.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFixtures.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFixtures.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFixtures.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkAnonymousTable.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkAnonymousTable.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkAnonymousTable.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkAnonymousTable.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogDatabase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogDatabase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogDatabase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogDatabase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogFactory.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogFactory.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogFactory.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTable.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogTablePartitions.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkConfParser.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkConfParser.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkConfParser.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkConfParser.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkFilters.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkFilters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkFilters.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkFilters.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkSchemaUtil.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkSchemaUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkSchemaUtil.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkSchemaUtil.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkTableSink.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkUpsert.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkUpsert.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkUpsert.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestFlinkUpsert.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestHelpers.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestHelpers.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestHelpers.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestHelpers.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestIcebergConnector.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestIcebergConnector.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestIcebergConnector.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestIcebergConnector.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestManifestFileSerialization.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestManifestFileSerialization.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestManifestFileSerialization.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestManifestFileSerialization.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestRowDataWrapper.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestRowDataWrapper.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestRowDataWrapper.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestRowDataWrapper.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestTableLoader.java 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestTableLoader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestTableLoader.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestTableLoader.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestTableSerialization.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestTableSerialization.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestTableSerialization.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/TestTableSerialization.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/actions/TestRewriteDataFilesAction.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/RandomRowData.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/RandomRowData.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/RandomRowData.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/RandomRowData.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/RowDataToRowMapper.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/RowDataToRowMapper.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/RowDataToRowMapper.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/RowDataToRowMapper.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkAvroReaderWriter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkAvroReaderWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkAvroReaderWriter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkAvroReaderWriter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkOrcReaderWriter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkOrcReaderWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkOrcReaderWriter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkOrcReaderWriter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetWriter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetWriter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetWriter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestRowDataProjection.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestRowDataProjection.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestRowDataProjection.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestRowDataProjection.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestRowProjection.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestRowProjection.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestRowProjection.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestRowProjection.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestStructRowData.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestStructRowData.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/data/TestStructRowData.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/data/TestStructRowData.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestAvroGenericRecordToRowDataMapper.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestAvroGenericRecordToRowDataMapper.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestAvroGenericRecordToRowDataMapper.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestAvroGenericRecordToRowDataMapper.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionKeySelector.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionKeySelector.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionKeySelector.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionKeySelector.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitioner.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitioner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitioner.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitioner.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerFlinkIcebergSink.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerFlinkIcebergSink.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerFlinkIcebergSink.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerFlinkIcebergSink.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerUtil.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerUtil.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestBucketPartitionerUtil.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestCachingTableSupplier.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestCachingTableSupplier.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestCachingTableSupplier.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestCachingTableSupplier.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestCompressionSettings.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestCompressionSettings.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestCompressionSettings.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestCompressionSettings.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestDeltaTaskWriter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkAppenderFactory.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkAppenderFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkAppenderFactory.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkAppenderFactory.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkFileWriterFactory.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkFileWriterFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkFileWriterFactory.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkFileWriterFactory.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSink.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBranch.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBranch.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBranch.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkBranch.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Base.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Base.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Base.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Base.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Branch.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Branch.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Branch.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2Branch.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkManifest.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkManifest.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkManifest.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkManifest.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPartitioningWriters.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPartitioningWriters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPartitioningWriters.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPartitioningWriters.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPositionDeltaWriters.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPositionDeltaWriters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPositionDeltaWriters.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkPositionDeltaWriters.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkRollingFileWriters.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkRollingFileWriters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkRollingFileWriters.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkRollingFileWriters.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkWriterMetrics.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkWriterMetrics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkWriterMetrics.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkWriterMetrics.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergFilesCommitter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergStreamWriter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergStreamWriter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergStreamWriter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergStreamWriter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestRowDataPartitionKey.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestRowDataPartitionKey.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestRowDataPartitionKey.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestRowDataPartitionKey.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestTaskWriters.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestTaskWriters.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/TestTaskWriters.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/TestTaskWriters.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatistics.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatistics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatistics.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatistics.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatisticsTracker.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatisticsTracker.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatisticsTracker.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestAggregatedStatisticsTracker.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinator.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinator.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinator.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinatorProvider.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinatorProvider.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinatorProvider.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsCoordinatorProvider.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsOperator.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsOperator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsOperator.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestDataStatisticsOperator.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTableFactory.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTableFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTableFactory.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTableFactory.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTestSource.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTestSource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTestSource.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/BoundedTestSource.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/ChangeLogTableTestBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/ChangeLogTableTestBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/ChangeLogTableTestBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/ChangeLogTableTestBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/SplitHelpers.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/SplitHelpers.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/SplitHelpers.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/SplitHelpers.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/SqlHelpers.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/SqlHelpers.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/SqlHelpers.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/SqlHelpers.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestBoundedTableFactory.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestBoundedTableFactory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestBoundedTableFactory.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestBoundedTableFactory.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormat.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormat.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormat.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormat.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormatReaderDeletes.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormatReaderDeletes.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormatReaderDeletes.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkInputFormatReaderDeletes.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMergingMetrics.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMergingMetrics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMergingMetrics.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMergingMetrics.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMetaDataTable.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMetaDataTable.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMetaDataTable.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkMetaDataTable.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkReaderDeletesBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkReaderDeletesBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkReaderDeletesBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkReaderDeletesBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScan.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScan.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScan.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScan.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScanSql.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScanSql.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScanSql.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkScanSql.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSource.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSource.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSource.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceConfig.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceConfig.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceConfig.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceConfig.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceSql.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceSql.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceSql.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkSourceSql.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBounded.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBounded.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBounded.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBounded.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedGenericRecord.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedGenericRecord.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedGenericRecord.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedGenericRecord.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedSql.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedSql.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedSql.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceBoundedSql.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceContinuous.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceContinuous.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceContinuous.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceContinuous.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailover.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailover.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailover.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailover.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailoverWithWatermarkExtractor.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailoverWithWatermarkExtractor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailoverWithWatermarkExtractor.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceFailoverWithWatermarkExtractor.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceReaderDeletes.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceReaderDeletes.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceReaderDeletes.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceReaderDeletes.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceSql.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceSql.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceSql.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceSql.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceWithWatermarkExtractor.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceWithWatermarkExtractor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceWithWatermarkExtractor.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestIcebergSourceWithWatermarkExtractor.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestMetadataTableReadableMetrics.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestProjectMetaColumn.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestProjectMetaColumn.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestProjectMetaColumn.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestProjectMetaColumn.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestRowDataToAvroGenericRecordConverter.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestRowDataToAvroGenericRecordConverter.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestRowDataToAvroGenericRecordConverter.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestRowDataToAvroGenericRecordConverter.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestSourceUtil.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestSourceUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestSourceUtil.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestSourceUtil.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestSqlBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestSqlBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestSqlBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestSqlBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamScanSql.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingMonitorFunction.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingMonitorFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingMonitorFunction.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingMonitorFunction.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingReaderOperator.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingReaderOperator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingReaderOperator.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/TestStreamingReaderOperator.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/SplitAssignerTestBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/SplitAssignerTestBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/SplitAssignerTestBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/SplitAssignerTestBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestDefaultSplitAssigner.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestDefaultSplitAssigner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestDefaultSplitAssigner.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestDefaultSplitAssigner.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestFileSequenceNumberBasedSplitAssigner.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/assigner/TestWatermarkBasedSplitAssigner.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/ManualContinuousSplitPlanner.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/ManualContinuousSplitPlanner.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/ManualContinuousSplitPlanner.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/ManualContinuousSplitPlanner.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousIcebergEnumerator.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousIcebergEnumerator.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousIcebergEnumerator.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousIcebergEnumerator.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImplStartStrategy.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImplStartStrategy.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImplStartStrategy.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImplStartStrategy.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestEnumerationHistory.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestEnumerationHistory.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestEnumerationHistory.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestEnumerationHistory.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestIcebergEnumeratorStateSerializer.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestIcebergEnumeratorStateSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestIcebergEnumeratorStateSerializer.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestIcebergEnumeratorStateSerializer.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderFunctionTestBase.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderFunctionTestBase.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderFunctionTestBase.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderFunctionTestBase.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/ReaderUtil.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayBatchRecords.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayBatchRecords.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayBatchRecords.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayBatchRecords.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayPoolDataIteratorBatcherRowData.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayPoolDataIteratorBatcherRowData.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayPoolDataIteratorBatcherRowData.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestArrayPoolDataIteratorBatcherRowData.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestColumnStatsWatermarkExtractor.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestColumnStatsWatermarkExtractor.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestColumnStatsWatermarkExtractor.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestColumnStatsWatermarkExtractor.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestIcebergSourceReader.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestRowDataReaderFunction.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestingMetricGroup.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestingMetricGroup.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestingMetricGroup.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/reader/TestingMetricGroup.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/split/TestIcebergSourceSplitSerializer.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/split/TestIcebergSourceSplitSerializer.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/source/split/TestIcebergSourceSplitSerializer.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/split/TestIcebergSourceSplitSerializer.java
diff --git 
a/flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/util/TestFlinkPackage.java
 
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/util/TestFlinkPackage.java
similarity index 100%
rename from 
flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/util/TestFlinkPackage.java
rename to 
flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/util/TestFlinkPackage.java
diff --git 
a/flink/v1.17/flink/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
 
b/flink/v1.18/flink/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 100%
rename from 
flink/v1.17/flink/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory
rename to 
flink/v1.18/flink/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory


Reply via email to