Merge pull request #1075 from liquibase/DAT-4251-38x

Enable 3.8.x builds on Travis
liquibase · Apr 2, 2020 · 99db835 · 99db835
2 parents 7124bba + ef7e720
commit 99db835
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,31 @@
+language: java
+jdk: openjdk8
+env:
+  global:
+    #SONATYPE_USERNAME
+    - secure: akAh+eCG+jK8FIDB/boVtgyFtYeNpLoz4PL+4PWYDTlKVt4iquMyky32m5mvSVTZc1NdlS2YHg4FHEyLz5nKUYh+WtBjP6C5PWgpJa752EzLc1NsQq2sqr6Ghxkg09Gzeda4lOkZaU/tbATwwXKGpirjYZVvsjIaJ8sEL7ptao+TdWIkZUuuGcJJ7zqm7168d0pqGmwXaYywoZ6yVq/7XK4a7MpELyipSQTt1a8BIgWBZ+d4NipB/99DjD1Hr0IEbrlvk6d2nYqhIty2bRxx/pdxrgC/mw3LP5k08FpY5IlX7H5JykpLsSjmL8GGao9/ywEvwKYMJRpTk2WuLKwaRtlfWSQ4Y15b1Tb2ydcR/wnrzfW9kV1quspEjf/sB4TrxPlYOwF/9OVs3xYPRFFFFUEOEFm1ILJFZpzLrrEFles8FaoirbOj43Bpug8Rh6ZJ2Bmb0weQZ028yGk8ye/0qbPX6C2XbHYgDyT5Jj6fQ0vzEHnsvGw5NOPZ2AoA42TFivQr7U+Al4NCMXpzF8cG9uMe6KlPw3sC1RZLNJcKG6Djj46v2wvJScH9fqF5PUIFbKsX8Z+ssTnLzJnAtHFWKCMgi+J7OtbgJHhMAEYf+Cohqi+n6dLdWDmCZUOumzXBBtp/GOVa/akgeM04/navk/kSRv9djPRRoU7YDhiBbSE=
+    #SONATYPE_PASSWORD
+    - secure: YYHA3coDwAeycaXVE26ih+Au0GbxRdjzxDKex0y77mKnLclHWLBysVygj1S/7zVUCLqdvPBhgG4kFhVkHvSTHcDREIPqGg4wcCHdhA/RXO+ZtdGsnUxh9mZVbekbiS/nIw4YvzKkfK2hf78upnybqx9hrB/o/3UyOsyaQxOREZsmFwXbdUUKgXHbgbvurCTNjuIjiQf9K88AcWHSEBbvjKsqD9qkh+toY7k6tnGGTUVVmM07ZB00BcHlabVIijg/6wTLj17e1EtKtT2CJ4Wci/vQ6WL2NThkoLGzzX+RWh1yEQq4kbdeQO+LMf/afosSsKb4lhxLuu/USwRgCoD13ryjs1GT9V41LcXynZ0d6yHTZW6XQ5TTa6ar1YBpUaqNew62jhm0NV3lH8/H6lod84duefibt2lOfQSDavc1wleV3tCQnEOnxyvX9nrx1Vxb/IXYSi+pHLLc0+SXbYhX6UWf1WRuiiJbil/M7oRUXNqHVoLHC516oSK6dU8vff9/uzV0Qx6ExC8JAc2jIQEwO7UMwr1GIWU5LdmPHUM2eYXkib7YlHeLcnyUGSjDbYToeOEcdbqzGYYgoWDuaIK9brWQ1LTXPzZ3gmS0i8E4ms7kjdD4vRzn5Otyc3Ktq6znpEs1bNZhvBJwPQ4DITPgi9hz6m6w6nFX07uH+6sTaIo=
+
+services:
+  - docker
+
+before_install:
+  - docker pull mysql:5
+
+install: cp ./.travis/maven.settings.xml $HOME/.m2/settings.xml
+before_script: docker-compose -f ./.travis/databases.docker-compose.yml up -d
+script:
+  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent integration-test verify -Dliquibase.version.qualifier="-${TRAVIS_BRANCH}" -Dbuild.number=${TRAVIS_BUILD_NUMBER} -Dbuild.commit=${TRAVIS_COMMIT}
+after_script: docker-compose -f ./.travis/databases.docker-compose.yml down
+
+cache:
+  directories:
+    - "~/.m2"
+addons:
+  sonarcloud:
+    organization: "liquibase-oss"
+    token:
+      secure: LnotzNSdNvo46OiOwqCpuvG48auUnwdn78T6c2RXk39k9gtK/yBLrrSbnuBqShbYn4llXxHSLkvalfBa8Ck5w6BpMOoTInpsOWverK+0PyVmgJUv9wNIAV/9+CJS7QsBivLUf6STT7ABfbcoUiWSZUJnOS5zIZukySk+/lmMnRW2h5GniRw3N0MFPtu4G+IZ1jqWhlHovjq41JWHEGCs1+jKQPmajQLOu4RKtihEfBAVXBIorjJIXl9TcPQAbTltYPe4oRSLMRQ/Qj3PMpgsSMLRKmzJ/sgzmgzPSdlTDcsnLOjnnp6f/5mt7arZx/k78xJ+CVezr+QIIU4tpaWZqPC7T7mRh9nixQnXhNpg91zibMTb8XUIdJ8fpMlqPeHHUcKzYJ6074e0BM9JEqXSW9hvWtuscoN1nNJFyGocqaeuZ7/sUxa6zEVNRaUZ3kWoZbttkQ5AKAuYS/oVnWmkMGx5AhNqVCynGv78jIyxHSR3n4gla66+lWZqKVb1ySt8qpeHE9Ep8O0Z9EouykTCYDKJiPvwbYns5auAJdqUCuQadGh0wRBJccEDlC0LcPVilQiCrEpMOCNLmYmjVbwKm6ZFMnHfS/xB7TjgSA0CmbkX0lsDIWypwkm+TkHVg6Uw6fEpgNMOBd8W6b7XMGEUfqZcbYfPvJVSN0aeUKoYPN8=
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/.travis/databases.docker-compose.yml b/.travis/databases.docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.3'
+
+services:
+  mysql:
+    image: mysql:5
+    ports:
+      - "33061:3306"
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: LbRootPass1
+      MYSQL_DATABASE: lbcat
+      MYSQL_USER: lbuser
+      MYSQL_PASSWORD: LiquibasePass1
+    volumes:
+      - "./mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql"
diff --git a/.travis/maven.settings.xml b/.travis/maven.settings.xml
@@ -0,0 +1,12 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>sonatype</id>
+            <username>${env.SONATYPE_USERNAME}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
diff --git a/.travis/mysql-init.sql b/.travis/mysql-init.sql
@@ -0,0 +1,5 @@
+create database lbcat2;
+
+GRANT ALL PRIVILEGES ON lbcat.* TO 'lbuser'@'%';
+GRANT ALL PRIVILEGES ON lbcat2.* TO 'lbuser'@'%';
+
diff --git a/liquibase-core/src/main/java/liquibase/sqlgenerator/core/MarkChangeSetRanGenerator.java b/liquibase-core/src/main/java/liquibase/sqlgenerator/core/MarkChangeSetRanGenerator.java
@@ -88,7 +88,11 @@ public Sql[] generateSql(MarkChangeSetRanStatement statement, Database database,
                             .isEmpty()) ? null : buildFullContext(changeSet))
                         .addColumnValue("LABELS", ((changeSet.getLabels() == null) || changeSet.getLabels().isEmpty()
                         ) ? null : changeSet.getLabels().toString())
