Merge branch 'master' into DAT-10093

liquibase · Jun 9, 2022 · b5ebfdb · b5ebfdb
2 parents 62e5894 + 6ba093d
commit b5ebfdb
Show file tree

Hide file tree

Showing 150 changed files with 4,868 additions and 1,460 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,64 +1,38 @@
-<!--- This environment context section helps us quickly review your PR. 
-      Please take a minute to fill-out this information. -->
-## Environment
+## Impact
 
-**Liquibase Version**:
-
-**Liquibase Integration & Version**: <Pick one: CLI, maven, gradle, spring boot, servlet, etc.>
-
-**Liquibase Extension(s) & Version**: 
-
-**Database Vendor & Version**:
-
-**Operating System Type & Version**:
-
-## Pull Request Type
-
-<!--- What types of changes does your code introduce?
-      Put an `x` in all the boxes that apply: 
-      If this PR fixes an existing GH issue, edit the next line to add "closes #XXXX" to auto-link.
-      If this PR fixes an existing CORE Jira issue, note that as well, although there will be no auto-linking. -->
-- [ ] Bug fix (non-breaking change which fixes an issue.)
-- [ ] Enhancement/New feature (non-breaking change which adds functionality)
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] 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
 
-A clear and concise description of the issue being addressed.  Additional guidance [here](https://liquibase.jira.com/wiki/spaces/LB/pages/1274904896/How+to+Contribute+Code+to+Liquibase+Core).
-- Describe the actual problematic behavior.
+A clear and concise description of the change being made.  
+
+- Introduce what was/will be done in the title
+  - Titles show in release notes and search results, so make them useful
+  - Use verbs at the beginning of the title, such as "fix", "implement", "improve", "update", and "add" 
+  - Be specific about what was fixed or changed
+  - Good Example: `Fix the --should-snapshot-data CLI parameter to be preserved when the --data-output-directory property is not specified in the command.`
+  - Bad Example: `Fixed --should-snapshot-data`  
+- If there is an existing issue this addresses, include "Fixes #XXXX" to auto-link the issue to this PR
+- If there is NOT an existing issue, consider creating one.
+  - In general, issues describe wanted change from an end-user perspective and PRs describe the technical change.
+  - If this change is very small and not worth splitting off an issue, include `Steps To Reproduce`, `Expected Behavior`, and `Actual Behavior` sections in this PR as you would have in the issue.
+- Describe what users need and how the fix will affect them
+- Describe how the code change addresses the problem
 - Ensure private information is redacted.
 
-## Steps To Reproduce
-
-List the steps to reproduce the behavior.
-- Please be precise and ensure private information is redacted
-- Include things like
-  - Files used - sql scripts, changelog file(s), property file(s), config files, POM Files
-  - Exact commands used - CLI, maven, gradle, spring boot, servlet, etc.
+## Things to be aware of
 
-## Actual Behavior
-A clear and concise description of what happens in the software **before** this pull request.
-- Include console output if relevant
-- Include log files if available.
+- Describe the technical choices you made
+- Describe impacts on the codebase
 
-## Expected/Desired Behavior
-A clear and concise description of what happens in the software **after** this pull request.
+## Things to worry about
 
-## Screenshots (if appropriate)
-If applicable, add screenshots to help explain your problem.
+- List any questions or concerns you have with the change
+- List unknowns you have 
 
 ## Additional Context
-Add any other context about the problem here.
 
-## Fast Track PR Acceptance Checklist:
-<!--- Completing these speeds up the acceptance of your pull request -->
-<!--- Put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, just ask us in a comment. We're here to help! -->
-- [ ] Build is successful and all new and existing tests pass
-- [ ] Added [Unit Test(s)](https://liquibase.jira.com/wiki/spaces/LB/pages/1274937609/How+to+Write+Liquibase+Core+Unit+Tests)
-- [ ] Added [Integration Test(s)](https://liquibase.jira.com/wiki/spaces/LB/pages/1276608569/How+to+Write+Liquibase+Core+Integration+Tests)
-- [ ] Added [Test Harness Test(s)](https://github.com/liquibase/liquibase-test-harness/pulls)
-- [ ] Documentation Updated
-
-## Need Help?
-Come chat with us in the [Liquibase Forum](https://forum.liquibase.org/).
+Add any other context about the problem here.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -164,7 +164,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
       - name: Built Code Cache
         if: ${{ matrix.java == 8}}
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           key: built-code-${{ github.run_number }}-${{ github.run_attempt }}
           path: ./**/target
@@ -216,7 +216,7 @@ jobs:
           distribution: 'adopt'
           cache: 'maven'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
@@ -264,7 +264,7 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Restore Built Code Cache
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           key: built-code-${{ github.run_number }}-${{ github.run_attempt }}
           path: ./**/target
@@ -297,14 +297,14 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || github.event.after}}
 
       - name: Built Code Cache
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           key: built-code-${{ github.run_number }}-${{ github.run_attempt }}
           path: ./**/target
 
       ##Cache based on install4j file, since changes to JVM is seen in there. If install4j version changes without changing the file, change the prefix letter before hashFiles to force a new cache
       - name: Install4j Cache
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           key: install4j-A${{ hashFiles('liquibase-dist/src/main/install4j/liquibase.install4j') }}
           path: ~/.install4j8/**

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -81,7 +81,7 @@ jobs:
           mv re-version/out/liquibase-additional-${{ needs.setup.outputs.version }}.zip re-version/final
 
       - name: Cache Completed Artifacts
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           key: completed-artifacts-${{ github.run_number }}-${{ github.run_attempt }}
           path: re-version/final
@@ -102,7 +102,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Restore Completed Artifacts
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
         with:
           key: completed-artifacts-${{ github.run_number }}-${{ github.run_attempt }}
           path: re-version/final

diff --git a/liquibase-cli/src/main/java/liquibase/integration/commandline/LiquibaseCommandLine.java b/liquibase-cli/src/main/java/liquibase/integration/commandline/LiquibaseCommandLine.java
@@ -492,6 +492,24 @@ private List<ConfigurationValueProvider> registerValueProviders(String[] args) t
         returnList.add(argumentProvider);
 
         final ConfiguredValue<String> defaultsFileConfig = LiquibaseCommandLineConfiguration.DEFAULTS_FILE.getCurrentConfiguredValue();
+        /*
+         * The installed licenses are cleared from the license service. Clearing the licenses
+         * forces the license service to reinstall the licenses.
+         *
+         * The call to LiquibaseCommandLineConfiguration.DEFAULTS_FILE.getCurrentConfiguredValue() above will check
+         * the environment variables for a value, and that requires a valid license. Thus, if the user has a license
+         * key specified in both an environment variable and in their defaults file (using different property names),
+         * the value in the defaults file will not be seen, despite it possibly being more preferred than the value
+         * in the environment variable, because the DefaultsFileValueProvider hasn't been registered yet.
+         */
+        LicenseServiceFactory licenseServiceFactory = Scope.getCurrentScope().getSingleton(LicenseServiceFactory.class);
+        if (licenseServiceFactory != null) {
+            LicenseService licenseService = licenseServiceFactory.getLicenseService();
+            if (licenseService != null) {
+                licenseService.reset();
+            }
+        }
+
         final File defaultsFile = new File(defaultsFileConfig.getValue());
         if (defaultsFile.exists()) {
             final DefaultsFileValueProvider fileProvider = new DefaultsFileValueProvider(defaultsFile);

diff --git a/liquibase-core/pom.xml b/liquibase-core/pom.xml
@@ -113,8 +113,6 @@
             <artifactId>opencsv</artifactId>
             <version>5.6</version>
         </dependency>
-
-
     </dependencies>
 
     <build>
@@ -234,48 +232,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>com.opencsv:*</include>
-                                    <include>org.apache.commons:commons-lang3</include>
-                                    <include>org.apache.commons:commons-text</include>
-                                    <include>org.apache.commons:commons-collections4</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.apache.commons.collections4</pattern>
-                                    <shadedPattern>liquibase.repackaged.org.apache.commons.collections4</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.lang3</pattern>
-                                    <shadedPattern>liquibase.repackaged.org.apache.commons.lang3</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.text</pattern>
-                                    <shadedPattern>liquibase.repackaged.org.apache.commons.text</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.opencsv</pattern>
-                                    <shadedPattern>liquibase.repackaged.com.opencsv</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/liquibase-core/src/main/java/liquibase/change/core/CreateProcedureChange.java b/liquibase-core/src/main/java/liquibase/change/core/CreateProcedureChange.java
@@ -1,9 +1,9 @@
 package liquibase.change.core;
 
+import liquibase.GlobalConfiguration;
 import liquibase.Scope;
 import liquibase.change.*;
 import liquibase.changelog.ChangeLogParameters;
-import liquibase.GlobalConfiguration;
 import liquibase.database.Database;
 import liquibase.database.DatabaseList;
 import liquibase.database.core.*;

diff --git a/liquibase-core/src/main/java/liquibase/change/core/CreateViewChange.java b/liquibase-core/src/main/java/liquibase/change/core/CreateViewChange.java
@@ -1,9 +1,9 @@
 package liquibase.change.core;
 
+import liquibase.GlobalConfiguration;
 import liquibase.Scope;
 import liquibase.change.*;
 import liquibase.changelog.ChangeLogParameters;
-import liquibase.GlobalConfiguration;
 import liquibase.database.Database;
 import liquibase.database.core.OracleDatabase;
 import liquibase.database.core.SQLiteDatabase;

diff --git a/liquibase-core/src/main/java/liquibase/change/core/SQLFileChange.java b/liquibase-core/src/main/java/liquibase/change/core/SQLFileChange.java
@@ -10,7 +10,6 @@
 import liquibase.exception.SetupException;
 import liquibase.exception.UnexpectedLiquibaseException;
 import liquibase.exception.ValidationErrors;
-import liquibase.resource.ResourceAccessor;
 import liquibase.util.FileUtil;
 import liquibase.util.ObjectUtil;
 import liquibase.util.StreamUtil;