DBZ-7273: Test SQL Server PR created against fresh main branch

.github/workflows/debezium-workflow.yml

@@ -44,7 +44,7 @@ jobs:
 
       - name: Get modified files (Common)
         id: changed-files-common
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             support/checkstyle/**
@@ -62,49 +62,49 @@ jobs:
 
       - name: Get modified files (MongoDB)
         id: changed-files-mongodb
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-connector-mongodb/**
 
       - name: Get modified files (MySQL)
         id: changed-files-mysql
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-connector-mysql/**
 
       - name: Get modified files (PostgreSQL)
         id: changed-files-postgresql
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-connector-postgres/**
 
       - name: Get modified files (Oracle)
         id: changed-files-oracle
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-connector-oracle/**
 
       - name: Get modified files (SQL Server)
         id: changed-files-sqlserver
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-connector-sqlserver/**
 
       - name: Get modified files (Quarkus Outbox)
         id: changed-files-outbox
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-quarkus-outbox/**
 
       - name: Get modified files (REST Extension)
         id: changed-files-rest-extension
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-connect-rest-extension/**
@@ -116,7 +116,7 @@ jobs:
 
       - name: Get modified files (Schema Generator)
         id: changed-files-schema-generator
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-schema-generator/**
@@ -128,14 +128,14 @@ jobs:
 
       - name: Get modified files (Debezium Testing)
         id: changed-files-debezium-testing
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-testing/**
 
       - name: Get modified files (MySQL DDL parser)
         id: changed-files-mysql-ddl-parser
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/**
@@ -144,7 +144,7 @@ jobs:
 
       - name: Get modified files (Oracle DDL parser)
         id: changed-files-oracle-ddl-parser
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/oracle/**
@@ -154,14 +154,14 @@ jobs:
 
       - name: Get modified files (Documentation)
         id: changed-files-documentation
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             documentation/**
 
       - name: Get modified files (Storage)
         id: changed-files-storage
-        uses: tj-actions/changed-files@v41.1.1
+        uses: tj-actions/changed-files@v42.0.0
         with:
           files: |
             debezium-storage/**
@@ -183,7 +183,7 @@ jobs:
 
       - name: Cache Maven Repository
         id: maven-cache-check
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -231,7 +231,7 @@ jobs:
 
       - name: Cache Maven Repository
         id: maven-cache-check
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -272,7 +272,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -310,7 +310,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -347,7 +347,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -383,7 +383,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -423,7 +423,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -456,7 +456,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -492,7 +492,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -525,7 +525,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -558,7 +558,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -590,7 +590,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -622,7 +622,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -655,7 +655,7 @@ jobs:
           java-version: 17
 
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('**/pom.xml') }}
@@ -717,7 +717,7 @@ jobs:
       # For this build, we do not care if there are or are not changes in the sibling repository since this
       # job will only ever fire if there are changes in the common paths identified in the files_changed job.
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }}
@@ -784,7 +784,7 @@ jobs:
       # For this build, we do not care if there are or are not changes in the sibling repository since this
       # job will only ever fire if there are changes in the common paths identified in the files_changed job.
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }}
@@ -841,7 +841,7 @@ jobs:
       # For this build, we do not care if there are or are not changes in the sibling repository since this
       # job will only ever fire if there are changes in the common paths identified in the files_changed job.
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }}
@@ -898,7 +898,7 @@ jobs:
       # For this build, we do not care if there are or are not changes in the sibling repository since this
       # job will only ever fire if there are changes in the common paths identified in the files_changed job.
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }}
@@ -955,7 +955,7 @@ jobs:
       # For this build, we do not care if there are or are not changes in the sibling repository since this
       # job will only ever fire if there are changes in the common paths identified in the files_changed job.
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }}
@@ -1013,7 +1013,7 @@ jobs:
       # For this build, we do not care if there are or are not changes in the sibling repository since this
       # job will only ever fire if there are changes in the common paths identified in the files_changed job.
       - name: Cache Maven Repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: maven-debezium-test-build-${{ hashFiles('core/**/pom.xml') }}

.github/workflows/oracle-workflow-test.yml

@@ -82,7 +82,7 @@ jobs:
       # This workflow uses its own dependency cache rather than the main debezium workflow cache because
       # we explicitly want to trigger this build on pushes separate from the other workflow.
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           # refresh cache every month to avoid unlimited growth
@@ -140,7 +140,7 @@ jobs:
       # This workflow uses its own dependency cache rather than the main debezium workflow cache because
       # we explicitly want to trigger this build on pushes separate from the other workflow.
       - name: Cache Maven Repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           # refresh cache every month to avoid unlimited growth

COPYRIGHT.txt

@@ -579,3 +579,4 @@ Pavithrananda Prabhu
 حمود سمبول
 Peter Hamer
 Artem Shubovych
+leoloel

debezium-bom/pom.xml

@@ -59,7 +59,7 @@
         <version.mockito>3.0.0</version.mockito>
         <version.awaitility>4.0.1</version.awaitility>
         <version.testcontainers>1.19.1</version.testcontainers>
-        <version.jsonpath>2.7.0</version.jsonpath>
+        <version.jsonpath>2.9.0</version.jsonpath>
         <version.jsonassert>1.5.0</version.jsonassert>
         <version.org.reflections>0.9.12</version.org.reflections>
         <version.cassandra.unit>3.5.0.1</version.cassandra.unit>

debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/MySqlSnapshotChangeEventSource.java

@@ -99,7 +99,13 @@ public SnapshottingTask getSnapshottingTask(MySqlPartition partition, MySqlOffse
         // found a previous offset and the earlier snapshot has completed
         if (previousOffset != null && !previousOffset.isSnapshotRunning()) {
 
-            LOGGER.info("A previous offset indicating a completed snapshot has been found. Neither schema nor data will be snapshotted.");
+            if (databaseSchema.isStorageInitializationExecuted()) {
+                LOGGER.info(
+                        "A previous offset indicating a completed snapshot has been found, schema will still be snapshotted since we are in schema_only_recovery mode.");
+            }
+            else {
+                LOGGER.info("A previous offset indicating a completed snapshot has been found. Neither schema nor data will be snapshotted.");
+            }
             return new SnapshottingTask(databaseSchema.isStorageInitializationExecuted(), false, dataCollectionsToBeSnapshotted, snapshotSelectOverridesByTable, false);
         }