diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/resources/writeable-serializer-2.2/serializer-snapshot b/flink-connectors/flink-hadoop-compatibility/src/test/resources/writeable-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..0af5d65ae9012
Binary files /dev/null and b/flink-connectors/flink-hadoop-compatibility/src/test/resources/writeable-serializer-2.2/serializer-snapshot differ
diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/resources/writeable-serializer-2.2/test-data b/flink-connectors/flink-hadoop-compatibility/src/test/resources/writeable-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f43afaefb3520
Binary files /dev/null and b/flink-connectors/flink-hadoop-compatibility/src/test/resources/writeable-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/big-dec-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/big-dec-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..ccd31f3e8f9f3
Binary files /dev/null and b/flink-core/src/test/resources/big-dec-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/big-dec-serializer-2.2/test-data b/flink-core/src/test/resources/big-dec-serializer-2.2/test-data
new file mode 100644
index 0000000000000..c59e432682402
Binary files /dev/null and b/flink-core/src/test/resources/big-dec-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/big-int-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/big-int-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..b525669a164b7
Binary files /dev/null and b/flink-core/src/test/resources/big-int-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/big-int-serializer-2.2/test-data b/flink-core/src/test/resources/big-int-serializer-2.2/test-data
new file mode 100644
index 0000000000000..3d0079e672c0a
Binary files /dev/null and b/flink-core/src/test/resources/big-int-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/boolean-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/boolean-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..dfa6707ca0653
Binary files /dev/null and b/flink-core/src/test/resources/boolean-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/boolean-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/boolean-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..0e3eeb595e9d4
Binary files /dev/null and b/flink-core/src/test/resources/boolean-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/boolean-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/boolean-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..b1e867b8bc5cb
Binary files /dev/null and b/flink-core/src/test/resources/boolean-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/boolean-serializer-2.2/test-data b/flink-core/src/test/resources/boolean-serializer-2.2/test-data
new file mode 100644
index 0000000000000..6b2aaa7640726
--- /dev/null
+++ b/flink-core/src/test/resources/boolean-serializer-2.2/test-data
@@ -0,0 +1 @@
+

\ No newline at end of file
diff --git a/flink-core/src/test/resources/boolean-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/boolean-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..8511a731d7b42
Binary files /dev/null and b/flink-core/src/test/resources/boolean-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/boolean-value-serializer-2.2/test-data b/flink-core/src/test/resources/boolean-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..6b2aaa7640726
--- /dev/null
+++ b/flink-core/src/test/resources/boolean-value-serializer-2.2/test-data
@@ -0,0 +1 @@
+

