Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAT-18810: app naming updated, it contains now versions of core/pro liquibase and extension version also. #595

Merged
merged 8 commits into from
Jan 31, 2025

Conversation

SvampX
Copy link

@SvampX SvampX commented Jan 23, 2025

Tested on Built Jar-s with different core and pro JAR-s stored in liquibase/lib.

Only OSS Jar is present:
Screenshot 2025-01-30 at 16 25 20

Commercial Jar is present and Pro license is valid:
Screenshot 2025-01-30 at 15 32 31

@SvampX
Copy link
Author

SvampX commented Jan 28, 2025

Updated AppName for local execution from IDE:

Screenshot 2025-01-30 at 17 11 55

@SvampX
Copy link
Author

SvampX commented Jan 28, 2025

Also works for commercial with dependency on current branches artifact:

Screenshot 2025-01-30 at 17 10 02

boolean isCommercial = model.getArtifactId().contains("commercial");
String buildVersion = LiquibaseUtil.getBuildVersion();
String extVersion = model.getVersion();
String appType = isCommercial ? "PRO" : "OSS";

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think appType should depend on a license check

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

license check added on commercial extension side as:
driverProperties.put("appName", getAppName(driverProperties, LicenseServiceUtils.isProLicenseValid()));

@filipelautert filipelautert self-requested a review January 28, 2025 12:22
@SvampX
Copy link
Author

SvampX commented Jan 30, 2025

related pro PR (fails as waiting for master-SNAPSHOT artifact) https://github.com/liquibase/liquibase-commercial-mongodb/pull/296/files

@SvampX SvampX merged commit 1f69bf0 into main Jan 31, 2025
34 checks passed
@SvampX SvampX deleted the DAT-18810 branch January 31, 2025 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants