Update Postgres version and cleanup project

* Update Postgres version * Remove Github integration dependencies
erdal-pb · Feb 15, 2022 · 51ec8d5 · 51ec8d5
1 parent e9e603a
commit 51ec8d5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 48 deletions.
diff --git a/.zally.yaml b/.zally.yaml
@@ -1,3 +1,2 @@
 api_definitions: 
  - server/src/main/resources/api/zally-api.yaml
- - github-integration/src/main/resources/api/bark-api.yaml
diff --git a/build-and-run.sh b/build-and-run.sh
@@ -17,11 +17,5 @@ WEB_UI_DIR=${SCRIPT_DIR}/web-ui
 # Build web ui
 cd ${WEB_UI_DIR} && yarn && yarn build
 
-if [[ "$@" == "--bark" ]]; then
-
-    # Docker-compose
-    cd ${SCRIPT_DIR} && docker-compose -f docker-compose.yaml -f docker-compose-bark.yaml up --build
-else
-    # Docker-compose
-    cd ${SCRIPT_DIR} && docker-compose up --build
-fi
+# Docker-compose
+cd ${SCRIPT_DIR} && docker-compose up --build
diff --git a/docker-compose-bark.yaml b/docker-compose-bark.yaml
diff --git a/server/zally-server/build.gradle.kts b/server/zally-server/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     }
     implementation("org.flywaydb:flyway-core")
     implementation("org.hsqldb:hsqldb:2.4.1")
-    implementation("org.postgresql:postgresql:42.2.4")
+    implementation("org.postgresql:postgresql:42.3.2")
     implementation("org.hibernate:hibernate-core")
     implementation("org.jadira.usertype:usertype.core:7.0.0.CR1") {
         exclude("org.hibernate", "hibernate-entitymanager")