apache · kaxil · Oct 22, 2025 · Oct 22, 2025 · Oct 22, 2025
diff --git a/providers/apache/beam/src/airflow/providers/apache/beam/hooks/beam.py b/providers/apache/beam/src/airflow/providers/apache/beam/hooks/beam.py
@@ -35,7 +35,7 @@
 from packaging.version import Version
 
 from airflow.exceptions import AirflowConfigException, AirflowException
-from airflow.providers.apache.beam.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.common.compat.standard.utils import prepare_virtualenv
 
 if TYPE_CHECKING:

diff --git a/providers/apache/beam/src/airflow/providers/apache/beam/operators/beam.py b/providers/apache/beam/src/airflow/providers/apache/beam/operators/beam.py
@@ -34,14 +34,13 @@
 from airflow.exceptions import AirflowException, AirflowOptionalProviderFeatureException
 from airflow.providers.apache.beam.hooks.beam import BeamHook, BeamRunnerType
 from airflow.providers.apache.beam.triggers.beam import BeamJavaPipelineTrigger, BeamPythonPipelineTrigger
-from airflow.providers.apache.beam.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers_manager import ProvidersManager
 from airflow.utils.helpers import convert_camel_to_snake, exactly_one
 from airflow.version import version
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
-
+    from airflow.providers.common.compat.sdk import Context
 GOOGLE_PROVIDER = ProvidersManager().providers.get("apache-airflow-providers-google")
 
 

diff --git a/providers/apache/beam/src/airflow/providers/apache/beam/version_compat.py b/providers/apache/beam/src/airflow/providers/apache/beam/version_compat.py
@@ -31,14 +31,6 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 AIRFLOW_V_3_1_PLUS = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook, BaseOperator
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-    from airflow.models import BaseOperator
-
 __all__ = [
     "AIRFLOW_V_3_1_PLUS",
-    "BaseHook",
-    "BaseOperator",
 ]
diff --git a/providers/apache/cassandra/pyproject.toml b/providers/apache/cassandra/pyproject.toml
@@ -61,11 +61,19 @@ dependencies = [
     "cassandra-driver>=3.29.1",
 ]
 
+# The optional dependencies should be modified in place in the generated file
+# Any change in the dependencies is preserved when the file is regenerated
+[project.optional-dependencies]
+"common.compat" = [
+    "apache-airflow-providers-common-compat"
+]
+
 [dependency-groups]
 dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
 ]
 

diff --git a/providers/apache/cassandra/src/airflow/providers/apache/cassandra/hooks/cassandra.py b/providers/apache/cassandra/src/airflow/providers/apache/cassandra/hooks/cassandra.py
@@ -31,7 +31,7 @@
     WhiteListRoundRobinPolicy,
 )
 
-from airflow.providers.apache.cassandra.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 Policy: TypeAlias = DCAwareRoundRobinPolicy | RoundRobinPolicy | TokenAwarePolicy | WhiteListRoundRobinPolicy

diff --git a/providers/apache/cassandra/src/airflow/providers/apache/cassandra/sensors/record.py b/providers/apache/cassandra/src/airflow/providers/apache/cassandra/sensors/record.py
@@ -21,10 +21,10 @@
 from typing import TYPE_CHECKING, Any
 
 from airflow.providers.apache.cassandra.hooks.cassandra import CassandraHook
-from airflow.providers.apache.cassandra.version_compat import BaseSensorOperator
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class CassandraRecordSensor(BaseSensorOperator):

diff --git a/providers/apache/cassandra/src/airflow/providers/apache/cassandra/sensors/table.py b/providers/apache/cassandra/src/airflow/providers/apache/cassandra/sensors/table.py
@@ -21,10 +21,10 @@
 from typing import TYPE_CHECKING, Any
 
 from airflow.providers.apache.cassandra.hooks.cassandra import CassandraHook
-from airflow.providers.apache.cassandra.version_compat import BaseSensorOperator
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class CassandraTableSensor(BaseSensorOperator):

diff --git a/providers/apache/cassandra/src/airflow/providers/apache/cassandra/version_compat.py b/providers/apache/cassandra/src/airflow/providers/apache/cassandra/version_compat.py
@@ -35,20 +35,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseSensorOperator
-else:
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
-
 __all__ = [
     "AIRFLOW_V_3_0_PLUS",
     "AIRFLOW_V_3_1_PLUS",
-    "BaseHook",
-    "BaseSensorOperator",
 ]
diff --git a/providers/apache/flink/pyproject.toml b/providers/apache/flink/pyproject.toml
@@ -62,12 +62,20 @@ dependencies = [
     "apache-airflow-providers-cncf-kubernetes>=5.1.0",
 ]
 
