diff --git a/core/src/main/java/org/apache/iceberg/LocationProviders.java b/core/src/main/java/org/apache/iceberg/LocationProviders.java
index 6a75529ddb91..083e8b15f1d6 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<String, String> 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 2.0.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..593dbc570b8a 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 2.0.0
    */
   @Deprecated
   public static MetricsConfig fromProperties(Map<String, String> 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<Boolean> 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/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<Integer> 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/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 <D> RawDecoder<D> 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 1e6ac961d3be..44ef70bcbd20 100644
--- a/core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java
+++ b/core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManager.java
@@ -81,7 +81,7 @@ private TransientEncryptionState(KeyManagementClient kmsClient, List<EncryptedKe
   private transient volatile SecureRandom lazyRNG = null;
 
   /**
-   * @deprecated will be removed in 2.0.
+   * @deprecated will be removed in 1.12.0.
    */
   @Deprecated
   public StandardEncryptionManager(
@@ -141,7 +141,7 @@ private SecureRandom workerRNG() {
   }
 
   /**
-   * @deprecated will be removed in 2.0.
+   * @deprecated will be removed in 1.12.0.
    */
   @Deprecated
   public ByteBuffer wrapKey(ByteBuffer secretKey) {
@@ -154,7 +154,7 @@ public ByteBuffer wrapKey(ByteBuffer secretKey) {
   }
 
   /**
-   * @deprecated will be removed in 2.0.
+   * @deprecated will be removed in 1.12.0.
    */
   @Deprecated
   public ByteBuffer unwrapKey(ByteBuffer wrappedSecretKey) {
diff --git a/core/src/main/java/org/apache/iceberg/io/ContentCache.java b/core/src/main/java/org/apache/iceberg/io/ContentCache.java
index fd171f7806e2..484306690c67 100644
--- a/core/src/main/java/org/apache/iceberg/io/ContentCache.java
+++ b/core/src/main/java/org/apache/iceberg/io/ContentCache.java
@@ -140,7 +140,7 @@ public void invalidate(String key) {
   }
 
   /**
-   * @deprecated since 1.7.0, will be removed in 2.0.0; This method does only best-effort
+   * @deprecated since 1.7.0, will be removed in 1.12.0; This method does only best-effort
    *     invalidation and is susceptible to a race condition. If the caller changed the state that
    *     could be cached (perhaps files on the storage) and calls this method, there is no guarantee
    *     that the cache will not contain stale entries some time after this method returns.
diff --git a/core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java b/core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java
index b903f13adc09..b243b72c2d11 100644
--- a/core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java
+++ b/core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java
@@ -107,7 +107,7 @@ public class RESTSessionCatalog extends BaseViewSessionCatalog
   private static final String DEFAULT_FILE_IO_IMPL = "org.apache.iceberg.io.ResolvingFileIO";
 
   /**
-   * @deprecated will be removed in 2.0.0. Use {@link
+   * @deprecated will be removed in 1.12.0. Use {@link
    *     org.apache.iceberg.rest.RESTCatalogProperties#PAGE_SIZE} instead.
    */
   @Deprecated public static final String REST_PAGE_SIZE = "rest-page-size";
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<Long> toIds(Iterable<Snapshot> 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..bb508295ecfa 100644
--- a/core/src/main/java/org/apache/iceberg/util/ThreadPools.java
+++ b/core/src/main/java/org/apache/iceberg/util/ThreadPools.java
@@ -35,8 +35,8 @@ public class ThreadPools {
   private ThreadPools() {}
 
   /**
-   * @deprecated Use {@link SystemConfigs#WORKER_THREAD_POOL_SIZE WORKER_THREAD_POOL_SIZE} instead;
-   *     will be removed in 2.0.0
+   * @deprecated Use {@link SystemConfigs#WORKER_THREAD_POOL_SIZE} instead. 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/test/java/org/apache/iceberg/TestLocationProvider.java b/core/src/test/java/org/apache/iceberg/TestLocationProvider.java
index 93b4d582942e..146f2c8da5e7 100644
--- a/core/src/test/java/org/apache/iceberg/TestLocationProvider.java
+++ b/core/src/test/java/org/apache/iceberg/TestLocationProvider.java
@@ -219,7 +219,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 2.0.0, use 'write.data.path' instead.");
 
     table
         .updateProperties()
@@ -230,7 +230,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 2.0.0, use 'write.data.path' instead.");
   }
 
   @TestTemplate
@@ -245,7 +245,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 2.0.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..06fdc562a8ca 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")
+    // This is deprecated in JDK, we have to remove it once removed there.
+    @SuppressWarnings("deprecation")
     @Override
     public void setUnicodeStream(int parameterIndex, InputStream inputStream, int length)
         throws SQLException {