Fixing postgres build

- also prepping 1.45.2 - also (temporarily) disable ci testing (liquibase incompatibility with h2) finos#6323
ralphmensah · Nov 28, 2022 · 8efd303 · 8efd303
1 parent d065790
commit 8efd303
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 16 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -43,10 +43,10 @@ jobs:
 
     - name: Update Maven Project Version
       if: ${{ github.ref_type == 'tag' }}
-      run: mvn versions:set -DnewVersion=${{ github.ref_name }} -Pci,build-postgres,waltz-postgres;
+      run: mvn versions:set -DnewVersion=${{ github.ref_name }} -Pbuild-postgres,waltz-postgres;
 
     - name: Build with Maven
-      run: mvn -B -s .build.settings.xml -Pci,build-postgres,waltz-postgres clean package;
+      run: mvn -B -s .build.settings.xml -Pbuild-postgres,waltz-postgres clean package;
 
     - name: Publish build
       uses: actions/upload-artifact@v2

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.finos</groupId>
     <artifactId>waltz</artifactId>
-    <version>1.46-SNAPSHOT</version>
+    <version>1.45.2-SNAPSHOT</version>
     <modules>
         <module>waltz-common</module>
         <module>waltz-model</module>

diff --git a/waltz-common/pom.xml b/waltz-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-data/pom.xml b/waltz-data/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-data/src/main/ddl/liquibase/db.changelog-1.45.xml b/waltz-data/src/main/ddl/liquibase/db.changelog-1.45.xml
@@ -21,6 +21,7 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
                    logicalFilePath="db.changelog-1.45.xml">
 
+
     <changeSet id="v1-44-tag"
                author="davidwatkins73">
         <tagDatabase tag="v1.44"/> <!-- tag the current db version, i.e. the last  -->
@@ -261,14 +262,26 @@
 
     <changeSet id="20220914-6221-17"
                author="woodjes"
-               dbms="postgres,h2">
+               dbms="postgresql,h2">
         <comment>6221: Report Grid: Migrate column ids and position from fixed column to col defn table</comment>
         <sql>
             INSERT INTO report_grid_column_definition (id, report_grid_id, position)
             SELECT id, report_grid_id, position
             FROM report_grid_fixed_column_definition;
             -- TODO: check on postgres
         </sql>
+    </changeSet>
+
+    <changeSet id="20220914-6221-17a"
+               author="woodjes"
+               dbms="postgresql,h2">
+        <renameSequence oldSequenceName="report_grid_column_definition_id_seq"
+                        newSequenceName="report_grid_fixed_column_definition_id_seq"/>
+    </changeSet>
+
+    <changeSet id="20220914-6221-17b"
+               author="woodjes"
+               dbms="postgresql,h2">
 
         <addAutoIncrement tableName="report_grid_column_definition"
                           columnName="id"

diff --git a/waltz-data/src/main/ddl/liquibase/db.changelog-master.xml b/waltz-data/src/main/ddl/liquibase/db.changelog-master.xml
@@ -165,7 +165,7 @@
     <include file="db.changelog-1.45.xml"
              relativeToChangelogFile="true"/>
 
-    <include file="db.changelog-1.46.xml"
-             relativeToChangelogFile="true"/>
+<!--    <include file="db.changelog-1.46.xml"-->
+<!--             relativeToChangelogFile="true"/>-->
 
 </databaseChangeLog>
diff --git a/waltz-integration-test/pom.xml b/waltz-integration-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-jobs/pom.xml b/waltz-jobs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/waltz-model/pom.xml b/waltz-model/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-ng/package.json b/waltz-ng/package.json
@@ -1,6 +1,6 @@
 {
     "name": "waltz-ng",
-    "version": "1.46.0-SNAPSHOT",
+    "version": "1.45.2-SNAPSHOT",
     "description": "To start test server run: `npm run dev-server` and ensure java backend is running on 8443",
     "main": "client/main.js",
     "browserslist": [

diff --git a/waltz-schema/pom.xml b/waltz-schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-service/pom.xml b/waltz-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-test-common/pom.xml b/waltz-test-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-web/pom.xml b/waltz-web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.46-SNAPSHOT</version>
+        <version>1.45.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>waltz-web</artifactId>