From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Sat, 19 Nov 2016 11:00:18 +0000 (+0100)
Subject: Merge pull request #2604 from wallabag/postgresql-version
X-Git-Tag: 2.1.4~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4c27f14fa94d300194a37a06355a109aae4afbf6;hp=cffcce0c921ca9360daa96e90bbf3e34642b262e;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2604 from wallabag/postgresql-version

wallabag can’t work on PostgreSQL <= 9.1
---

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 6873be49..51b9c4d0 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -20,7 +20,20 @@ git checkout master
 git pull origin master
 git checkout -b release-$LAST_WALLABAG_RELEASE
 SYMFONY_ENV=prod composer up --no-dev
-git add --force composer.lock
+```
+
+- Update `.travis.yml` file and replace the composer line with this one:
+
+```diff
+script:
+-    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
++    - travis_wait composer update --no-interaction --no-progress
+```
+
+- Then continue with these commands:
+
+```
+git add --force composer.lock .travis.yml
 git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
 git push origin release-$LAST_WALLABAG_RELEASE
 ```
diff --git a/composer.json b/composer.json
index 79de337b..4f7ad291 100644
--- a/composer.json
+++ b/composer.json
@@ -54,8 +54,8 @@
         "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "^2.0",
         "nelmio/cors-bundle": "~1.4.0",
-        "friendsofsymfony/rest-bundle": "~1.4",
-        "jms/serializer-bundle": "~1.0",
+        "friendsofsymfony/rest-bundle": "~2.1",
+        "jms/serializer-bundle": "~1.1",
         "nelmio/api-doc-bundle": "~2.7",
         "mgargano/simplehtmldom": "~1.5",
         "tecnickcom/tcpdf": "~6.2",