+# The optional dependencies should be modified in place in the generated file
+# Any change in the dependencies is preserved when the file is regenerated
+[project.optional-dependencies]
+"common.compat" = [
+    "apache-airflow-providers-common-compat"
+]
+
 [dependency-groups]
 dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
     "apache-airflow-providers-cncf-kubernetes",
+    "apache-airflow-providers-common-compat",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
 ]
 

diff --git a/providers/apache/flink/src/airflow/providers/apache/flink/operators/flink_kubernetes.py b/providers/apache/flink/src/airflow/providers/apache/flink/operators/flink_kubernetes.py
@@ -21,13 +21,13 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from airflow.providers.apache.flink.version_compat import BaseOperator
 from airflow.providers.cncf.kubernetes.hooks.kubernetes import KubernetesHook
+from airflow.providers.common.compat.sdk import BaseOperator
 
 if TYPE_CHECKING:
     from kubernetes.client import CoreV1Api
 
-    from airflow.providers.apache.flink.version_compat import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class FlinkKubernetesOperator(BaseOperator):

diff --git a/providers/apache/flink/src/airflow/providers/apache/flink/sensors/flink_kubernetes.py b/providers/apache/flink/src/airflow/providers/apache/flink/sensors/flink_kubernetes.py
@@ -23,11 +23,11 @@
 from kubernetes import client
 
 from airflow.exceptions import AirflowException
-from airflow.providers.apache.flink.version_compat import BaseSensorOperator
 from airflow.providers.cncf.kubernetes.hooks.kubernetes import KubernetesHook
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
-    from airflow.providers.apache.flink.version_compat import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class FlinkKubernetesSensor(BaseSensorOperator):

diff --git a/providers/apache/flink/src/airflow/providers/apache/flink/version_compat.py b/providers/apache/flink/src/airflow/providers/apache/flink/version_compat.py
@@ -34,17 +34,6 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator, BaseSensorOperator
-    from airflow.sdk.definitions.context import Context
-else:
-    from airflow.models import BaseOperator
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
-    from airflow.utils.context import Context
-
 __all__ = [
     "AIRFLOW_V_3_0_PLUS",
-    "BaseOperator",
-    "BaseSensorOperator",
-    "Context",
 ]
diff --git a/providers/apache/hdfs/pyproject.toml b/providers/apache/hdfs/pyproject.toml
@@ -64,11 +64,19 @@ dependencies = [
     'pandas>=2.2.3; python_version >="3.13"',
 ]
 
+# The optional dependencies should be modified in place in the generated file
+# Any change in the dependencies is preserved when the file is regenerated
+[project.optional-dependencies]
+"common.compat" = [
+    "apache-airflow-providers-common-compat"
+]
+
 [dependency-groups]
 dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
 ]
 

diff --git a/providers/apache/hdfs/src/airflow/providers/apache/hdfs/hooks/webhdfs.py b/providers/apache/hdfs/src/airflow/providers/apache/hdfs/hooks/webhdfs.py
@@ -26,7 +26,7 @@
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
-from airflow.providers.apache.hdfs.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 log = logging.getLogger(__name__)
 

diff --git a/providers/apache/hdfs/src/airflow/providers/apache/hdfs/sensors/web_hdfs.py b/providers/apache/hdfs/src/airflow/providers/apache/hdfs/sensors/web_hdfs.py
@@ -20,13 +20,13 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any
 
-from airflow.providers.apache.hdfs.version_compat import BaseSensorOperator
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
     from hdfs import InsecureClient
     from hdfs.ext.kerberos import KerberosClient
 
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class WebHdfsSensor(BaseSensorOperator):

diff --git a/providers/apache/hdfs/src/airflow/providers/apache/hdfs/version_compat.py b/providers/apache/hdfs/src/airflow/providers/apache/hdfs/version_compat.py
@@ -35,20 +35,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseSensorOperator
-else:
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
-
-
 __all__ = [
     "AIRFLOW_V_3_0_PLUS",
     "AIRFLOW_V_3_1_PLUS",
-    "BaseHook",
-    "BaseSensorOperator",
 ]
diff --git a/providers/apache/hive/pyproject.toml b/providers/apache/hive/pyproject.toml
@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.7.4",    # + TODO: bump to next version
     "apache-airflow-providers-common-sql>=1.26.0",
     "hmsclient>=0.1.0",
     'pandas>=2.1.2; python_version <"3.13"',
