From 8429de5b71eb4dffc62eb2650dbc156c91ed8108 Mon Sep 17 00:00:00 2001 From: jandroav Date: Fri, 6 Oct 2023 12:17:17 +0200 Subject: [PATCH 01/15] chore: update liquibase/build-logic workflows to version v0.4.8 chore(pom.xml): update liquibase-parent-pom version to 0.2.0 chore(pom.xml): update snakeyaml version to 2.2 --- .github/workflows/attach-artifact-release.yml | 2 +- .github/workflows/create-release.yml | 2 +- .github/workflows/release-published.yml | 2 +- .github/workflows/synk-nightly.yml | 2 +- .github/workflows/test.yml | 2 +- pom.xml | 182 +----------------- 6 files changed, 15 insertions(+), 177 deletions(-) diff --git a/.github/workflows/attach-artifact-release.yml b/.github/workflows/attach-artifact-release.yml index e8334ca4..4021362a 100644 --- a/.github/workflows/attach-artifact-release.yml +++ b/.github/workflows/attach-artifact-release.yml @@ -7,5 +7,5 @@ on: jobs: attach-artifact-to-release: - uses: liquibase/build-logic/.github/workflows/extension-attach-artifact-release.yml@v0.4.4 + uses: liquibase/build-logic/.github/workflows/extension-attach-artifact-release.yml@v0.4.8 secrets: inherit \ No newline at end of file diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 4b399043..e5bb75c8 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -7,5 +7,5 @@ on: jobs: create-release: - uses: liquibase/build-logic/.github/workflows/create-release.yml@v0.4.4 + uses: liquibase/build-logic/.github/workflows/create-release.yml@v0.4.8 secrets: inherit diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml index fe8a817f..66287b2e 100644 --- a/.github/workflows/release-published.yml +++ b/.github/workflows/release-published.yml @@ -7,5 +7,5 @@ on: jobs: release: - uses: liquibase/build-logic/.github/workflows/extension-release-published.yml@v0.4.4 + uses: liquibase/build-logic/.github/workflows/extension-release-published.yml@v0.4.8 secrets: inherit diff --git a/.github/workflows/synk-nightly.yml b/.github/workflows/synk-nightly.yml index 177193cb..0aa2b762 100644 --- a/.github/workflows/synk-nightly.yml +++ b/.github/workflows/synk-nightly.yml @@ -10,5 +10,5 @@ on: jobs: security-scan: - uses: liquibase/build-logic/.github/workflows/synk-nightly.yml@v0.4.4 + uses: liquibase/build-logic/.github/workflows/synk-nightly.yml@v0.4.8 secrets: inherit \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dd2d1793..e3af0a2b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,5 +10,5 @@ on: jobs: build-test: - uses: liquibase/build-logic/.github/workflows/os-extension-test.yml@v0.4.4 + uses: liquibase/build-logic/.github/workflows/os-extension-test.yml@v0.4.8 secrets: inherit \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2f3c198d..7a88dae6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,12 @@ 4.0.0 + + org.liquibase + liquibase-parent-pom + 0.2.0 + + org.liquibase.ext liquibase-databricks 1.1.0-SNAPSHOT @@ -10,22 +16,6 @@ Liquibase Extension for Databricks. https://github.com/liquibase/liquibase-databricks - - Liquibase - http://www.liquibase.com - - - - https://github.com/liquibase/liquibase-databricks/issues - - - - - http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0 - - - Cody Davis @@ -35,46 +25,13 @@ - - scm:git:https://github.com/liquibase/liquibase-databricks.git - https://github.com/liquibase/liquibase-databricks - HEAD - - - UTF-8 - UTF-8 - 1.8 - 1.8 4.23.2 - - liquibase - ${sonar.organization}_${project.artifactId} - ${project.name} - ${project.description} - https://sonarcloud.io - git - true - src/main/java src/test/groovy - - 2.4.21 - 1.3-groovy-2.4 - - target + 2.2 - - org.liquibase - liquibase-core - ${liquibase.version} - - - org.liquibase - liquibase-commercial - ${liquibase.version} - junit junit @@ -99,36 +56,14 @@ 2.6.33 test - - org.codehaus.groovy - groovy-all - ${groovy.version} - test - pom - - - org.codehaus.groovy - groovy-testng - - - - - org.spockframework - spock-core - ${dependency.spock.version} - test + org.yaml + snakeyaml + ${snakeyaml.version} - - - src/main/resources - true - - - org.liquibase @@ -146,103 +81,6 @@ - - maven-surefire-plugin - 3.1.0 - - true - plain - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - true - false - Liquibase Databricks ${project.version} API - true - none - UTF-8 - - false - - - - javadoc-default - - jar - - package - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - package - - jar - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - 2.1.0 - - - - compile - compileTests - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.10 - - - - ${jacoco.fileset.directory} - - **/jacoco.exec - - - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.9.1.2184 - - - - org.liquibase.ext - liquibase-sdk-maven-plugin - 0.10.20 - - org.codehaus.mojo flatten-maven-plugin From eb4ff45b5bd6cfb6ae5b30c30d2a21ce9f40b103 Mon Sep 17 00:00:00 2001 From: jandroav Date: Mon, 9 Oct 2023 10:08:25 +0200 Subject: [PATCH 02/15] chore(pom.xml): update liquibase.version property from 4.23.2 to 4.24.0 to use the latest version of Liquibase for database migrations --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a88dae6..4c0901a0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - 4.23.2 + 4.24.0 src/test/groovy 2.2 From 6a2da6bdb8895cad72f0d4b13bb7c6e4564a64ad Mon Sep 17 00:00:00 2001 From: jandroav Date: Mon, 9 Oct 2023 10:11:33 +0200 Subject: [PATCH 03/15] chore(pom.xml): downgrade liquibase version from 4.24.0 to 4.23.2 for compatibility reasons --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c0901a0..7a88dae6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - 4.24.0 + 4.23.2 src/test/groovy 2.2 From cd2b6fd3ce97f79d02c24d64fc696259d6762e77 Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 09:26:08 +0200 Subject: [PATCH 04/15] chore(pom.xml): update groovy-all and spock-core versions for compatibility and bug fixes --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 7a88dae6..57d55ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,8 @@ 4.23.2 src/test/groovy 2.2 + 2.4.21 + 1.3-groovy-2.4 From 95e7b94a61143ca94bea3f3daf0a826481cbbbdb Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 09:34:05 +0200 Subject: [PATCH 05/15] chore(pom.xml): add gmavenplus-plugin version 2.1.0 to the project dependencies for future use --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 57d55ac8..4444033f 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ 2.2 2.4.21 1.3-groovy-2.4 + 2.1.0 From 53793523179ddc8015da8f6796f56223bcd04971 Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 09:39:36 +0200 Subject: [PATCH 06/15] chore(pom.xml): update groovy-all.version to 2.4.21 for compatibility chore(pom.xml): update liquibase.version to 4.23.2 for latest features and bug fixes chore(pom.xml): update gmavenplus-plugin.version to 2.1.0 for compatibility chore(pom.xml): update spock-core.version.version to 1.3-groovy-2.4 for compatibility chore(pom.xml): update snakeyaml.version to 2.2 for latest features and bug fixes --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4444033f..447b9bf1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,12 +26,12 @@ + 2.4.21 4.23.2 + 2.1.0 src/test/groovy 2.2 - 2.4.21 1.3-groovy-2.4 - 2.1.0 From 5e6b4800806677019486bbd2828ffb718c879155 Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 09:57:52 +0200 Subject: [PATCH 07/15] extend parent pom --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 447b9bf1..9652b679 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,9 @@ 2.4.21 4.23.2 2.1.0 + 3.1 + 2.6 + 3.1.0 src/test/groovy 2.2 1.3-groovy-2.4 From ada043da3e26eec79adcf93a4680d06e0263355f Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 10:11:15 +0200 Subject: [PATCH 08/15] chore(pom.xml): add maven-surefire-plugin to redirect test output to file feat(pom.xml): add surefire-junit4 dependency to enable JUnit 4 support for surefire plugin --- pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index 9652b679..50373fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,21 @@ + + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.surefire + surefire-junit4 + 3.0.0 + + + + true + + + From a47506569938a02edd2c32aeb409c80166529d0d Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 10:15:56 +0200 Subject: [PATCH 09/15] chore(pom.xml): remove unnecessary parent pom and update project metadata feat(pom.xml): add organization, issue management, and license information feat(pom.xml): add SCM information for version control feat(pom.xml): update project properties and dependencies feat(pom.xml): add Liquibase dependencies and test dependencies feat(pom.xml): add plugins for Liquibase, Surefire, build helper, Javadoc, source, GMavenPlus, JaCoCo, Sonar, and Liquibase SDK feat(pom.xml): add flatten-maven-plugin for dependency management refactor(pom.xml): remove redundant surefire plugin configuration --- pom.xml | 205 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 173 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 50373fd1..0bfd357f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,6 @@ 4.0.0 - - org.liquibase - liquibase-parent-pom - 0.2.0 - - org.liquibase.ext liquibase-databricks 1.1.0-SNAPSHOT @@ -16,6 +10,22 @@ Liquibase Extension for Databricks. https://github.com/liquibase/liquibase-databricks + + Liquibase + http://www.liquibase.com + + + + https://github.com/liquibase/liquibase-databricks/issues + + + + + http://www.apache.org/licenses/LICENSE-2.0 + Apache License, Version 2.0 + + + Cody Davis @@ -25,19 +35,46 @@ + + scm:git:https://github.com/liquibase/liquibase-databricks.git + https://github.com/liquibase/liquibase-databricks + HEAD + + - 2.4.21 + UTF-8 + UTF-8 + 1.8 + 1.8 4.23.2 - 2.1.0 - 3.1 - 2.6 - 3.1.0 + + liquibase + ${sonar.organization}_${project.artifactId} + ${project.name} + ${project.description} + https://sonarcloud.io + git + true + src/main/java src/test/groovy - 2.2 - 1.3-groovy-2.4 + + 2.4.21 + 1.3-groovy-2.4 + + target + + org.liquibase + liquibase-core + ${liquibase.version} + + + org.liquibase + liquibase-commercial + ${liquibase.version} + junit junit @@ -62,14 +99,36 @@ 2.6.33 test + + + org.codehaus.groovy + groovy-all + ${groovy.version} + test + pom + + + org.codehaus.groovy + groovy-testng + + + - org.yaml - snakeyaml - ${snakeyaml.version} + org.spockframework + spock-core + ${dependency.spock.version} + test + + + src/main/resources + true + + + org.liquibase @@ -87,6 +146,103 @@ + + maven-surefire-plugin + 3.1.0 + + true + plain + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + true + false + Liquibase Databricks ${project.version} API + true + none + UTF-8 + + false + + + + javadoc-default + + jar + + package + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + package + + jar + + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 2.1.0 + + + + compile + compileTests + + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.10 + + + + ${jacoco.fileset.directory} + + **/jacoco.exec + + + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.9.1.2184 + + + + org.liquibase.ext + liquibase-sdk-maven-plugin + 0.10.20 + + org.codehaus.mojo flatten-maven-plugin @@ -116,21 +272,6 @@ - - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.apache.maven.surefire - surefire-junit4 - 3.0.0 - - - - true - - - - + \ No newline at end of file From 2c4b9638133c4964729949a9bfa9f389b190b5c2 Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 11:20:55 +0200 Subject: [PATCH 10/15] extend parent pom --- pom.xml | 216 ++++++++------------------------------------------------ 1 file changed, 31 insertions(+), 185 deletions(-) diff --git a/pom.xml b/pom.xml index 0bfd357f..9e7a512b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,12 @@ 4.0.0 + + org.liquibase + liquibase-parent-pom + 0.2.0 + + org.liquibase.ext liquibase-databricks 1.1.0-SNAPSHOT @@ -10,22 +16,6 @@ Liquibase Extension for Databricks. https://github.com/liquibase/liquibase-databricks - - Liquibase - http://www.liquibase.com - - - - https://github.com/liquibase/liquibase-databricks/issues - - - - - http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0 - - - Cody Davis @@ -35,58 +25,18 @@ - - scm:git:https://github.com/liquibase/liquibase-databricks.git - https://github.com/liquibase/liquibase-databricks - HEAD - - - UTF-8 - UTF-8 - 1.8 - 1.8 + 2.4.21 4.23.2 - - liquibase - ${sonar.organization}_${project.artifactId} - ${project.name} - ${project.description} - https://sonarcloud.io - git - true - src/main/java + 2.1.0 src/test/groovy - - 2.4.21 - 1.3-groovy-2.4 - - target + 2.4.21 + 1.3-groovy-2.4 + 2.0-groovy-2.5 + 1.10.0 - - org.liquibase - liquibase-core - ${liquibase.version} - - - org.liquibase - liquibase-commercial - ${liquibase.version} - - - junit - junit - test - 4.13.2 - - - org.liquibase - liquibase-test-harness - 1.0.9 - test - org.skyscreamer jsonassert @@ -99,37 +49,30 @@ 2.6.33 test - - - org.codehaus.groovy - groovy-all - ${groovy.version} - test - pom - - - org.codehaus.groovy - groovy-testng - - - - org.spockframework - spock-core - ${dependency.spock.version} - test + org.yaml + snakeyaml + ${snakeyaml.version} - - - src/main/resources - true - - - + + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.surefire + surefire-junit4 + 3.1.2 + + + + true + plain + + org.liquibase liquibase-maven-plugin @@ -146,103 +89,6 @@ - - maven-surefire-plugin - 3.1.0 - - true - plain - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - true - false - Liquibase Databricks ${project.version} API - true - none - UTF-8 - - false - - - - javadoc-default - - jar - - package - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - package - - jar - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - 2.1.0 - - - - compile - compileTests - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.10 - - - - ${jacoco.fileset.directory} - - **/jacoco.exec - - - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.9.1.2184 - - - - org.liquibase.ext - liquibase-sdk-maven-plugin - 0.10.20 - - org.codehaus.mojo flatten-maven-plugin @@ -274,4 +120,4 @@ - \ No newline at end of file + From 0f050d47bc8f3d8fd8dc1166638efe98572de8ac Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 12:30:15 +0200 Subject: [PATCH 11/15] chore(pom.xml): update spock-reports.version to 1.8.0 to align with project dependencies --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e7a512b..c21ca30f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ src/test/groovy 2.4.21 1.3-groovy-2.4 - 2.0-groovy-2.5 + 1.8.0 1.10.0 From 88e3ecf8ca7e09fb8bfafd68d2d2b7bb0928fa2f Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 14:24:11 +0200 Subject: [PATCH 12/15] chore(pom.xml): update liquibase-parent-pom version from 0.2.0 to 0.2.1 for desired changes in the project configuration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c21ca30f..57c7716b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.liquibase liquibase-parent-pom - 0.2.0 + 0.2.1 org.liquibase.ext From 975bcb39a601c2d031f97846db9c9756cf3d386c Mon Sep 17 00:00:00 2001 From: jandroav Date: Tue, 10 Oct 2023 14:33:25 +0200 Subject: [PATCH 13/15] chore(pom.xml): remove unused groovy-all.version dependency The groovy-all.version dependency was removed as it was no longer being used in the project. This helps to declutter the pom.xml file and improve maintainability. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57c7716b..b128281a 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ 4.23.2 2.1.0 src/test/groovy - 2.4.21 1.3-groovy-2.4 1.8.0 1.10.0 From 3f7ffb8e283ae1fcaf6c13a70bf18270254074cf Mon Sep 17 00:00:00 2001 From: jandroav Date: Wed, 11 Oct 2023 11:38:52 +0200 Subject: [PATCH 14/15] chore(pom.xml): update liquibase-parent-pom version from 0.2.1 to 0.2.2 for desired changes in the project configuration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b128281a..04075b2d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.liquibase liquibase-parent-pom - 0.2.1 + 0.2.2 org.liquibase.ext From 889fface5ed8d3ebe036279d8b1c419c83d9d477 Mon Sep 17 00:00:00 2001 From: jandroav Date: Wed, 11 Oct 2023 11:43:58 +0200 Subject: [PATCH 15/15] chore(pom.xml): remove colon from the name of the Liquibase Extension to improve consistency with other names --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04075b2d..2eeb9caf 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ liquibase-databricks 1.1.0-SNAPSHOT - Liquibase Extension: Databricks support + Liquibase Extension Databricks support Liquibase Extension for Databricks. https://github.com/liquibase/liquibase-databricks