Merge branch 'master' into simplified-mssql

MalloD12 · web-flow · commit 0f86c5cec05b · 2025-12-02T12:12:24.000-03:00
diff --git a/.github/workflows/build-branch.yml b/.github/workflows/build-branch.yml
@@ -41,7 +41,7 @@ jobs:
       setupSuccessful: "true"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
 
@@ -79,7 +79,7 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
       - name: Set up Java for publishing to GitHub Repository
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -19,7 +19,7 @@ jobs:
       setupSuccessful: "true"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Get Latest Merge Commit SHA
         id: get-sha
         run: |
@@ -43,7 +43,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Java for publishing to GitHub Repository
         uses: actions/setup-java@v5
         with:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
       unmodifiedBranchName: ${{ steps.get-branch-name.outputs.unmodifiedBranchName }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
       - name: Get Latest Merge Commit SHA
@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [setup]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
       # this includes all the tar files included in the previous runs. So in the next step we deploy what was previously build
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,7 +41,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Configure AWS credentials for vault access
         uses: aws-actions/configure-aws-credentials@v5
@@ -213,7 +213,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Configure AWS credentials for vault access
         uses: aws-actions/configure-aws-credentials@v5
diff --git a/.github/workflows/dry-run-release.yml b/.github/workflows/dry-run-release.yml
@@ -181,7 +181,7 @@ jobs:
     needs: [setup, dry-run-create-release, dry-run-release-published]
     steps:
       - name: Checkout liquibase
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Git
         run: |
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     # Checkout the code to the GitHub runner
     - name: Checkout Code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       
     - name: Set up JDK
       uses: actions/setup-java@v5
diff --git a/.github/workflows/installer-build-check.yml b/.github/workflows/installer-build-check.yml
@@ -14,7 +14,7 @@ jobs:
     name: Build Installers
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Configure AWS credentials for vault access
         uses: aws-actions/configure-aws-credentials@v5
diff --git a/.github/workflows/release-deploy-xsd.yml b/.github/workflows/release-deploy-xsd.yml
@@ -38,7 +38,7 @@ jobs:
     if: ${{ inputs.dry_run == false }}
     steps:
       - name: Download liquibase xsd
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           # Relative path under $GITHUB_WORKSPACE to place the repository
           path: liquibase-core-repo
diff --git a/.github/workflows/release-publish-github-packages.yml b/.github/workflows/release-publish-github-packages.yml
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: ${{ inputs.dry_run == false }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       
       - name: Set up Java for publishing to GitHub Repository
         uses: actions/setup-java@v5
diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml
@@ -113,7 +113,7 @@ jobs:
           fi
 
       - name: Checkout the determined branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ steps.ref-branch.outputs.branch }}
           fetch-depth: 0
@@ -334,7 +334,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [setup, manual_trigger_deployment]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Java for publishing to GitHub Repository
         uses: actions/setup-java@v5
         with:
@@ -368,7 +368,7 @@ jobs:
       version: ${{ needs.setup.outputs.version }}
     steps:
       - name: Download liquibase xsd
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           # Relative path under $GITHUB_WORKSPACE to place the repository
           path: liquibase-core-repo
diff --git a/.github/workflows/release-setup.yml b/.github/workflows/release-setup.yml
@@ -106,7 +106,7 @@ jobs:
           fi
 
       - name: Checkout the determined branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ steps.ref-branch.outputs.branch }}
           fetch-depth: 0
diff --git a/.github/workflows/run-test-harness.yml b/.github/workflows/run-test-harness.yml
@@ -34,7 +34,7 @@ jobs:
           echo "github.event.pull_request.merged: ${{ github.event.pull_request.merged }}"
           echo "github.event_name: ${{ github.event_name }}"
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}} #sets the Git reference (commit or branch) to be checked out in the workflow
 
@@ -43,7 +43,7 @@ jobs:
     needs: [ test-harness-build ]
     name: Trigger Test Harness Tests
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set environment variables for PR branch and SHA
         run: |