-                        .addColumnValue("LIQUIBASE", LiquibaseUtil.getBuildVersion().replaceAll("SNAPSHOT", "SNP"))
+                        .addColumnValue("LIQUIBASE", StringUtils.limitSize(LiquibaseUtil.getBuildVersion()
+                                .replaceAll("SNAPSHOT", "SNP")
+                                .replaceAll("beta", "b")
+                                .replaceAll("alpha", "b"), 20)
+                        )
                         .addColumnValue("DEPLOYMENT_ID", ChangeLogHistoryServiceFactory.getInstance().getChangeLogService(database).getDeploymentId());
 
                 if (tag != null) {

diff --git a/...tegration-tests/src/test/java/liquibase/statementexecute/MarkChangeSetRanExecuteTest.java b/...tegration-tests/src/test/java/liquibase/statementexecute/MarkChangeSetRanExecuteTest.java
@@ -8,6 +8,7 @@
 import liquibase.statement.core.CreateDatabaseChangeLogTableStatement;
 import liquibase.statement.core.MarkChangeSetRanStatement;
 import liquibase.util.LiquibaseUtil;
+import liquibase.util.StringUtils;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -26,7 +27,11 @@ public void generateSql_insert() throws Exception {
 
         this.statementUnderTest = new MarkChangeSetRanStatement(new ChangeSet("a", "b", false, false, "c", "e", "f",
                 null), ChangeSet.ExecType.EXECUTED);
-        String version = LiquibaseUtil.getBuildVersion().replaceAll("SNAPSHOT", "SNP");
+        String version = StringUtils.limitSize(LiquibaseUtil.getBuildVersion()
+                .replaceAll("SNAPSHOT", "SNP")
+                .replaceAll("beta", "b")
+                .replaceAll("alpha", "a")
+                , 20);
         assertCorrect("insert into [databasechangelog] ([id], [author], [filename], [dateexecuted], " +
                         "[orderexecuted], [md5sum], [description], [comments], [exectype], [contexts], [labels], " +
                         "[liquibase], [deployment_id]) values ('a', 'b', 'c', getdate(), 1, " +