@@ -98,6 +99,7 @@ dev = [
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
     "apache-airflow-providers-amazon",
+    "apache-airflow-providers-common-compat",
     "apache-airflow-providers-common-sql",
     "apache-airflow-providers-microsoft-mssql",
     "apache-airflow-providers-mysql",

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/hooks/hive.py b/providers/apache/hive/src/airflow/providers/apache/hive/hooks/hive.py
@@ -33,7 +33,7 @@
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
-from airflow.providers.apache.hive.version_compat import (
+from airflow.providers.common.compat.sdk import (
     AIRFLOW_VAR_NAME_FORMAT_MAPPING,
     BaseHook,
 )

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/operators/hive.py b/providers/apache/hive/src/airflow/providers/apache/hive/operators/hive.py
@@ -25,14 +25,14 @@
 
 from airflow.configuration import conf
 from airflow.providers.apache.hive.hooks.hive import HiveCliHook
-from airflow.providers.apache.hive.version_compat import (
+from airflow.providers.common.compat.sdk import (
     AIRFLOW_VAR_NAME_FORMAT_MAPPING,
     BaseOperator,
     context_to_airflow_vars,
 )
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class HiveOperator(BaseOperator):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/operators/hive_stats.py b/providers/apache/hive/src/airflow/providers/apache/hive/operators/hive_stats.py
@@ -23,12 +23,12 @@
 
 from airflow.exceptions import AirflowException
 from airflow.providers.apache.hive.hooks.hive import HiveMetastoreHook
-from airflow.providers.apache.hive.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.mysql.hooks.mysql import MySqlHook
 from airflow.providers.presto.hooks.presto import PrestoHook
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class HiveStatsCollectionOperator(BaseOperator):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/sensors/hive_partition.py b/providers/apache/hive/src/airflow/providers/apache/hive/sensors/hive_partition.py
@@ -21,10 +21,10 @@
 from typing import TYPE_CHECKING, Any
 
 from airflow.providers.apache.hive.hooks.hive import HiveMetastoreHook
-from airflow.providers.apache.hive.version_compat import BaseSensorOperator
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class HivePartitionSensor(BaseSensorOperator):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/sensors/metastore_partition.py b/providers/apache/hive/src/airflow/providers/apache/hive/sensors/metastore_partition.py
@@ -23,7 +23,7 @@
 from airflow.providers.common.sql.sensors.sql import SqlSensor
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class MetastorePartitionSensor(SqlSensor):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/sensors/named_hive_partition.py b/providers/apache/hive/src/airflow/providers/apache/hive/sensors/named_hive_partition.py
@@ -20,10 +20,10 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any
 
-from airflow.providers.apache.hive.version_compat import BaseSensorOperator
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class NamedHivePartitionSensor(BaseSensorOperator):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/transfers/hive_to_mysql.py b/providers/apache/hive/src/airflow/providers/apache/hive/transfers/hive_to_mysql.py
@@ -24,11 +24,11 @@
 from typing import TYPE_CHECKING
 
 from airflow.providers.apache.hive.hooks.hive import HiveServer2Hook
-from airflow.providers.apache.hive.version_compat import BaseOperator, context_to_airflow_vars
+from airflow.providers.common.compat.sdk import BaseOperator, context_to_airflow_vars
 from airflow.providers.mysql.hooks.mysql import MySqlHook
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class HiveToMySqlOperator(BaseOperator):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/transfers/hive_to_samba.py b/providers/apache/hive/src/airflow/providers/apache/hive/transfers/hive_to_samba.py
@@ -24,11 +24,11 @@
 from typing import TYPE_CHECKING
 
 from airflow.providers.apache.hive.hooks.hive import HiveServer2Hook
-from airflow.providers.apache.hive.version_compat import BaseOperator, context_to_airflow_vars
+from airflow.providers.common.compat.sdk import BaseOperator, context_to_airflow_vars
 from airflow.providers.samba.hooks.samba import SambaHook
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class HiveToSambaOperator(BaseOperator):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/transfers/mssql_to_hive.py b/providers/apache/hive/src/airflow/providers/apache/hive/transfers/mssql_to_hive.py
@@ -27,11 +27,11 @@
 import pymssql
 
 from airflow.providers.apache.hive.hooks.hive import HiveCliHook
-from airflow.providers.apache.hive.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.mssql.hooks.mssql import MsSqlHook
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class MsSqlToHiveOperator(BaseOperator):

diff --git a/providers/apache/hive/src/airflow/providers/apache/hive/transfers/mysql_to_hive.py b/providers/apache/hive/src/airflow/providers/apache/hive/transfers/mysql_to_hive.py
@@ -37,11 +37,11 @@
 
 
 from airflow.providers.apache.hive.hooks.hive import HiveCliHook
-from airflow.providers.apache.hive.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.mysql.hooks.mysql import MySqlHook
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class MySqlToHiveOperator(BaseOperator):