diff --git a/core/src/main/java/org/apache/iceberg/LocationProviders.java b/core/src/main/java/org/apache/iceberg/LocationProviders.java index 6a75529ddb91..13594c4f7c25 100644 --- a/core/src/main/java/org/apache/iceberg/LocationProviders.java +++ b/core/src/main/java/org/apache/iceberg/LocationProviders.java @@ -87,7 +87,7 @@ private static String getAndCheckLegacyLocation(Map properties, if (value != null && DEPRECATED_PROPERTIES.contains(key)) { throw new IllegalArgumentException( String.format( - "Property '%s' has been deprecated and will be removed in 2.0, use '%s' instead.", + "Property '%s' has been deprecated and will be removed in 1.12.0, use '%s' instead.", key, TableProperties.WRITE_DATA_LOCATION)); } diff --git a/core/src/main/java/org/apache/iceberg/MetricsConfig.java b/core/src/main/java/org/apache/iceberg/MetricsConfig.java index 9d1022f5c354..8e6479117c78 100644 --- a/core/src/main/java/org/apache/iceberg/MetricsConfig.java +++ b/core/src/main/java/org/apache/iceberg/MetricsConfig.java @@ -84,7 +84,7 @@ public static MetricsConfig forPositionDelete() { * Creates a metrics config from table configuration. * * @param props table configuration - * @deprecated use {@link MetricsConfig#forTable(Table)} + * @deprecated use {@link MetricsConfig#forTable(Table)}. Will be removed in 1.12.0 */ @Deprecated public static MetricsConfig fromProperties(Map props) { diff --git a/core/src/main/java/org/apache/iceberg/SystemConfigs.java b/core/src/main/java/org/apache/iceberg/SystemConfigs.java index ad40c17e3076..be59424992ee 100644 --- a/core/src/main/java/org/apache/iceberg/SystemConfigs.java +++ b/core/src/main/java/org/apache/iceberg/SystemConfigs.java @@ -81,7 +81,7 @@ private SystemConfigs() {} Integer::parseUnsignedInt); /** - * @deprecated will be removed in 2.0.0; use name mapping instead + * @deprecated will be removed in 1.12.0; use name mapping instead */ @Deprecated public static final ConfigEntry NETFLIX_UNSAFE_PARQUET_ID_FALLBACK_ENABLED = @@ -91,7 +91,7 @@ private SystemConfigs() {} true, s -> { LOG.warn( - "Fallback ID assignment in Parquet is UNSAFE and will be removed in 2.0.0. Use name mapping instead."); + "Fallback ID assignment in Parquet is UNSAFE and will be removed in 1.12.0. Use name mapping instead."); return Boolean.parseBoolean(s); }); diff --git a/core/src/main/java/org/apache/iceberg/SystemProperties.java b/core/src/main/java/org/apache/iceberg/SystemProperties.java index 7a83d530e2f6..484879bb21b1 100644 --- a/core/src/main/java/org/apache/iceberg/SystemProperties.java +++ b/core/src/main/java/org/apache/iceberg/SystemProperties.java @@ -21,7 +21,7 @@ /** * Configuration properties that are controlled by Java system properties. * - * @deprecated Use {@link SystemConfigs} instead; will be removed in 2.0.0 + * @deprecated Use {@link SystemConfigs} instead; will be removed in 1.12.0 */ @Deprecated public class SystemProperties { diff --git a/core/src/main/java/org/apache/iceberg/TableProperties.java b/core/src/main/java/org/apache/iceberg/TableProperties.java index 0f44ffc521fc..9b7fb4691ec2 100644 --- a/core/src/main/java/org/apache/iceberg/TableProperties.java +++ b/core/src/main/java/org/apache/iceberg/TableProperties.java @@ -256,14 +256,14 @@ private TableProperties() {} public static final boolean WRITE_OBJECT_STORE_PARTITIONED_PATHS_DEFAULT = true; /** - * @deprecated will be removed in 2.0.0, use {@link #WRITE_DATA_LOCATION} instead. + * @deprecated will be removed in 1.12.0, use {@link #WRITE_DATA_LOCATION} instead. */ @Deprecated public static final String OBJECT_STORE_PATH = "write.object-storage.path"; public static final String WRITE_LOCATION_PROVIDER_IMPL = "write.location-provider.impl"; /** - * @deprecated will be removed in 2.0.0, use {@link #WRITE_DATA_LOCATION} instead. + * @deprecated will be removed in 1.12.0, use {@link #WRITE_DATA_LOCATION} instead. */ @Deprecated public static final String WRITE_FOLDER_STORAGE_LOCATION = "write.folder-storage.path"; @@ -282,12 +282,12 @@ private TableProperties() {} public static final int WRITE_PARTITION_SUMMARY_LIMIT_DEFAULT = 0; /** - * @deprecated will be removed in 2.0.0, writing manifest lists is always enabled + * @deprecated will be removed in 1.12.0, writing manifest lists is always enabled */ @Deprecated public static final String MANIFEST_LISTS_ENABLED = "write.manifest-lists.enabled"; /** - * @deprecated will be removed in 2.0.0, writing manifest lists is always enabled + * @deprecated will be removed in 1.12.0, writing manifest lists is always enabled */ @Deprecated public static final boolean MANIFEST_LISTS_ENABLED_DEFAULT = true; diff --git a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java index e5aef3605ea5..c67a3089a6bf 100644 --- a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java +++ b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java @@ -129,7 +129,7 @@ public static Schema pruneColumns(Schema schema, Set selectedIds) { } /** - * @deprecated will be removed in 2.0.0; use applyNameMapping and pruneColumns(Schema, Set) + * @deprecated will be removed in 1.12.0; use applyNameMapping and pruneColumns(Schema, Set) * instead. */ @Deprecated diff --git a/core/src/main/java/org/apache/iceberg/data/avro/DataReader.java b/core/src/main/java/org/apache/iceberg/data/avro/DataReader.java index 75929dfde4c4..5647253a5b4c 100644 --- a/core/src/main/java/org/apache/iceberg/data/avro/DataReader.java +++ b/core/src/main/java/org/apache/iceberg/data/avro/DataReader.java @@ -37,7 +37,7 @@ import org.apache.iceberg.types.Types; /** - * @deprecated will be removed in 2.0.0; use {@link PlannedDataReader} instead. + * @deprecated will be removed in 1.12.0; use {@link PlannedDataReader} instead. */ @Deprecated public class DataReader implements DatumReader, SupportsRowPosition { diff --git a/core/src/main/java/org/apache/iceberg/data/avro/RawDecoder.java b/core/src/main/java/org/apache/iceberg/data/avro/RawDecoder.java index 436cba05c73a..9f3cdfdad5f4 100644 --- a/core/src/main/java/org/apache/iceberg/data/avro/RawDecoder.java +++ b/core/src/main/java/org/apache/iceberg/data/avro/RawDecoder.java @@ -64,7 +64,7 @@ public static RawDecoder create( * schema used to decode buffers. The {@code writeSchema} must be the schema that was used to * encode all buffers decoded by this class. * - * @deprecated will be removed in 2.0.0; use {@link #create(org.apache.iceberg.Schema, Function, + * @deprecated will be removed in 1.12.0; use {@link #create(org.apache.iceberg.Schema, Function, * Schema)} instead */ @Deprecated diff --git a/core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java b/core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java index b68cf4ed67e4..249a11b7957e 100644 --- a/core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java +++ b/core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java @@ -75,7 +75,7 @@ private TransientEncryptionState(KeyManagementClient kmsClient, List properties) { if (properties.containsKey(SIGV4_ENABLED_LEGACY)) { LOG.warn( - "The property {} is deprecated and will be removed in a future release. " + "The property {} is deprecated and will be removed in 1.12.0. " + "Please use the property {}={} instead.", SIGV4_ENABLED_LEGACY, AuthProperties.AUTH_TYPE, diff --git a/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java b/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java index a040bd26786d..3c6911abefce 100644 --- a/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java +++ b/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java @@ -283,7 +283,7 @@ private static Iterable toIds(Iterable snapshots) { } /** - * @deprecated will be removed in 2.0.0, use {@link #newFilesBetween(Long, long, Function, + * @deprecated will be removed in 1.12.0, use {@link #newFilesBetween(Long, long, Function, * FileIO)} instead. */ @Deprecated diff --git a/core/src/main/java/org/apache/iceberg/util/ThreadPools.java b/core/src/main/java/org/apache/iceberg/util/ThreadPools.java index a96f020fe8aa..4d789b31bf35 100644 --- a/core/src/main/java/org/apache/iceberg/util/ThreadPools.java +++ b/core/src/main/java/org/apache/iceberg/util/ThreadPools.java @@ -36,7 +36,7 @@ private ThreadPools() {} /** * @deprecated Use {@link SystemConfigs#WORKER_THREAD_POOL_SIZE WORKER_THREAD_POOL_SIZE} instead; - * will be removed in 2.0.0 + * will be removed in 1.12.0 */ @Deprecated public static final String WORKER_THREAD_POOL_SIZE_PROP = @@ -113,7 +113,7 @@ private static class AuthRefreshPoolHolder { * either {@link #newExitingWorkerPool(String, int)} or {@link #newFixedThreadPool(String, int)}, * depending on the intended lifecycle of the thread pool. * - * @deprecated will be removed in 2.0.0. Use {@link #newExitingWorkerPool(String, int)} for + * @deprecated will be removed in 1.12.0. Use {@link #newExitingWorkerPool(String, int)} for * long-lived thread pools that require a shutdown hook, or {@link #newFixedThreadPool(String, * int)} for short-lived thread pools where you manage the lifecycle. */ @@ -134,7 +134,7 @@ public static ExecutorService newWorkerPool(String namePrefix) { * either {@link #newExitingWorkerPool(String, int)} or {@link #newFixedThreadPool(String, int)}, * depending on the intended lifecycle of the thread pool. * - * @deprecated will be removed in 2.0.0. Use {@link #newExitingWorkerPool(String, int)} for + * @deprecated will be removed in 1.12.0. Use {@link #newExitingWorkerPool(String, int)} for * long-lived thread pools that require a shutdown hook, or {@link #newFixedThreadPool(String, * int)} for short-lived thread pools where you manage the lifecycle. */ diff --git a/core/src/main/java/org/apache/iceberg/view/ViewProperties.java b/core/src/main/java/org/apache/iceberg/view/ViewProperties.java index e396beece0a6..d1334180427e 100644 --- a/core/src/main/java/org/apache/iceberg/view/ViewProperties.java +++ b/core/src/main/java/org/apache/iceberg/view/ViewProperties.java @@ -27,7 +27,7 @@ public class ViewProperties { public static final String METADATA_COMPRESSION_DEFAULT = "gzip"; /** - * @deprecated will be removed in 2.0.0, use {@link ViewBuilder#withLocation} instead. + * @deprecated will be removed in 1.12.0, use {@link ViewBuilder#withLocation} instead. */ @Deprecated public static final String WRITE_METADATA_LOCATION = "write.metadata.path"; diff --git a/core/src/test/java/org/apache/iceberg/TestLocationProvider.java b/core/src/test/java/org/apache/iceberg/TestLocationProvider.java index dfe4d946c331..d92d95be327c 100644 --- a/core/src/test/java/org/apache/iceberg/TestLocationProvider.java +++ b/core/src/test/java/org/apache/iceberg/TestLocationProvider.java @@ -220,7 +220,7 @@ public void testObjectStorageLocationProviderThrowOnDeprecatedProperties() { assertThatThrownBy(() -> table.locationProvider().newDataLocation("file")) .isInstanceOf(IllegalArgumentException.class) .hasMessage( - "Property 'write.folder-storage.path' has been deprecated and will be removed in 2.0, use 'write.data.path' instead."); + "Property 'write.folder-storage.path' has been deprecated and will be removed in 1.12.0, use 'write.data.path' instead."); table .updateProperties() @@ -231,7 +231,7 @@ public void testObjectStorageLocationProviderThrowOnDeprecatedProperties() { assertThatThrownBy(() -> table.locationProvider().newDataLocation("file")) .isInstanceOf(IllegalArgumentException.class) .hasMessage( - "Property 'write.object-storage.path' has been deprecated and will be removed in 2.0, use 'write.data.path' instead."); + "Property 'write.object-storage.path' has been deprecated and will be removed in 1.12.0, use 'write.data.path' instead."); } @TestTemplate @@ -246,7 +246,7 @@ public void testDefaultStorageLocationProviderThrowOnDeprecatedProperties() { assertThatThrownBy(() -> table.locationProvider().newDataLocation("file")) .isInstanceOf(IllegalArgumentException.class) .hasMessage( - "Property 'write.folder-storage.path' has been deprecated and will be removed in 2.0, use 'write.data.path' instead."); + "Property 'write.folder-storage.path' has been deprecated and will be removed in 1.12.0, use 'write.data.path' instead."); } @TestTemplate diff --git a/core/src/test/java/org/apache/iceberg/jdbc/TestJdbcTableConcurrency.java b/core/src/test/java/org/apache/iceberg/jdbc/TestJdbcTableConcurrency.java index db264e4ffc18..5f1a24fc3796 100644 --- a/core/src/test/java/org/apache/iceberg/jdbc/TestJdbcTableConcurrency.java +++ b/core/src/test/java/org/apache/iceberg/jdbc/TestJdbcTableConcurrency.java @@ -646,7 +646,8 @@ public void setAsciiStream(int parameterIndex, InputStream x, int length) throws delegate.setAsciiStream(parameterIndex, x, length); } - @Deprecated(since = "1.2") + /* @deprecated Will be removed in 1.12.0 */ + @Deprecated @Override public void setUnicodeStream(int parameterIndex, InputStream inputStream, int length) throws SQLException {