Upgrade Liquibase to latest version; remove final Java source file an…

…d need for `clojure -X:deps prep` (#20611) * Upgrade Liquibase to latest version * Try adjusting log * Fix checksums for the TWO migrations with ID = 32 * FINALLY get Liquibase to use Log4j2 * Set Liquibase ConsoleUIService OutputStream to null OutputStream * Manually define a package for our H2 proxy class so Java 8 works * Fix package-name determination code * Update migrations file spec * `databasechangelog` shouldn't be upper-case * Lower-case quartz table names * More MySQL fixes 🔧 * Properties for all the Quartz tables 😢 * Formatting tweaks [ci skip] * Revert a few more busted changes * Fix more busted changes * Bump Liquibase version to 4.8.0 to fix MySQL defaultValueBoolean bug * OMG I think I finally fixed MySQL * Remove Java source file and prep-deps code * Remove two more references to bin/prep.sh * Minor cleanup * Revert unneeded changes * Fix busted indentation * Don't search inside java/ anymore since it's G-O-N-E * Appease the namespace linter * Update src/metabase/db/liquibase/h2.clj
metabase · Mar 15, 2022 · aaf1b60 · aaf1b60
1 parent faf55fb
commit aaf1b60
Show file tree

Hide file tree

Showing 24 changed files with 855 additions and 660 deletions.
diff --git a/.github/scripts/run-presto-kerberos-integration-test.sh b/.github/scripts/run-presto-kerberos-integration-test.sh
@@ -48,10 +48,6 @@ keytool -noprompt -import -alias presto-kerberos -keystore $RESOURCES_DIR/cacert
 ADDITIONAL_OPTS="SSLKeyStorePath=$RESOURCES_DIR/ssl_keystore.jks&SSLKeyStorePassword=presto\
 &SSLTrustStorePath=$RESOURCES_DIR/cacerts-with-presto-ca.jks&SSLTrustStorePassword=changeit"
 
-# Prepare dependencies
-source "./bin/prep.sh"
-prep_deps
-
 # Set up the environment variables pointing to all of this, and run some tests
 DRIVERS=presto-jdbc \
 MB_ENABLE_PRESTO_JDBC_DRIVER=true \

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -26,9 +26,6 @@ jobs:
       uses: ./.github/actions/prepare-backend
       with:
         m2-cache-key: 'eastwood'
-    - name: Compile Java & AOT Sources
-      run: |
-        source ./bin/prep.sh && prep_deps
     - run: clojure -X:dev:ee:ee-dev:drivers:drivers-dev:test:eastwood
       name: Run Eastwood linter
 
@@ -41,8 +38,5 @@ jobs:
       uses: ./.github/actions/prepare-backend
       with:
         m2-cache-key: 'namespace-decls'
-    - name: Compile Java & AOT Sources
-      run: |
-        source ./bin/prep.sh && prep_deps
     - run: clojure -X:dev:ee:ee-dev:drivers:drivers-dev:test:namespace-checker
       name: Check ns forms
diff --git a/.github/workflows/build-scripts.yml b/.github/workflows/build-scripts.yml
@@ -17,8 +17,6 @@ jobs:
       uses: ./.github/actions/prepare-backend
       with:
         m2-cache-key: 'build-scripts'
-    - name: Compile Java & AOT Sources
-      run: source ./bin/prep.sh && prep_deps
 
     - name: Run metabuild-common build script tests
       run: clojure -M:test

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -23,11 +23,6 @@ jobs:
     - name: Prepare back-end environment
       uses: ./.github/actions/prepare-backend
 
-    - name: Java/AOT prep
-      run: |
-        source "./bin/prep.sh"
-        prep_deps
-
     - run: ./bin/build version
     - run: ./bin/build translations
     - run: ./bin/build frontend

diff --git a/bin/build b/bin/build
@@ -12,8 +12,5 @@ check_clojure_cli
 source "./bin/clear-outdated-cpcaches.sh"
 clear_outdated_cpcaches
 
-source "./bin/prep.sh"
-prep_deps
-
 cd bin/build-mb
 clojure -M -m build $@
diff --git a/bin/build-driver.sh b/bin/build-driver.sh
@@ -19,8 +19,5 @@ check_clojure_cli
 source "./bin/clear-outdated-cpcaches.sh"
 clear_outdated_cpcaches
 
-source "./bin/prep.sh"
-prep_deps
-
 cd bin/build-drivers
 clojure -M -m build-driver $@
diff --git a/bin/build-drivers.sh b/bin/build-drivers.sh
@@ -12,8 +12,5 @@ check_clojure_cli
 source "./bin/clear-outdated-cpcaches.sh"
 clear_outdated_cpcaches
 
-source "./bin/prep.sh"
-prep_deps
-
 cd bin/build-drivers
 clojure -M -m build-drivers $@
diff --git a/bin/clear-outdated-cpcaches.sh b/bin/clear-outdated-cpcaches.sh
@@ -12,7 +12,7 @@ clear_outdated_cpcaches() {
     cd "$script_directory/.."
     project_root=`pwd`
 
-    cpcaches=`find bin java modules -type d -name .cpcache`
+    cpcaches=`find bin modules -type d -name .cpcache`
     if [ -d .cpcache ]; then
         cpcaches=".cpcache $cpcaches"
     fi
@@ -21,7 +21,7 @@ clear_outdated_cpcaches() {
         return 0
     fi
 
-    deps_edns="deps.edn $(find bin java modules -type f -name deps.edn)"
+    deps_edns="deps.edn $(find bin modules -type f -name deps.edn)"
 
     # find the OLDEST cpcache and NEWEST deps.edn files.
     oldest_cpcache=""

diff --git a/bin/i18n/update-translation-template b/bin/i18n/update-translation-template
@@ -20,9 +20,6 @@ cd "$script_directory/../.."
 source "./bin/check-clojure-cli.sh"
 check_clojure_cli
 
-source "./bin/prep.sh"
-prep_deps
-
 POT_NAME="locales/metabase.pot"
 POT_BACKEND_NAME="locales/metabase-backend.pot"
 # NOTE: hardcoded in .babelrc

diff --git a/bin/lint-migrations-file.sh b/bin/lint-migrations-file.sh
@@ -12,8 +12,5 @@ check_clojure_cli
 source "./bin/clear-outdated-cpcaches.sh"
 clear_outdated_cpcaches
 
-source "./bin/prep.sh"
-prep_deps
-
 cd bin/lint-migrations-file
 clojure -M -m lint-migrations-file $@
diff --git a/bin/lint-migrations-file/src/lint_migrations_file.clj b/bin/lint-migrations-file/src/lint_migrations_file.clj
@@ -106,13 +106,13 @@
       (walk/postwalk walk-fn change-set))
     (empty? @problem-cols)))
 
