From e9a9d4ad71113f97e0c002df92ae4eee71a8e6b8 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael.simons@neo4j.com>
Date: Fri, 7 Jun 2019 11:06:07 +0200
Subject: [PATCH] Prepare 3.1.11.

---
 CHANGES.txt | 6 ++++++
 README.adoc | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4e625e9328..3c2f6b6a6e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+3.1.11
+o Apply optimistic locking logic during merge, too. (#623)
+o Turn off client side Cypher validation, request TX type as needed. (#627)
+o Upgrade to Jackson 2.9.9. (#628)
+o Upgrade Neo4j 3.5 to 3.5.6.
+
 3.1.10
 o Provide hooks to configure native Bolt driver logging.
 
diff --git a/README.adoc b/README.adoc
index fbae61b738..a828a7bc73 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,5 +1,5 @@
-:version: 3.1.10
-:dev_version: 3.1.11-SNAPSHOT
+:version: 3.1.11
+:dev_version: 3.1.12-SNAPSHOT
 :last_dev_version: 3.2.0-SNAPSHOT
 
 image:https://img.shields.io/maven-central/v/org.neo4j/neo4j-ogm.svg[Maven Central,link=http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.neo4j%22%20AND%20a%3A%22neo4j-ogm%22]