\ No newline at end of file
diff --git a/flink-core/src/test/resources/byte-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/byte-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..071fdfdfff4f5
Binary files /dev/null and b/flink-core/src/test/resources/byte-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/byte-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/byte-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..1ea699b1ed218
Binary files /dev/null and b/flink-core/src/test/resources/byte-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/byte-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/byte-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..372634d912a25
Binary files /dev/null and b/flink-core/src/test/resources/byte-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/byte-serializer-2.2/test-data b/flink-core/src/test/resources/byte-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f59ec20aabf58
--- /dev/null
+++ b/flink-core/src/test/resources/byte-serializer-2.2/test-data
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/flink-core/src/test/resources/byte-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/byte-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..af6c1f0e67af9
Binary files /dev/null and b/flink-core/src/test/resources/byte-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/byte-value-serializer-2.2/test-data b/flink-core/src/test/resources/byte-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f59ec20aabf58
--- /dev/null
+++ b/flink-core/src/test/resources/byte-value-serializer-2.2/test-data
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/flink-core/src/test/resources/char-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/char-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..31a3a3452447a
Binary files /dev/null and b/flink-core/src/test/resources/char-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/char-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/char-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..cc4337be169c1
Binary files /dev/null and b/flink-core/src/test/resources/char-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/char-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/char-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..5f6308de382dc
Binary files /dev/null and b/flink-core/src/test/resources/char-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/char-serializer-2.2/test-data b/flink-core/src/test/resources/char-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f96c401f328b2
--- /dev/null
+++ b/flink-core/src/test/resources/char-serializer-2.2/test-data
@@ -0,0 +1 @@
+ÿÿ
\ No newline at end of file
diff --git a/flink-core/src/test/resources/char-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/char-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..67c2a46ee1ec2
Binary files /dev/null and b/flink-core/src/test/resources/char-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/char-value-serializer-2.2/test-data b/flink-core/src/test/resources/char-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..d399cc0405eb3
Binary files /dev/null and b/flink-core/src/test/resources/char-value-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/copyable-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/copyable-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..f1b8eb6f37004
Binary files /dev/null and b/flink-core/src/test/resources/copyable-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/copyable-value-serializer-2.2/test-data b/flink-core/src/test/resources/copyable-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..9ff9b97f863be
Binary files /dev/null and b/flink-core/src/test/resources/copyable-value-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/date-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/date-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..4794ebd6815d6
Binary files /dev/null and b/flink-core/src/test/resources/date-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/date-serializer-2.2/test-data b/flink-core/src/test/resources/date-serializer-2.2/test-data
new file mode 100644
index 0000000000000..1faf9a01d95ca
Binary files /dev/null and b/flink-core/src/test/resources/date-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/double-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/double-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..98ae2a649925f
Binary files /dev/null and b/flink-core/src/test/resources/double-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/double-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/double-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..349e318c93c3d
Binary files /dev/null and b/flink-core/src/test/resources/double-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/double-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/double-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..1383b642e931b
Binary files /dev/null and b/flink-core/src/test/resources/double-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/double-serializer-2.2/test-data b/flink-core/src/test/resources/double-serializer-2.2/test-data
new file mode 100644
index 0000000000000..5cfd3714ef643
--- /dev/null
+++ b/flink-core/src/test/resources/double-serializer-2.2/test-data
@@ -0,0 +1 @@
+@ÈÖæ1ø¡
\ No newline at end of file
diff --git a/flink-core/src/test/resources/double-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/double-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..604cef8589fd6
Binary files /dev/null and b/flink-core/src/test/resources/double-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/double-value-serializer-2.2/test-data b/flink-core/src/test/resources/double-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..5cfd3714ef643
--- /dev/null
+++ b/flink-core/src/test/resources/double-value-serializer-2.2/test-data
@@ -0,0 +1 @@
+@ÈÖæ1ø¡
\ No newline at end of file
diff --git a/flink-core/src/test/resources/either-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/either-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..9357df7224516
Binary files /dev/null and b/flink-core/src/test/resources/either-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/either-serializer-2.2/test-data b/flink-core/src/test/resources/either-serializer-2.2/test-data
new file mode 100644
index 0000000000000..87ec4466b7685
--- /dev/null
+++ b/flink-core/src/test/resources/either-serializer-2.2/test-data
@@ -0,0 +1 @@
+
ApacheFlink
\ No newline at end of file
diff --git a/flink-core/src/test/resources/enum-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/enum-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..27cc1daa6463a
Binary files /dev/null and b/flink-core/src/test/resources/enum-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/enum-serializer-2.2/test-data b/flink-core/src/test/resources/enum-serializer-2.2/test-data
new file mode 100644
index 0000000000000..3b6fc84f4eeca
Binary files /dev/null and b/flink-core/src/test/resources/enum-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/enum-serializerreconfig-2.2/serializer-snapshot b/flink-core/src/test/resources/enum-serializerreconfig-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..a43be8dc0fff2
Binary files /dev/null and b/flink-core/src/test/resources/enum-serializerreconfig-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/enum-serializerreconfig-2.2/test-data b/flink-core/src/test/resources/enum-serializerreconfig-2.2/test-data
new file mode 100644
index 0000000000000..ded2df2a51c33
Binary files /dev/null and b/flink-core/src/test/resources/enum-serializerreconfig-2.2/test-data differ
diff --git a/flink-core/src/test/resources/float-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/float-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..7342807802231
Binary files /dev/null and b/flink-core/src/test/resources/float-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/float-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/float-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..cb6654fd12700
Binary files /dev/null and b/flink-core/src/test/resources/float-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/float-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/float-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..62370bdddf999
Binary files /dev/null and b/flink-core/src/test/resources/float-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/float-serializer-2.2/test-data b/flink-core/src/test/resources/float-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f9c0e21ae86d6
--- /dev/null
+++ b/flink-core/src/test/resources/float-serializer-2.2/test-data
@@ -0,0 +1 @@
+Böéy
\ No newline at end of file
diff --git a/flink-core/src/test/resources/float-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/float-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..6100e5746355e
Binary files /dev/null and b/flink-core/src/test/resources/float-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/float-value-serializer-2.2/test-data b/flink-core/src/test/resources/float-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f9c0e21ae86d6
--- /dev/null
+++ b/flink-core/src/test/resources/float-value-serializer-2.2/test-data
@@ -0,0 +1 @@
+Böéy
\ No newline at end of file
diff --git a/flink-core/src/test/resources/generic-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/generic-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..2bb4df4efcb20
Binary files /dev/null and b/flink-core/src/test/resources/generic-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/generic-array-serializer-2.2/test-data b/flink-core/src/test/resources/generic-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..6d06a98cad99c
Binary files /dev/null and b/flink-core/src/test/resources/generic-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/int-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/int-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..2087b50341fa7
Binary files /dev/null and b/flink-core/src/test/resources/int-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/int-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/int-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..dd766c0e40557
Binary files /dev/null and b/flink-core/src/test/resources/int-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/int-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/int-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..597fc6b78debf
Binary files /dev/null and b/flink-core/src/test/resources/int-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/int-serializer-2.2/test-data b/flink-core/src/test/resources/int-serializer-2.2/test-data
new file mode 100644
index 0000000000000..e9271b31bdb53
Binary files /dev/null and b/flink-core/src/test/resources/int-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/int-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/int-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..f6ae0720db0bc
Binary files /dev/null and b/flink-core/src/test/resources/int-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/int-value-serializer-2.2/test-data b/flink-core/src/test/resources/int-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..e9271b31bdb53
Binary files /dev/null and b/flink-core/src/test/resources/int-value-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/kryo-custom-type-serializer-changed-registration-order-2.2/serializer-snapshot b/flink-core/src/test/resources/kryo-custom-type-serializer-changed-registration-order-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..07b541e4a23c2
Binary files /dev/null and b/flink-core/src/test/resources/kryo-custom-type-serializer-changed-registration-order-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/kryo-custom-type-serializer-changed-registration-order-2.2/test-data b/flink-core/src/test/resources/kryo-custom-type-serializer-changed-registration-order-2.2/test-data
new file mode 100644
index 0000000000000..7d1fe65f71017
--- /dev/null
+++ b/flink-core/src/test/resources/kryo-custom-type-serializer-changed-registration-order-2.2/test-data
@@ -0,0 +1 @@
+

