Fixed URIResource.resolveSibling

[nvoxland]

Impact

• Bug fix (non-breaking change which fixes expected existing functionality)
• Enhancement/New feature (adds functionality without impacting existing logic)
• Breaking change (fix or feature that would cause existing functionality to change)

Description

Fixes the creation of "relative" resources based on being relative to other files.

For example, using <include path="newFile.xml" relativeToChangelogFile="true">.

The issue is only with files looked up via URLs, such as files within a jar from the classloader. It doesn't impact all ResourceAccessor implementations

Things to be aware of

• Regular expression we were using for "strip everything after the last /" was not always working

Things to worry about

• Nothing

[github-actions]

Unit Test Results

  4 668 files  ±  0    4 668 suites  ±0   38m 59s ⏱️ + 7m 58s
  4 613 tests  - 14    4 384 ✔️  - 17     229 💤 +3  0 ❌ ±0 
54 564 runs  +36  49 496 ✔️ +31  5 068 💤 +5  0 ❌ ±0 

Results for commit 40530c0. ± Comparison against base commit c9ceb05.

♻️ This comment has been updated with latest results.

[XDelphiGrl]

Bug Description
This bug was identified during execution of test-harness tests on a Liquibase extension. Liquibase was unable to access changelogs defined with include in a root changelog when the include specified relativeToChangeLogFile=true. The error displayed was:

Unexpected error running Liquibase: java.net.MalformedURLException: no !/ in spec

Test File Structure

• A root XML changelog referenced include changelogs in a directory relative to the root changelog. For example:

	<include file="./changelogs/baseline.mssql.sql" relativeToChangelogFile="true" />
	<include file="./changelogs/01-marketing_table.sql" relativeToChangelogFile="true" />
	<include file="./changelogs/02-CreateRole.sql" relativeToChangelogFile="true" />
	<include file="./changelogs/Release-1.0.0.sql" relativeToChangelogFile="true" />

• The included changelog files were located in changelogs relative to the root changelog.

Test Cases

• Verify Liquibase Springboot accesses include changelogs. PASS
• Verify Liquibase Servelet accesses include changelogs. PASS
• Verify Liquibase Maven accesses include changelogs. PASS
• Verify Liquibase accesses include changelogs when changelogs are in a separate resources jar. PASS
  • Command Executed:

java -cp "internal/lib/liquibase-core.jar;lib/liquibase-resources.jar;lib/*;internal/lib/*" liquibase.integration.commandline.LiquibaseCommandLine --defaults-file C:\Users\erz\work\liquibase.properties update --changelog-file cyclopsbi.xml

The liquibase-resources.jar contains the root and included changelogs; I created this jar and put it in the liquibase/lib.

---

Test Environment
Core: fix-uriresource-resolve/4975/40530c (Build 4975)
Commercial: master/2291/d6d8f6/
MSSQL 2017

[XDelphiGrl]

Fix addresses a regular expression that prevented certain URI resource accessors to fail to find included changelogs.

• Failing extension test harness execution is fixed by this PR.
• Manual testing completed for Liquibase SpringBoot, Liquibase Maven, Liquibase Servlet and calling Liquibase with changelog resources in a separate jar.
• No additional testing required.

APPROVED