Skip to content

Commit

Permalink
Merge branch 'master' into fix-maven-plugin-pro-commands
Browse files Browse the repository at this point in the history
  • Loading branch information
StevenMassaro committed Jul 22, 2022
2 parents ab636d1 + 0caeb56 commit d328ebd
Show file tree
Hide file tree
Showing 20 changed files with 25 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Interface to implement when creating a custom change. Actual custom changes implementations need to
* implement CustomSqlChange or CustomTaskChange.
* <br><br>
* See http://www.liquibase.org/documentation/changes/custom_change.html for more information.
* See https://docs.liquibase.com/change-types/custom-change.html for more information.
*/
public interface CustomChange {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private void writeFooter(Writer fileWriter, String changeLog) throws IOException
fileWriter.append("<BR>Change Log: ");
fileWriter.append(changeLog);
fileWriter.append("<BR><BR>Generated By: ");
fileWriter.append("<a href='http://www.liquibase.org' target='_TOP'>Liquibase ").append(LiquibaseUtil
fileWriter.append("<a href='https://www.liquibase.com' target='_TOP'>Liquibase ").append(LiquibaseUtil
.getBuildVersionInfo()).append("</a>");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* Servlet listener than can be added to web.xml to allow Liquibase to run on every application server startup.
* Using this listener allows users to know that they always have the most up to date database, although it will
* slow down application server startup slightly.
* See the <a href="http://www.liquibase.org/documentation/servlet_listener.html">Liquibase documentation</a> for
* See the <a href="https://docs.liquibase.com/tools-integrations/community-supported/servlet-listener.html">Liquibase documentation</a> for
* more information.
*
* @see LiquibaseJakartaServletListener
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ public int compare(String o1, String o2) {
}

private String removeClassTypeMarksFromSerializedJson(String json) {
json = json.replaceAll("!!int \"(\\d+)\"", "$1");
// Handle both negative and positive numbers
json = json.replaceAll("!!int \"(-?\\d+)\"", "$1");
json = json.replaceAll("!!bool \"(\\w+)\"", "$1");
json = json.replaceAll("!!timestamp \"([^\"]*)\"", "$1");
json = json.replaceAll("!!float \"([^\"]*)\"", "$1");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
## The liquibase.properties file stores properties which do not change often,
## such as database connection information. Properties stored here save time
## and reduce risk of mistyped command line arguments.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--liquibase formatted sql
/* https://www.liquibase.org/documentation/sql_format.html */
/* https://docs.liquibase.com/concepts/changelogs/sql-format.html */

--changeset authorname:1
/* Insert SQL change objects here */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
## The liquibase.properties file stores properties which do not change often,
## such as database connection information. Properties stored here save time
## and reduce risk of mistyped command line arguments.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
##
## The liquibase.psql.conf file stores properties which are used during the
## execution of the PostgreSQL psql tool.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####

# The full path to the psql executable.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
##
## The liquibase.sqlcmd.conf file stores properties which are used during the
## execution of the Microsoft SQLCMD tool.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
##
## The liquibase.sqlplus.conf file stores properties which are used during the
## execution of the Oracle SQLPLUS tool.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
## The liquibase.properties file stores properties which do not change often,
## such as database connection information. Properties stored here save time
## and reduce risk of mistyped command line arguments.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
##
## The liquibase.psql.conf file stores properties which are used during the
## execution of the PostgreSQL psql tool.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####

# The full path to the psql executable.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
##
## The liquibase.sqlcmd.conf file stores properties which are used during the
## execution of the Microsoft SQLCMD tool.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
##
## The liquibase.sqlplus.conf file stores properties which are used during the
## execution of the Oracle SQLPLUS tool.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ databaseChangeLog:
id: 1
author: your.name
changes:
# Insert Yaml change objects here https://www.liquibase.org/documentation/yaml_format.html
# Insert Yaml change objects here https://docs.liquibase.com/concepts/changelogs/yaml-format.html

- changeSet:
id: 2
author: your.name
changes:
# Insert Yaml change objects here https://www.liquibase.org/documentation/yaml_format.html
# Insert Yaml change objects here https://docs.liquibase.com/concepts/changelogs/yaml-format.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
## The liquibase.properties file stores properties which do not change often,
## such as database connection information. Properties stored here save time
## and reduce risk of mistyped command line arguments.
## Learn more: https://www.liquibase.org/documentation/config_properties.html
## Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html
####
####
## Note about relative and absolute paths:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ id.author.path.required=You must specify the changeset ID, author, and path
no.deployment.ids.found=No deployment IDs were located. No rollbacks were performed.
no.change.sets.found.for.deployment.id=No changesets were located matching deployment ID '%s'. No rollbacks were performed.
deployment.id.required=You must specify the deployment ID.
no.executor.pro.license.found=The Executor '%s' requires a Liquibase Pro license, available at https://www.liquibase.org/download or sales@liquibase.com. Options include the liquibase.licenseKey in the defaults file, adding a flag in the CLI, and more. Learn more at https://docs.liquibase.com.
no.executor.pro.license.found=The Executor '%s' requires a Liquibase Pro license, available at https://www.liquibase.com/pricing or sales@liquibase.com. Options include the liquibase.licenseKey in the defaults file, adding a flag in the CLI, and more. Learn more at https://docs.liquibase.com.
no.parameter.pro.license.found=Using '%s' in the '%s' parameter requires a valid Liquibase Pro license.\nGet a free Pro license key at https://liquibase.com/trial and add liquibase.licenseKey=<yourKey> into your defaults file or\nuse --pro-license-key=<yourKey> before your command in the CLI.
no.pro.license.found=Using '%s' requires a valid Liquibase Pro license.\nGet a free Pro license key at https://liquibase.com/trial and add liquibase.licenseKey=<yourKey> into your defaults file or\nuse --pro-license-key=<yourKey> before your command in the CLI.
attempt.to.delete.the.file.failed.cannot.continue=Attempt to delete the file '%s' failed. Cannot continue. Sorry.
Expand Down
4 changes: 2 additions & 2 deletions liquibase-dist/src/main/archive/GETTING_STARTED.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ the command line can also be specified in the properties file. If a parameter is
specified in both the properties file and the command line, the command line value
will override the value in the file.

Learn more: https://www.liquibase.org/documentation/config_properties.html
Learn more: https://docs.liquibase.com/concepts/connections/creating-config-properties.html


Starting the Example H2 Database
Expand Down Expand Up @@ -220,7 +220,7 @@ COMPANY and PERSON tables in your integration web console.
Standard Development Workflow
-----------------------------
For more information on the Standard Development Workflow you just completed, see:
https://www.liquibase.org/documentation/workflows/lb-developer-workflow.html
https://www.liquibase.org/get-started/developer-workflow


Next Steps
Expand Down
6 changes: 3 additions & 3 deletions liquibase-dist/src/main/archive/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The default install location on Windows is "\Program Files\liquibase"
The default install location on Mac is "/usr/local/opt/liquibase"

The following software was installed:
* Liquibase ( http://liquibase.org )
* Liquibase ( https://liquibase.com )
* H2 Database ( https://www.h2database.com )
* AdoptOpenJDK 13 ( https://adoptopenjdk.net )

Expand All @@ -41,11 +41,11 @@ Files are:

H2 Database Program
----------------------------------------
As Liquibase ships with an h2 database example, the h2 jdbc driver was placed into
As Liquibase ships with an h2 database example, the h2 jdbc driver was placed into
your chosen installation directory.

For information on using and configuring the h2 database see:
https://www.liquibase.org/documentation/tutorials/h2.html
https://docs.liquibase.com/install/tutorials/h2.html


Open JDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Customer, under an order, a term based non-exclusive, non-transferable license
up to the license capacity purchased to use the Software only in Customer’s
internal business operations. Third party licenses delivered with the Software
may be subject to additional license rights and restrictions a set forth at
https://download.liquibase.org/lbpro-third-party-licenses/.
https://www.liquibase.com/licenses/liquibase_pro_tpl.html.

2. RESTRICTIONS. Customer may not:
a. Transfer, assign, sublicense, rent the Software, create derivative works of
Expand Down

0 comments on commit d328ebd

Please sign in to comment.