Hassï
\ No newline at end of file
diff --git a/flink-core/src/test/resources/kryo-type-serializer-changed-registration-order-2.2/serializer-snapshot b/flink-core/src/test/resources/kryo-type-serializer-changed-registration-order-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..ec2538c6dd06e
Binary files /dev/null and b/flink-core/src/test/resources/kryo-type-serializer-changed-registration-order-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/kryo-type-serializer-changed-registration-order-2.2/test-data b/flink-core/src/test/resources/kryo-type-serializer-changed-registration-order-2.2/test-data
new file mode 100644
index 0000000000000..3637a3f5f8708
--- /dev/null
+++ b/flink-core/src/test/resources/kryo-type-serializer-changed-registration-order-2.2/test-data
@@ -0,0 +1 @@
+

Hassï
\ No newline at end of file
diff --git a/flink-core/src/test/resources/kryo-type-serializer-empty-config-2.2/serializer-snapshot b/flink-core/src/test/resources/kryo-type-serializer-empty-config-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..b7555735b8163
Binary files /dev/null and b/flink-core/src/test/resources/kryo-type-serializer-empty-config-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/kryo-type-serializer-empty-config-2.2/test-data b/flink-core/src/test/resources/kryo-type-serializer-empty-config-2.2/test-data
new file mode 100644
index 0000000000000..3bb1715c8c15e
Binary files /dev/null and b/flink-core/src/test/resources/kryo-type-serializer-empty-config-2.2/test-data differ
diff --git a/flink-core/src/test/resources/kryo-type-serializer-unrelated-config-after-restore-2.2/serializer-snapshot b/flink-core/src/test/resources/kryo-type-serializer-unrelated-config-after-restore-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..b7555735b8163
Binary files /dev/null and b/flink-core/src/test/resources/kryo-type-serializer-unrelated-config-after-restore-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/kryo-type-serializer-unrelated-config-after-restore-2.2/test-data b/flink-core/src/test/resources/kryo-type-serializer-unrelated-config-after-restore-2.2/test-data
new file mode 100644
index 0000000000000..3bb1715c8c15e
Binary files /dev/null and b/flink-core/src/test/resources/kryo-type-serializer-unrelated-config-after-restore-2.2/test-data differ
diff --git a/flink-core/src/test/resources/list-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/list-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..bbd86a683d884
Binary files /dev/null and b/flink-core/src/test/resources/list-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/list-serializer-2.2/test-data b/flink-core/src/test/resources/list-serializer-2.2/test-data
new file mode 100644
index 0000000000000..ac798598cd7d0
Binary files /dev/null and b/flink-core/src/test/resources/list-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/long-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/long-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..6bf0336119e50
Binary files /dev/null and b/flink-core/src/test/resources/long-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/long-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/long-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..873fe645d6ffd
Binary files /dev/null and b/flink-core/src/test/resources/long-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/long-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/long-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..4f51b34cfc255
Binary files /dev/null and b/flink-core/src/test/resources/long-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/long-serializer-2.2/test-data b/flink-core/src/test/resources/long-serializer-2.2/test-data
new file mode 100644
index 0000000000000..2ffef6c2652f2
Binary files /dev/null and b/flink-core/src/test/resources/long-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/long-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/long-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..b9e8f6938a127
Binary files /dev/null and b/flink-core/src/test/resources/long-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/long-value-serializer-2.2/test-data b/flink-core/src/test/resources/long-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..2ffef6c2652f2
Binary files /dev/null and b/flink-core/src/test/resources/long-value-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/map-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/map-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..6d47ba46bc50c
Binary files /dev/null and b/flink-core/src/test/resources/map-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/map-serializer-2.2/test-data b/flink-core/src/test/resources/map-serializer-2.2/test-data
new file mode 100644
index 0000000000000..8999b1fbbac08
Binary files /dev/null and b/flink-core/src/test/resources/map-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/null-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/null-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..fcecf15adb98c
Binary files /dev/null and b/flink-core/src/test/resources/null-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/null-value-serializer-2.2/test-data b/flink-core/src/test/resources/null-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/flink-core/src/test/resources/nullable-not-padded-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/nullable-not-padded-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..71c489a4c5a36
Binary files /dev/null and b/flink-core/src/test/resources/nullable-not-padded-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/nullable-not-padded-serializer-2.2/test-data b/flink-core/src/test/resources/nullable-not-padded-serializer-2.2/test-data
new file mode 100644
index 0000000000000..6b2aaa7640726
--- /dev/null
+++ b/flink-core/src/test/resources/nullable-not-padded-serializer-2.2/test-data
@@ -0,0 +1 @@
+

\ No newline at end of file
diff --git a/flink-core/src/test/resources/nullable-padded-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/nullable-padded-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..7831be8bcdbd9
Binary files /dev/null and b/flink-core/src/test/resources/nullable-padded-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/nullable-padded-serializer-2.2/test-data b/flink-core/src/test/resources/nullable-padded-serializer-2.2/test-data
new file mode 100644
index 0000000000000..22fd28d4ec331
Binary files /dev/null and b/flink-core/src/test/resources/nullable-padded-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-identical-schema-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-identical-schema-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..5bded0878c848
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-identical-schema-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-identical-schema-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-identical-schema-2.2/test-data
new file mode 100644
index 0000000000000..670022368fc84
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-identical-schema-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-different-field-types-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..a1b44c0d196b9
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-different-field-types-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-2.2/test-data
new file mode 100644
index 0000000000000..9cf45f4c08d73
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-different-field-types-in-registered-subclass-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-in-registered-subclass-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..9f5609d12cb44
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-in-registered-subclass-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-different-field-types-in-registered-subclass-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-in-registered-subclass-2.2/test-data
new file mode 100644
index 0000000000000..195b040a97afe
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-different-field-types-in-registered-subclass-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-different-subclass-registration-order-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-different-subclass-registration-order-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..e771338b74531
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-different-subclass-registration-order-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-different-subclass-registration-order-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-different-subclass-registration-order-2.2/test-data
new file mode 100644
index 0000000000000..d1569d857ae29
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-different-subclass-registration-order-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-missing-registered-subclass-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-missing-registered-subclass-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..e771338b74531
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-missing-registered-subclass-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-missing-registered-subclass-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-missing-registered-subclass-2.2/test-data
new file mode 100644
index 0000000000000..d1569d857ae29
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-missing-registered-subclass-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-modified-schema-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..63bf2dcbebe8f
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-modified-schema-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-2.2/test-data
new file mode 100644
index 0000000000000..0ce06771ec419
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-modified-schema-in-registered-subclass-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-in-registered-subclass-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..5868d773eafb1
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-in-registered-subclass-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-modified-schema-in-registered-subclass-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-in-registered-subclass-2.2/test-data
new file mode 100644
index 0000000000000..9d83d0b40feac
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-modified-schema-in-registered-subclass-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-new-and-missing-registered-subclasses-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-new-and-missing-registered-subclasses-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..e771338b74531
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-new-and-missing-registered-subclasses-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-new-and-missing-registered-subclasses-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-new-and-missing-registered-subclasses-2.2/test-data
new file mode 100644
index 0000000000000..d1569d857ae29
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-new-and-missing-registered-subclasses-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-new-registered-subclass-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-new-registered-subclass-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..5bf16ffc5ca83
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-new-registered-subclass-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-new-registered-subclass-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-new-registered-subclass-2.2/test-data
new file mode 100644
index 0000000000000..10ca450e9c9de
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-new-registered-subclass-2.2/test-data differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-non-registered-subclass-2.2/serializer-snapshot b/flink-core/src/test/resources/pojo-serializer-with-non-registered-subclass-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..5bf16ffc5ca83
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-non-registered-subclass-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/pojo-serializer-with-non-registered-subclass-2.2/test-data b/flink-core/src/test/resources/pojo-serializer-with-non-registered-subclass-2.2/test-data
new file mode 100644
index 0000000000000..10ca450e9c9de
Binary files /dev/null and b/flink-core/src/test/resources/pojo-serializer-with-non-registered-subclass-2.2/test-data differ
diff --git a/flink-core/src/test/resources/row-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/row-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..8590479338ad8
Binary files /dev/null and b/flink-core/src/test/resources/row-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/row-serializer-2.2/test-data b/flink-core/src/test/resources/row-serializer-2.2/test-data
new file mode 100644
index 0000000000000..a734bd41431c9
Binary files /dev/null and b/flink-core/src/test/resources/row-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/set-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/set-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..7506c7227f0cf
Binary files /dev/null and b/flink-core/src/test/resources/set-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/set-serializer-2.2/test-data b/flink-core/src/test/resources/set-serializer-2.2/test-data
new file mode 100644
index 0000000000000..c61ce3c9e82d1
Binary files /dev/null and b/flink-core/src/test/resources/set-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/short-primitive-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/short-primitive-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..5d2d0fc402885
Binary files /dev/null and b/flink-core/src/test/resources/short-primitive-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/short-primitive-array-serializer-2.2/test-data b/flink-core/src/test/resources/short-primitive-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..cc4337be169c1
Binary files /dev/null and b/flink-core/src/test/resources/short-primitive-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/short-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/short-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..0960c9b6c66f3
Binary files /dev/null and b/flink-core/src/test/resources/short-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/short-serializer-2.2/test-data b/flink-core/src/test/resources/short-serializer-2.2/test-data
new file mode 100644
index 0000000000000..aa9c34108ba5e
Binary files /dev/null and b/flink-core/src/test/resources/short-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/short-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/short-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..c7808f5390fb7
Binary files /dev/null and b/flink-core/src/test/resources/short-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/short-value-serializer-2.2/test-data b/flink-core/src/test/resources/short-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..aa9c34108ba5e
Binary files /dev/null and b/flink-core/src/test/resources/short-value-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/sql-date-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/sql-date-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..1042bba8cbe31
Binary files /dev/null and b/flink-core/src/test/resources/sql-date-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/sql-date-serializer-2.2/test-data b/flink-core/src/test/resources/sql-date-serializer-2.2/test-data
new file mode 100644
index 0000000000000..1faf9a01d95ca
Binary files /dev/null and b/flink-core/src/test/resources/sql-date-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/sql-time-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/sql-time-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..039309bb32c11
Binary files /dev/null and b/flink-core/src/test/resources/sql-time-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/sql-time-serializer-2.2/test-data b/flink-core/src/test/resources/sql-time-serializer-2.2/test-data
new file mode 100644
index 0000000000000..1faf9a01d95ca
Binary files /dev/null and b/flink-core/src/test/resources/sql-time-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/sql-timestamp-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/sql-timestamp-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..295fa6ea211fb
Binary files /dev/null and b/flink-core/src/test/resources/sql-timestamp-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/sql-timestamp-serializer-2.2/test-data b/flink-core/src/test/resources/sql-timestamp-serializer-2.2/test-data
new file mode 100644
index 0000000000000..929596bbc66da
Binary files /dev/null and b/flink-core/src/test/resources/sql-timestamp-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/string-array-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/string-array-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..acc4e9db44b5b
Binary files /dev/null and b/flink-core/src/test/resources/string-array-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/string-array-serializer-2.2/test-data b/flink-core/src/test/resources/string-array-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f1a5645d9ce2a
Binary files /dev/null and b/flink-core/src/test/resources/string-array-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/string-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/string-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..f796fddc59320
Binary files /dev/null and b/flink-core/src/test/resources/string-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/string-serializer-2.2/test-data b/flink-core/src/test/resources/string-serializer-2.2/test-data
new file mode 100644
index 0000000000000..67ad74d387f53
--- /dev/null
+++ b/flink-core/src/test/resources/string-serializer-2.2/test-data
@@ -0,0 +1 @@
+%123456789012345678901234567890123456
\ No newline at end of file
diff --git a/flink-core/src/test/resources/string-value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/string-value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..c7055ea38038f
Binary files /dev/null and b/flink-core/src/test/resources/string-value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/string-value-serializer-2.2/test-data b/flink-core/src/test/resources/string-value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..9233b5ab0555a
--- /dev/null
+++ b/flink-core/src/test/resources/string-value-serializer-2.2/test-data
@@ -0,0 +1 @@
+$123456789012345678901234567890123456
\ No newline at end of file
diff --git a/flink-core/src/test/resources/tuple-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/tuple-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..ac31cfe15693a
Binary files /dev/null and b/flink-core/src/test/resources/tuple-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/tuple-serializer-2.2/test-data b/flink-core/src/test/resources/tuple-serializer-2.2/test-data
new file mode 100644
index 0000000000000..808ccbcfa0733
Binary files /dev/null and b/flink-core/src/test/resources/tuple-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/value-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/value-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..26ee2df37b226
Binary files /dev/null and b/flink-core/src/test/resources/value-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/value-serializer-2.2/test-data b/flink-core/src/test/resources/value-serializer-2.2/test-data
new file mode 100644
index 0000000000000..c1e49370d62e7
Binary files /dev/null and b/flink-core/src/test/resources/value-serializer-2.2/test-data differ
diff --git a/flink-core/src/test/resources/variant-serializer-2.2/serializer-snapshot b/flink-core/src/test/resources/variant-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..cbefe6bbe9186
Binary files /dev/null and b/flink-core/src/test/resources/variant-serializer-2.2/serializer-snapshot differ
diff --git a/flink-core/src/test/resources/variant-serializer-2.2/test-data b/flink-core/src/test/resources/variant-serializer-2.2/test-data
new file mode 100644
index 0000000000000..114e6120265cd
Binary files /dev/null and b/flink-core/src/test/resources/variant-serializer-2.2/test-data differ
diff --git a/flink-formats/flink-avro/src/test/resources/generic-avro-serializer-2.2/serializer-snapshot b/flink-formats/flink-avro/src/test/resources/generic-avro-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..7bd4d7210b893
Binary files /dev/null and b/flink-formats/flink-avro/src/test/resources/generic-avro-serializer-2.2/serializer-snapshot differ
diff --git a/flink-formats/flink-avro/src/test/resources/generic-avro-serializer-2.2/test-data b/flink-formats/flink-avro/src/test/resources/generic-avro-serializer-2.2/test-data
new file mode 100644
index 0000000000000..5a7679a9ad2df
Binary files /dev/null and b/flink-formats/flink-avro/src/test/resources/generic-avro-serializer-2.2/test-data differ
diff --git a/flink-formats/flink-avro/src/test/resources/specific-avro-serializer-2.2/serializer-snapshot b/flink-formats/flink-avro/src/test/resources/specific-avro-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..d67dffc69ad01
Binary files /dev/null and b/flink-formats/flink-avro/src/test/resources/specific-avro-serializer-2.2/serializer-snapshot differ
diff --git a/flink-formats/flink-avro/src/test/resources/specific-avro-serializer-2.2/test-data b/flink-formats/flink-avro/src/test/resources/specific-avro-serializer-2.2/test-data
new file mode 100644
index 0000000000000..5a7679a9ad2df
Binary files /dev/null and b/flink-formats/flink-avro/src/test/resources/specific-avro-serializer-2.2/test-data differ
diff --git a/flink-fs-tests/src/test/resources/monitoring-function-migration-test-1764902201130-flink2.2-snapshot b/flink-fs-tests/src/test/resources/monitoring-function-migration-test-1764902201130-flink2.2-snapshot
new file mode 100644
index 0000000000000..3e594f5d57323
Binary files /dev/null and b/flink-fs-tests/src/test/resources/monitoring-function-migration-test-1764902201130-flink2.2-snapshot differ
diff --git a/flink-fs-tests/src/test/resources/reader-migration-test-flink2.2-snapshot b/flink-fs-tests/src/test/resources/reader-migration-test-flink2.2-snapshot
new file mode 100644
index 0000000000000..fda2808c8c0d4
Binary files /dev/null and b/flink-fs-tests/src/test/resources/reader-migration-test-flink2.2-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-migration-after-branching-flink2.2-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-migration-after-branching-flink2.2-snapshot
new file mode 100644
index 0000000000000..d65784445d3d1
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-migration-after-branching-flink2.2-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-migration-conditions-flink2.2-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-migration-conditions-flink2.2-snapshot
new file mode 100644
index 0000000000000..a7798cfe97cb1
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-migration-conditions-flink2.2-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-migration-single-pattern-afterwards-flink2.2-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-migration-single-pattern-afterwards-flink2.2-snapshot
new file mode 100644
index 0000000000000..afa7fa0730f3b
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-migration-single-pattern-afterwards-flink2.2-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-migration-starting-new-pattern-flink2.2-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-migration-starting-new-pattern-flink2.2-snapshot
new file mode 100644
index 0000000000000..057806f2da124
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/cep-migration-starting-new-pattern-flink2.2-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/dewey-number-serializer-2.2/serializer-snapshot b/flink-libraries/flink-cep/src/test/resources/dewey-number-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..338c62886d758
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/dewey-number-serializer-2.2/serializer-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/dewey-number-serializer-2.2/test-data b/flink-libraries/flink-cep/src/test/resources/dewey-number-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f8705181edc58
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/dewey-number-serializer-2.2/test-data differ
diff --git a/flink-libraries/flink-cep/src/test/resources/event-id-serializer-2.2/serializer-snapshot b/flink-libraries/flink-cep/src/test/resources/event-id-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..40dcf61713dbd
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/event-id-serializer-2.2/serializer-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/event-id-serializer-2.2/test-data b/flink-libraries/flink-cep/src/test/resources/event-id-serializer-2.2/test-data
new file mode 100644
index 0000000000000..146a1fc0a8be7
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/event-id-serializer-2.2/test-data differ
diff --git a/flink-libraries/flink-cep/src/test/resources/lockable-type-serializer-2.2/serializer-snapshot b/flink-libraries/flink-cep/src/test/resources/lockable-type-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..1a984b61ebfc8
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/lockable-type-serializer-2.2/serializer-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/lockable-type-serializer-2.2/test-data b/flink-libraries/flink-cep/src/test/resources/lockable-type-serializer-2.2/test-data
new file mode 100644
index 0000000000000..893957a6c1f98
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/lockable-type-serializer-2.2/test-data differ
diff --git a/flink-libraries/flink-cep/src/test/resources/nfa-state-serializer-2.2/serializer-snapshot b/flink-libraries/flink-cep/src/test/resources/nfa-state-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..7f01027f44321
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/nfa-state-serializer-2.2/serializer-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/nfa-state-serializer-2.2/test-data b/flink-libraries/flink-cep/src/test/resources/nfa-state-serializer-2.2/test-data
new file mode 100644
index 0000000000000..1b1cb4d44c57c
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/nfa-state-serializer-2.2/test-data differ
diff --git a/flink-libraries/flink-cep/src/test/resources/node-id-serializer-2.2/serializer-snapshot b/flink-libraries/flink-cep/src/test/resources/node-id-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..a63858d70052e
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/node-id-serializer-2.2/serializer-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/node-id-serializer-2.2/test-data b/flink-libraries/flink-cep/src/test/resources/node-id-serializer-2.2/test-data
new file mode 100644
index 0000000000000..0d333922c90bb
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/node-id-serializer-2.2/test-data differ
diff --git a/flink-libraries/flink-cep/src/test/resources/shared-buffer-edge-serializer-2.2/serializer-snapshot b/flink-libraries/flink-cep/src/test/resources/shared-buffer-edge-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..bd1cd93061613
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/shared-buffer-edge-serializer-2.2/serializer-snapshot differ
diff --git a/flink-libraries/flink-cep/src/test/resources/shared-buffer-edge-serializer-2.2/test-data b/flink-libraries/flink-cep/src/test/resources/shared-buffer-edge-serializer-2.2/test-data
new file mode 100644
index 0000000000000..8746c6f117c27
Binary files /dev/null and b/flink-libraries/flink-cep/src/test/resources/shared-buffer-edge-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/arraylist-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/arraylist-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..2bc2cfe5bfbd1
Binary files /dev/null and b/flink-runtime/src/test/resources/arraylist-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/arraylist-serializer-2.2/test-data b/flink-runtime/src/test/resources/arraylist-serializer-2.2/test-data
new file mode 100644
index 0000000000000..ac798598cd7d0
Binary files /dev/null and b/flink-runtime/src/test/resources/arraylist-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/buffer-entry-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/buffer-entry-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..4026c41730601
Binary files /dev/null and b/flink-runtime/src/test/resources/buffer-entry-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/buffer-entry-serializer-2.2/test-data b/flink-runtime/src/test/resources/buffer-entry-serializer-2.2/test-data
new file mode 100644
index 0000000000000..7072021895f5c
Binary files /dev/null and b/flink-runtime/src/test/resources/buffer-entry-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/global-window-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/global-window-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..ac44c4c40c10b
Binary files /dev/null and b/flink-runtime/src/test/resources/global-window-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/global-window-serializer-2.2/test-data b/flink-runtime/src/test/resources/global-window-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f76dd238ade08
Binary files /dev/null and b/flink-runtime/src/test/resources/global-window-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/java-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/java-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..db1abe95eda9e
Binary files /dev/null and b/flink-runtime/src/test/resources/java-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/java-serializer-2.2/test-data b/flink-runtime/src/test/resources/java-serializer-2.2/test-data
new file mode 100644
index 0000000000000..22a3c768e29ea
Binary files /dev/null and b/flink-runtime/src/test/resources/java-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/stream-element-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/stream-element-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..2a9a9aea83a6d
Binary files /dev/null and b/flink-runtime/src/test/resources/stream-element-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/stream-element-serializer-2.2/test-data b/flink-runtime/src/test/resources/stream-element-serializer-2.2/test-data
new file mode 100644
index 0000000000000..3022a0815fa6a
Binary files /dev/null and b/flink-runtime/src/test/resources/stream-element-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/time-window-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/time-window-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..7d2b4b69a6ad7
Binary files /dev/null and b/flink-runtime/src/test/resources/time-window-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/time-window-serializer-2.2/test-data b/flink-runtime/src/test/resources/time-window-serializer-2.2/test-data
new file mode 100644
index 0000000000000..bd72696cdd363
Binary files /dev/null and b/flink-runtime/src/test/resources/time-window-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/timer-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/timer-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..67e3a083d81a2
Binary files /dev/null and b/flink-runtime/src/test/resources/timer-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/timer-serializer-2.2/test-data b/flink-runtime/src/test/resources/timer-serializer-2.2/test-data
new file mode 100644
index 0000000000000..5e9827d82b43c
Binary files /dev/null and b/flink-runtime/src/test/resources/timer-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/ttl-aware-serializer-string-value-2.2/serializer-snapshot b/flink-runtime/src/test/resources/ttl-aware-serializer-string-value-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..d3e266190e85e
Binary files /dev/null and b/flink-runtime/src/test/resources/ttl-aware-serializer-string-value-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/ttl-aware-serializer-string-value-2.2/test-data b/flink-runtime/src/test/resources/ttl-aware-serializer-string-value-2.2/test-data
new file mode 100644
index 0000000000000..aaf5589b658a2
--- /dev/null
+++ b/flink-runtime/src/test/resources/ttl-aware-serializer-string-value-2.2/test-data
@@ -0,0 +1 @@
+
hello Gordon
\ No newline at end of file
diff --git a/flink-runtime/src/test/resources/ttl-aware-serializer-ttl-value-2.2/serializer-snapshot b/flink-runtime/src/test/resources/ttl-aware-serializer-ttl-value-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..a1dde1d34fcd1
Binary files /dev/null and b/flink-runtime/src/test/resources/ttl-aware-serializer-ttl-value-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/ttl-aware-serializer-ttl-value-2.2/test-data b/flink-runtime/src/test/resources/ttl-aware-serializer-ttl-value-2.2/test-data
new file mode 100644
index 0000000000000..5596986cd7a08
Binary files /dev/null and b/flink-runtime/src/test/resources/ttl-aware-serializer-ttl-value-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/ttl-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/ttl-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..7668b613bd9a2
Binary files /dev/null and b/flink-runtime/src/test/resources/ttl-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/ttl-serializer-2.2/test-data b/flink-runtime/src/test/resources/ttl-serializer-2.2/test-data
new file mode 100644
index 0000000000000..5596986cd7a08
Binary files /dev/null and b/flink-runtime/src/test/resources/ttl-serializer-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/union-serializer-one-2.2/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-one-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..8af8c712a44e1
Binary files /dev/null and b/flink-runtime/src/test/resources/union-serializer-one-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/union-serializer-one-2.2/test-data b/flink-runtime/src/test/resources/union-serializer-one-2.2/test-data
new file mode 100644
index 0000000000000..9a2dda7f54c7e
--- /dev/null
+++ b/flink-runtime/src/test/resources/union-serializer-one-2.2/test-data
@@ -0,0 +1 @@
+
flink
\ No newline at end of file
diff --git a/flink-runtime/src/test/resources/union-serializer-two-2.2/serializer-snapshot b/flink-runtime/src/test/resources/union-serializer-two-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..8af8c712a44e1
Binary files /dev/null and b/flink-runtime/src/test/resources/union-serializer-two-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/union-serializer-two-2.2/test-data b/flink-runtime/src/test/resources/union-serializer-two-2.2/test-data
new file mode 100644
index 0000000000000..564b7c9efdc9d
Binary files /dev/null and b/flink-runtime/src/test/resources/union-serializer-two-2.2/test-data differ
diff --git a/flink-runtime/src/test/resources/void-namespace-serializer-2.2/serializer-snapshot b/flink-runtime/src/test/resources/void-namespace-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..9df815a3705c3
Binary files /dev/null and b/flink-runtime/src/test/resources/void-namespace-serializer-2.2/serializer-snapshot differ
diff --git a/flink-runtime/src/test/resources/void-namespace-serializer-2.2/test-data b/flink-runtime/src/test/resources/void-namespace-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f76dd238ade08
Binary files /dev/null and b/flink-runtime/src/test/resources/void-namespace-serializer-2.2/test-data differ
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink2.2-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink2.2-snapshot
new file mode 100644
index 0000000000000..68b69ec2cf974
Binary files /dev/null and b/flink-streaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink2.2-snapshot differ
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink2.2-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink2.2-snapshot
new file mode 100644
index 0000000000000..5b530d33ca2a6
Binary files /dev/null and b/flink-streaming-java/src/test/resources/win-op-migration-test-apply-processing-time-flink2.2-snapshot differ
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-kryo-serialized-key-flink2.2-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-kryo-serialized-key-flink2.2-snapshot
new file mode 100644
index 0000000000000..77fd7010e2eec
Binary files /dev/null and b/flink-streaming-java/src/test/resources/win-op-migration-test-kryo-serialized-key-flink2.2-snapshot differ
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink2.2-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink2.2-snapshot
new file mode 100644
index 0000000000000..619030e801414
Binary files /dev/null and b/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink2.2-snapshot differ
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink2.2-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink2.2-snapshot
new file mode 100644
index 0000000000000..50e83f0547404
Binary files /dev/null and b/flink-streaming-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink2.2-snapshot differ
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink2.2-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink2.2-snapshot
new file mode 100644
index 0000000000000..3c6a789059bfa
Binary files /dev/null and b/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink2.2-snapshot differ
diff --git a/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink2.2-snapshot b/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink2.2-snapshot
new file mode 100644
index 0000000000000..506075e04ee80
Binary files /dev/null and b/flink-streaming-java/src/test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink2.2-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-case-class-serializer-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/scala-case-class-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..10d9840a6ce40
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-case-class-serializer-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-case-class-serializer-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/scala-case-class-serializer-2.2/test-data
new file mode 100644
index 0000000000000..ddb6ef533cd3e
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-case-class-serializer-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-either-serializer-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/scala-either-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..ba47931818671
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-either-serializer-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-either-serializer-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/scala-either-serializer-2.2/test-data
new file mode 100644
index 0000000000000..70cd7bf9fb344
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-either-serializer-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-enum-serializer-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/scala-enum-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..a2fab54f78327
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-enum-serializer-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-enum-serializer-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/scala-enum-serializer-2.2/test-data
new file mode 100644
index 0000000000000..593f4708db84a
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-enum-serializer-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-option-serializer-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/scala-option-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..1a4c1ab5d7437
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-option-serializer-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-option-serializer-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/scala-option-serializer-2.2/test-data
new file mode 100644
index 0000000000000..f76dd238ade08
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-option-serializer-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-try-serializer-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/scala-try-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..148cf99ef2b20
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-try-serializer-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/scala-try-serializer-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/scala-try-serializer-2.2/test-data
new file mode 100644
index 0000000000000..46681ddaf091e
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/scala-try-serializer-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-bitset-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-bitset-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..fe5281ef4d83b
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-bitset-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-bitset-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-bitset-2.2/test-data
new file mode 100644
index 0000000000000..5eb5107ad6c88
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-bitset-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-indexedseq-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-indexedseq-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..367b4a8e86d59
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-indexedseq-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-indexedseq-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-indexedseq-2.2/test-data
new file mode 100644
index 0000000000000..ca6108ccd17bf
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-indexedseq-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-linearseq-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-linearseq-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..52902d19346bb
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-linearseq-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-linearseq-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-linearseq-2.2/test-data
new file mode 100644
index 0000000000000..3b0d0b065b0b1
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-linearseq-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-map-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-map-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..88e4061ef6da6
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-map-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-map-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-map-2.2/test-data
new file mode 100644
index 0000000000000..f209ff5f4fe11
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-map-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..5b74ce2bb36b2
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/test-data
new file mode 100644
index 0000000000000..ca6108ccd17bf
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-seq-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-seq-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..94a2b25dcf8fb
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-seq-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-seq-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-seq-2.2/test-data
new file mode 100644
index 0000000000000..ca6108ccd17bf
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-seq-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-set-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-set-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..af3fea13ded84
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-set-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-set-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-set-2.2/test-data
new file mode 100644
index 0000000000000..3b0d0b065b0b1
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-set-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-case-class-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-case-class-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..588c8b45a73d2
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-case-class-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-case-class-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-case-class-2.2/test-data
new file mode 100644
index 0000000000000..7adaf0059e94f
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-case-class-2.2/test-data differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-pojo-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-pojo-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..c31c582e21e2d
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-pojo-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-pojo-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-pojo-2.2/test-data
new file mode 100644
index 0000000000000..ebc7236c83318
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-with-pojo-2.2/test-data differ
diff --git a/flink-table/flink-table-runtime/src/test/resources/linked-list-serializer-2.2/serializer-snapshot b/flink-table/flink-table-runtime/src/test/resources/linked-list-serializer-2.2/serializer-snapshot
new file mode 100644
index 0000000000000..90bb9910edd9d
Binary files /dev/null and b/flink-table/flink-table-runtime/src/test/resources/linked-list-serializer-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-runtime/src/test/resources/linked-list-serializer-2.2/test-data b/flink-table/flink-table-runtime/src/test/resources/linked-list-serializer-2.2/test-data
new file mode 100644
index 0000000000000..120473d48e9ca
Binary files /dev/null and b/flink-table/flink-table-runtime/src/test/resources/linked-list-serializer-2.2/test-data differ
diff --git a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V1-snapshot b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V1-snapshot
index be4fd71e72aca..76a00662a4f46 100644
Binary files a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V1-snapshot and b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V1-snapshot differ
diff --git a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V2-snapshot b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V2-snapshot
index 956b64af2d1d9..4cace5257d468 100644
Binary files a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V2-snapshot and b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-HEAP-V2-snapshot differ
diff --git a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V1-snapshot b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V1-snapshot
index 1832c7a50ebf7..a4a1e1340ef76 100644
Binary files a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V1-snapshot and b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V1-snapshot differ
diff --git a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V2-snapshot b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V2-snapshot
index 33308346686ad..872ebcf81c77f 100644
Binary files a/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V2-snapshot and b/flink-table/flink-table-runtime/src/test/resources/sink-upsert-materializer/migration-flink-2.2-ROCKSDB-V2-snapshot differ
diff --git a/flink-test-utils-parent/flink-migration-test-utils/src/main/resources/most_recently_published_version b/flink-test-utils-parent/flink-migration-test-utils/src/main/resources/most_recently_published_version
index b932bf9e88c50..c6db680226304 100644
--- a/flink-test-utils-parent/flink-migration-test-utils/src/main/resources/most_recently_published_version
+++ b/flink-test-utils-parent/flink-migration-test-utils/src/main/resources/most_recently_published_version
@@ -1 +1 @@
-v2_1
+v2_2
diff --git a/flink-tests/src/test/resources/operatorstate/complexKeyed-flink2.2/_metadata b/flink-tests/src/test/resources/operatorstate/complexKeyed-flink2.2/_metadata
new file mode 100644
index 0000000000000..932efed624b22
Binary files /dev/null and b/flink-tests/src/test/resources/operatorstate/complexKeyed-flink2.2/_metadata differ
diff --git a/flink-tests/src/test/resources/operatorstate/nonKeyed-flink2.2/_metadata b/flink-tests/src/test/resources/operatorstate/nonKeyed-flink2.2/_metadata
new file mode 100644
index 0000000000000..e3057beb17c00
Binary files /dev/null and b/flink-tests/src/test/resources/operatorstate/nonKeyed-flink2.2/_metadata differ