@@ -87,7 +87,7 @@ jobs:
           permission-actions: write
           
       - name: Dispatch an action and get the run ID
-        uses: codex-/return-dispatch@v2
+        uses: codex-/return-dispatch@v3
         id: return_dispatch
         with:
           token: ${{ steps.get-token.outputs.token }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -55,7 +55,7 @@ jobs:
       thisBranchName: ${{ steps.get-branch-name.outputs.thisBranchName }}
       setupSuccessful: "true"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
@@ -109,7 +109,7 @@ jobs:
       OS_TYPE: ${{ matrix.os }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
 
@@ -299,7 +299,7 @@ jobs:
     needs: build_tests
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
 
@@ -431,7 +431,7 @@ jobs:
           parse-json-secrets: true
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set GitHub Secret for Test Count
         env:
           TEST_COUNT_SECRET: ${{ env.TEST_COUNT_SECRET }}
diff --git a/.github/workflows/url-check.yml b/.github/workflows/url-check.yml
@@ -12,7 +12,7 @@ jobs:
   urlcheck:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Check URLs
         uses: urlstechie/urlchecker-action@master
         with:
diff --git a/.github/workflows/weekly-integration-tests.yml b/.github/workflows/weekly-integration-tests.yml
@@ -28,7 +28,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Java
         uses: actions/setup-java@v5
@@ -120,7 +120,7 @@ jobs:
       stack-id: ${{ steps.get-stack-id.outputs.stack-id }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Get Stack ID
         id: get-stack-id
         uses: ./.github/actions/get-stack-id
diff --git a/liquibase-core/pom.xml b/liquibase-core/pom.xml
@@ -82,7 +82,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <!-- sources.jar from this module is the shaded sources of others  -->
                     <skipSource>true</skipSource>
diff --git a/liquibase-dist/pom.xml b/liquibase-dist/pom.xml
@@ -99,7 +99,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>copy-resources</id>
@@ -162,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <!-- sources.jar from this module is the shaded sources of others -->
                     <skipSource>true</skipSource>
@@ -171,7 +171,7 @@
             <!-- this builds and attaches the tar file of liquibase (which has liquibase cli) -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.0</version>
                 <configuration>
                     <tarLongFileMode>posix</tarLongFileMode>
                     <finalName>liquibase-${project.version}</finalName>
diff --git a/liquibase-integration-tests/src/test/java/liquibase/dbtest/AbstractIntegrationTest.java b/liquibase-integration-tests/src/test/java/liquibase/dbtest/AbstractIntegrationTest.java
@@ -61,6 +61,7 @@
 import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.*;
@@ -1370,6 +1371,78 @@ public void makeSureErrorIsReturnedWhenTableNameIsNotSpecified() throws Database
         }
     }
 
+    @Test
+    public void makeSureNoErrorIsReturnedWhenNonexistentCustomChangeIsRunWithFailOnErrorFalse() throws Exception {
+        // Given: A clean database
+        clearDatabase();
+
+        // When: Running a changelog with a missing custom change class and failOnError="false"
+        // Then: Execution should complete without throwing ClassNotFoundException
+        try {
+            runUpdate("changelogs/common/missingcustomchange/missing_custom_change_fail_on_error_false.changelog.xml");
+            // Success - no ClassNotFoundException was thrown, update completed
+        } catch (CommandExecutionException e) {
+            // Verify that the exception is NOT a ClassNotFoundException
+            String errorMessage = e.getMessage();
+            assertFalse("Should not throw ClassNotFoundException with failOnError=false. Error: " + errorMessage,
+                errorMessage.contains("ClassNotFoundException"));
+            throw e; // Re-throw if it's a different unexpected error
+        }
+
+        // runUpdate() uses a separate connection. Commit current transaction
+        // so this connection can see the table created by the other connection.
+        // Skip for SQLite as it handles cross-connection visibility differently.
+        if (!(database instanceof SQLiteDatabase)) {
+            database.commit();
+
+            // Verify the DATABASECHANGELOG table was created (proving the update process ran)
+            assertTrue("Expected DATABASECHANGELOG table to exist after update",
+                SnapshotGeneratorFactory.getInstance().has(
+                    new Table().setName(database.getDatabaseChangeLogTableName())
+                        .setSchema(new Schema(database.getLiquibaseCatalogName(), database.getLiquibaseSchemaName())),
+                    database));
+        }
+    }
+
+    @Test
+    public void makeSureNoErrorIsReturnedWhenNonexistentCustomChangeIsSkippedByPrecondition() throws Exception {
+        // Given: A clean database
+        clearDatabase();
+
+        // When: Running a changelog with a missing custom change class and precondition with onFail="MARK_RAN"
+        // Then: Execution should complete without throwing ClassNotFoundException
+        try {
+            runUpdate("changelogs/common/missingcustomchange/missing_custom_change_precondition_failed.changelog.xml");
+            // Success - no ClassNotFoundException was thrown
+        } catch (CommandExecutionException e) {
+            // Verify that the exception is NOT a ClassNotFoundException
+            String errorMessage = e.getMessage();
+            assertFalse("Should not throw ClassNotFoundException when precondition skips changeset. Error: " + errorMessage,
+                errorMessage.contains("ClassNotFoundException"));
+            throw e; // Re-throw if it's a different unexpected error
+        }
+
+        // runUpdate() uses a separate connection. Commit current transaction
+        // so this connection can see the table created by the other connection.
+        // Skip for SQLite as it handles cross-connection visibility differently.
+        if (!(database instanceof SQLiteDatabase)) {
+            database.commit();
+
+            // Verify the changeset ID is present in DATABASECHANGELOG table and marked as MARK_RAN
+            Connection conn = ((JdbcConnection) database.getConnection()).getUnderlyingConnection();
+            Statement stmt = conn.createStatement();
+            ResultSet rs = stmt.executeQuery(
+                "SELECT ID, EXECTYPE FROM " + database.getDatabaseChangeLogTableName() +
+                " WHERE ID = 'missing_custom_change_precondition_failed' AND EXECTYPE = 'MARK_RAN'"
+            );
+
+            assertTrue("Expected changeset 'missing_custom_change_precondition_failed' to be present in DATABASECHANGELOG with EXECTYPE='MARK_RAN'",
+                rs.next());
+            rs.close();
+            stmt.close();
+        }
+    }
+
     private ProcessBuilder prepareExternalLiquibaseProcess() {
         String javaHome = System.getProperty("java.home");
         String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
diff --git a/liquibase-integration-tests/src/test/resources/changelogs/common/missingcustomchange/missing_custom_change_fail_on_error_false.changelog.xml b/liquibase-integration-tests/src/test/resources/changelogs/common/missingcustomchange/missing_custom_change_fail_on_error_false.changelog.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet id="missing_custom_change_fail_on_error_false" author="relliot" failOnError="false">
+        <customChange class="foo.ClassThatDoesNotExist">
+            <param name="tableName" value="person"/>
+            <param name="columnName" value="employer_id"/>
+            <param name="newValue" value="3"/>
+        </customChange>
+    </changeSet>
+</databaseChangeLog>
diff --git a/liquibase-integration-tests/src/test/resources/changelogs/common/missingcustomchange/missing_custom_change_precondition_failed.changelog.xml b/liquibase-integration-tests/src/test/resources/changelogs/common/missingcustomchange/missing_custom_change_precondition_failed.changelog.xml
diff --git a/liquibase-standard/src/main/java/liquibase/change/custom/CustomChangeWrapper.java b/liquibase-standard/src/main/java/liquibase/change/custom/CustomChangeWrapper.java
diff --git a/liquibase-standard/src/test/groovy/liquibase/util/NetUtilTest.groovy b/liquibase-standard/src/test/groovy/liquibase/util/NetUtilTest.groovy
diff --git a/pom.xml b/pom.xml