-;; TODO -- change sets must be distinct by ID.
 (s/def ::databaseChangeLog
   (s/and distinct-change-set-ids?
          change-set-ids-in-order?
          no-bare-blob-or-text-types?
-         (s/+ (s/alt :property  (s/keys :req-un [::property])
-                     :changeSet (s/keys :req-un [::changeSet])))))
+         (s/+ (s/alt :property              (s/keys :req-un [::property])
+                     :objectQuotingStrategy (s/keys :req-un [::objectQuotingStrategy])
+                     :changeSet             (s/keys :req-un [::changeSet])))))
 
 (def strict-change-set-cutoff
   "All change sets with an ID >= this number will be validated with the strict spec."

diff --git a/bin/prep.sh b/bin/prep.sh
diff --git a/bin/release.sh b/bin/release.sh
@@ -12,8 +12,5 @@ check_clojure_cli
 source "./bin/clear-outdated-cpcaches.sh"
 clear_outdated_cpcaches
 
-source "./bin/prep.sh"
-prep_deps
-
 cd bin/release
 clojure -M -m release $@
diff --git a/build.clj b/build.clj
@@ -103,25 +103,7 @@
   {"Manifest-Version" "1.0"
    "Created-By"       "Metabase build.clj"
    "Build-Jdk-Spec"   (System/getProperty "java.specification.version")
-   "Main-Class"       "metabase.core"
-   "Liquibase-Package" (str/join ","
-                                 ["liquibase.change"
-                                  "liquibase.changelog"
-                                  "liquibase.database"
-                                  "liquibase.datatype"
-                                  "liquibase.diff"
-                                  "liquibase.executor"
-                                  "liquibase.ext"
-                                  "liquibase.lockservice"
-                                  "liquibase.logging"
-                                  "liquibase.parser"
-                                  "liquibase.precondition"
-                                  "liquibase.sdk"
-                                  "liquibase.serializer"
-                                  "liquibase.snapshot"
-                                  "liquibase.sqlgenerator"
-                                  "liquibase.structure"
-                                  "liquibase.structurecompare"])})
+   "Main-Class"       "metabase.core"})
 
 (defn manifest ^Manifest []
   (doto (Manifest.)

diff --git a/deps.edn b/deps.edn
@@ -84,7 +84,7 @@
   org.apache.logging.log4j/log4j-api        {:mvn/version "2.17.1"}             ; add compatibility with log4j 1.2
   org.apache.logging.log4j/log4j-core       {:mvn/version "2.17.1"}             ; apache logging framework
   org.apache.logging.log4j/log4j-jcl        {:mvn/version "2.17.1"}             ; allows the commons-logging API to work with log4j 2
-  org.apache.logging.log4j/log4j-liquibase  {:mvn/version "2.17.1"}             ; liquibase logging via log4j 2
+  org.apache.logging.log4j/log4j-jul        {:mvn/version "2.17.1"}             ; java.util.logging (JUL) -> Log4j2 adapter
   org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.17.1"}             ; allows the slf4j API to work with log4j 2
   org.apache.poi/poi                        {:mvn/version "5.2.0"}              ; Work with Office documents (e.g. Excel spreadsheets) -- newer version than one specified by Docjure
   org.apache.poi/poi-ooxml                  {:mvn/version "5.2.0"
@@ -114,15 +114,15 @@
   org.eclipse.jetty/jetty-server            {:mvn/version "9.4.44.v20210927"}   ; web server
   org.flatland/ordered                      {:mvn/version "1.15.10"}            ; ordered maps & sets
   org.graalvm.js/js                         {:mvn/version "22.0.0.2"}           ; JavaScript engine
-  org.liquibase/liquibase-core              {:mvn/version "3.6.3"               ; migration management (Java lib)
+  org.liquibase/liquibase-core              {:mvn/version "4.8.0"               ; migration management (Java lib)
                                              :exclusions  [ch.qos.logback/logback-classic]}
   org.mariadb.jdbc/mariadb-java-client      {:mvn/version "2.7.5"}              ; MySQL/MariaDB driver
   org.postgresql/postgresql                 {:mvn/version "42.3.2"}             ; Postgres driver
   org.quartz-scheduler/quartz               {:mvn/version "2.3.2"}              ; Quartz job scheduler, provided by quartzite but this is a newer version.
   org.slf4j/slf4j-api                       {:mvn/version "1.7.35"}             ; abstraction for logging frameworks -- allows end user to plug in desired logging framework at deployment time
   org.tcrawley/dynapath                     {:mvn/version "1.1.0"}              ; Dynamically add Jars (e.g. Oracle or Vertica) to classpath
   org.threeten/threeten-extra               {:mvn/version "1.7.0"}              ; extra Java 8 java.time classes like DayOfMonth and Quarter
-  org.yaml/snakeyaml                        {:mvn/version "1.30"}               ; YAML parser (required by liquibase)
+  org.yaml/snakeyaml                        {:mvn/version "1.30"}               ; YAML parser
   potemkin/potemkin                         {:mvn/version "0.4.5"               ; utility macros & fns
                                              :exclusions  [riddley/riddley]}
   pretty/pretty                             {:mvn/version "1.0.5"}              ; protocol for defining how custom types should be pretty printed
@@ -142,17 +142,15 @@
                                                            org.clojure/tools.namespace]}
   user-agent/user-agent                     {:mvn/version "0.1.0"}              ; User-Agent string parser, for Login History page & elsewhere
   weavejester/dependency                    {:mvn/version "0.2.1"}              ; Dependency graphs and topological sorting
-
-  ;; dummy dependency for the Java source file(s)
-  metabase/java-deps {:local/root "java"}}
+  }
  ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  ;; !!         PLEASE KEEP NEW DEPENDENCIES ABOVE ALPHABETICALLY ORGANIZED AND ADD COMMENTS EXPLAINING THEM.         !!
  ;; !!                            *PLEASE DO NOT* ADD NEW ONES TO THE BOTTOM OF THE LIST.                            !!
  ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
  :paths
- ["src" "shared/src" "resources" "java/target/classes"]
+ ["src" "shared/src" "resources"]
 
  :aliases
  {

diff --git a/java/build.clj b/java/build.clj
diff --git a/java/deps.edn b/java/deps.edn
diff --git a/java/metabase/db/liquibase/MetabaseMySqlCreateTableSqlGenerator.java b/java/metabase/db/liquibase/MetabaseMySqlCreateTableSqlGenerator.java
diff --git a/resources/log4j2.xml b/resources/log4j2.xml
@@ -28,6 +28,7 @@
     <Logger name="metabase.server.middleware" level="DEBUG"/>
     <Logger name="metabase.query-processor.async" level="DEBUG"/>
     <Logger name="com.mchange" level="ERROR"/>
+    <Logger name="liquibase" level="ERROR"/>
 
     <Root level="WARN">
       <AppenderRef ref="STDOUT"/>