Skip to content

Commit c183e34

Browse files
wwillard7800StevenMassaroobovsunivskyiiabrackx
authored
Change visibility of useful methods to support custom checks (DAT-16671) (liquibase#5850)
* Conditionally include graal .jar DAT-16671 * Reformat assembly file DAT-16671 * Added excluded files DAT-16671 * Removed scripting references DAT-16671 * Added property to turn off help test DAT-16671 * Added skip help tests property DAT-16671 * DAT-16671 Added commons-io to liquibase-core pom * Added static access to some executeSql methods DAT-16671 * Added property to include the liquibase scripting .jar in the tarball DAT-16671 * Include profile setting for liquibase-scripting DAT-16671 * Revert "Include profile setting for liquibase-scripting" This reverts commit a38b324. * Changed property for activation DAT-16671 * Always look for 0-SNAPSHOT of liquibase-scripting DAT-16671 * Back to env.CI DAT-16671 * Added to expected contents DAT-16671 * Switch back to using liquibase.scripting DAT-16671 * Fix formatting DAT-16671 * Comment in pom file DAT-16671 * Added exclusions for GraalVM stuff DAT-16671 * Add liquibase-scripting licensing information (DAT-17798) (liquibase#6004) * Update extension naming (DAT-18032) (liquibase#6081) [DAT-18032] Update jar naming * [DAT-16671] Fix assembly * [DAT-16671] Don't use master build for release * [DAT-16671] Revert "[DAT-16671] Don't use master build for release" This reverts commit 34a2ffe. * [DAT-16671] Fix expected distribution * [DAT-16671] Fix expected distribution * DAT-16671 Added a flag to allow the exception summary message to be suppressed * Removed checks profile that accidentally got added back in DAT-16671 * Revert "Removed checks profile that accidentally got added back in" This reverts commit 0440459. * Revert "DAT-16671" This reverts commit 7c1b990. * Revert previous changes DAT-16671 * Added missing property DAT-16671 * Still fixing this DAT-16671 * Remove checks from tar, remove profile, remove licensing (DAT-18153) (liquibase#6110) * [DAT-18153] Remove checks profile, assembly and update workflow to not use the profile. * [DAT-18153] Remove licensing information * [DAT-18153] Fix expected distribution --------- Co-authored-by: Steven Massaro <[email protected]> Co-authored-by: obovsunivskyii <[email protected]> Co-authored-by: Alex <[email protected]>
1 parent 7dbd9b3 commit c183e34

File tree

9 files changed

+543
-524
lines changed

9 files changed

+543
-524
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ jobs:
206206
echo "Saving windows key"
207207
echo "$INSTALL4J_WINDOWS_KEY" | base64 -d > liquibase-dist/target/keys/datical_windows.pfx
208208
# we are packaging and deploying liquibase tar which includes liquibase-commercial
209-
./mvnw -B -pl liquibase-dist -P liquibase-commercial source:jar package "-Dliquibase.checks=true" "-Dliquibase-pro.version=${{ needs.setup.outputs.proBranchNamePrefix }}-SNAPSHOT" "-Dbuild.repository.owner=liquibase" "-Dbuild.repository.name=liquibase" "-Dbuild.branch=${{ needs.setup.outputs.thisBranchName }}" "-Dbuild.number=${{ github.run_number }}" "-Dbuild.commit=${{ needs.setup.outputs.latestMergeSha }}-SNAPSHOT" "-Dbuild.timestamp=${{ needs.setup.outputs.timeStamp }}"
209+
./mvnw -B -pl liquibase-dist -P liquibase-commercial source:jar package "-Dliquibase-pro.version=${{ needs.setup.outputs.proBranchNamePrefix }}-SNAPSHOT" "-Dbuild.repository.owner=liquibase" "-Dbuild.repository.name=liquibase" "-Dbuild.branch=${{ needs.setup.outputs.thisBranchName }}" "-Dbuild.number=${{ github.run_number }}" "-Dbuild.commit=${{ needs.setup.outputs.latestMergeSha }}-SNAPSHOT" "-Dbuild.timestamp=${{ needs.setup.outputs.timeStamp }}"
210210
211211
## extract tar content for other artifacts
212212
mkdir -p liquibase-dist/target/liquibase-${{ needs.setup.outputs.thisBranchName }}-SNAPSHOT

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ LIQUIBASE is a registered trademark of [Liquibase Inc.](https://www.liquibase.co
8181
4. When you view the GitHub PR, make sure to verify the version which is being published. It should say something like `Deploying v4.20.0 to sonatype`
8282

8383

84+

liquibase-cli/src/test/groovy/liquibase/integration/commandline/LiquibaseCommandLineTest.groovy

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import liquibase.exception.LiquibaseException
77
import liquibase.logging.core.BufferedLogService
88
import liquibase.ui.ConsoleUIService
99
import liquibase.util.StringUtil
10+
import org.junit.jupiter.api.Assumptions
1011
import spock.lang.Specification
1112
import spock.lang.Unroll
1213

@@ -733,6 +734,7 @@ https://docs.liquibase.com
733734

734735
def "help output" () {
735736
when:
737+
Assumptions.assumeTrue(System.getProperty("skipHelpTests") != null, "Skipping help test")
736738
def oldOut = System.out
737739
def bytes = new ByteArrayOutputStream()
738740
def newOut = new PrintStream(bytes)

liquibase-core/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@
6363
<artifactId>commons-lang3</artifactId>
6464
<version>${commons-lang3.version}</version>
6565
</dependency>
66+
<dependency>
67+
<groupId>commons-io</groupId>
68+
<artifactId>commons-io</artifactId>
69+
<version>${commons-io.version}</version>
70+
</dependency>
71+
6672
</dependencies>
6773

6874
<build>

0 commit comments

Comments
 (0)