From 4f35b56b156c6b681e1d650c665de49bcad33969 Mon Sep 17 00:00:00 2001
From: Michael Hunger <github@jexp.de>
Date: Thu, 12 Nov 2020 14:28:18 +0100
Subject: [PATCH] Release 1.2.0

---
 core/pom.xml                         | 2 +-
 docs/Server.groovy                   | 7 +++++++
 examples/graphql-spring-boot/pom.xml | 4 ++--
 examples/pom.xml                     | 2 +-
 pom.xml                              | 2 +-
 readme.adoc                          | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 1c0a316d..7e9791ca 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-graphql-java-parent</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>neo4j-graphql-java</artifactId>
diff --git a/docs/Server.groovy b/docs/Server.groovy
index 53cd71f3..3182cd27 100644
--- a/docs/Server.groovy
+++ b/docs/Server.groovy
@@ -1,10 +1,17 @@
 // Simplistic GraphQL Server using SparkJava
 @Grapes([
+<<<<<<< HEAD
         @Grab('com.sparkjava:spark-core:2.7.2'),
         @Grab('org.neo4j.driver:neo4j-java-driver:4.1.1'),
         @Grab('org.neo4j:neo4j-graphql-java:1.1.0'),
         @Grab('com.google.code.gson:gson:2.8.5'),
         @Grab('org.slf4j:slf4j-simple:1.7.30')
+=======
+  @Grab('com.sparkjava:spark-core:2.7.2'),
+  @Grab('org.neo4j.driver:neo4j-java-driver:1.7.2'),
+  @Grab('org.neo4j:neo4j-graphql-java:1.2.0'),
+  @Grab('com.google.code.gson:gson:2.8.5')
+>>>>>>> Release 1.2.0
 ])
 import com.google.gson.Gson
 
diff --git a/examples/graphql-spring-boot/pom.xml b/examples/graphql-spring-boot/pom.xml
index 4da6dfc6..08029200 100644
--- a/examples/graphql-spring-boot/pom.xml
+++ b/examples/graphql-spring-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-graphql-java-examples</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <groupId>org.neo4j.graphql.examples</groupId>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-graphql-java</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
 
         <!-- a spring graphql library -->
diff --git a/examples/pom.xml b/examples/pom.xml
index e7e10131..82b4b2c2 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-graphql-java-parent</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>neo4j-graphql-java-examples</artifactId>
diff --git a/pom.xml b/pom.xml
index 06479d90..abcb7fc6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <artifactId>neo4j-graphql-java-parent</artifactId>
     <name>Neo4j GraphQL Java Parent</name>
     <description>GraphQL to Cypher Mapping</description>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2.0</version>
     <url>http://github.com/neo4j-graphql/neo4j-graphql-java</url>
     <packaging>pom</packaging>
 
diff --git a/readme.adoc b/readme.adoc
index f7b55e5a..a68283fd 100644
--- a/readme.adoc
+++ b/readme.adoc
@@ -1,5 +1,5 @@
 = JVM Library to translate GraphQL queries and mutations to Neo4j's Cypher
-:version: 1.1.0
+:version: 1.2.0
 :toc:
 :toclevels: 1
 :toc-title: Quick Links