From ba6eeb4ccf564fc84580cc7d58af99efb7f0d8ed Mon Sep 17 00:00:00 2001
From: Shane Myrick <accounts@shanemyrick.com>
Date: Wed, 16 Oct 2019 10:16:05 -0700
Subject: [PATCH 1/4] Move spring-boot version to single location

Move the declared verion of spring-boot to the root so we use the same version across all the modules and examples
---
 examples/federation/base-app/pom.xml   | 2 --
 examples/federation/extend-app/pom.xml | 2 --
 examples/spring/pom.xml                | 2 --
 graphql-kotlin-spring-server/pom.xml   | 1 -
 pom.xml                                | 1 +
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/examples/federation/base-app/pom.xml b/examples/federation/base-app/pom.xml
index 58bbdc6e8..63f7a9ffc 100644
--- a/examples/federation/base-app/pom.xml
+++ b/examples/federation/base-app/pom.xml
@@ -14,8 +14,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <spring-boot.version>2.2.0.M5</spring-boot.version>
-
         <!-- skip release plugins -->
         <maven.source.skip>true</maven.source.skip>
     </properties>
diff --git a/examples/federation/extend-app/pom.xml b/examples/federation/extend-app/pom.xml
index cd4678507..5bb3a08c1 100644
--- a/examples/federation/extend-app/pom.xml
+++ b/examples/federation/extend-app/pom.xml
@@ -14,8 +14,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <spring-boot.version>2.2.0.M5</spring-boot.version>
-
         <!-- skip release plugins -->
         <maven.source.skip>true</maven.source.skip>
     </properties>
diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml
index 4136d32db..a220b380a 100644
--- a/examples/spring/pom.xml
+++ b/examples/spring/pom.xml
@@ -14,8 +14,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <spring-boot.version>2.2.0.M5</spring-boot.version>
-
         <!-- skip release plugins -->
         <maven.source.skip>true</maven.source.skip>
     </properties>
diff --git a/graphql-kotlin-spring-server/pom.xml b/graphql-kotlin-spring-server/pom.xml
index be7f2804e..000fecec8 100644
--- a/graphql-kotlin-spring-server/pom.xml
+++ b/graphql-kotlin-spring-server/pom.xml
@@ -12,7 +12,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <spring-boot.version>2.2.0.RC1</spring-boot.version>
         <reactor.version>3.3.0.RELEASE</reactor.version>
         <reactor-kotlin-extensions.version>1.0.0.RELEASE</reactor-kotlin-extensions.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index a5637ba59..f12bc8b44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
         <kotlin.version>1.3.50</kotlin.version>
         <kotlin-coroutines.version>1.3.2</kotlin-coroutines.version>
         <reflections.version>0.9.11</reflections.version>
+        <spring-boot.version>2.2.0.RC1</spring-boot.version>
 
         <!-- Test Dependency Versions -->
         <junit-jupiter.version>5.5.2</junit-jupiter.version>

From 9158ab673c6698e149976c6a01743fb0b47e5da6 Mon Sep 17 00:00:00 2001
From: Shane Myrick <accounts@shanemyrick.com>
Date: Wed, 16 Oct 2019 10:20:51 -0700
Subject: [PATCH 2/4] Update README docs

---
 examples/spring/README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/spring/README.md b/examples/spring/README.md
index 576b1f814..d2e92bea6 100644
--- a/examples/spring/README.md
+++ b/examples/spring/README.md
@@ -3,16 +3,18 @@
 One way to run a GraphQL server is with [Spring Boot](https://github.com/spring-projects/spring-boot). This example app uses [Spring Webflux](https://docs.spring.io/spring/docs/current/spring-framework-reference/web-reactive.html) together with `graphql-kotlin` and [graphql-playground](https://github.com/prisma/graphql-playground).
 
 ### Running locally
-Build the application
 
-```bash
+First you must build all the other modules since this is a multi-module project.
+
+From the root directory:
+
+```shell script
 mvn clean install
 ```
 
-Start the server:
+Then to start the server:
 
 * Run `Application.kt` directly from your IDE
-* Alternatively you can also use the spring boot maven plugin by running `mvn spring-boot:run` from the command line.
-
+* Alternatively you can also use the spring boot maven plugin by running `mvn spring-boot:run` from the command line in the spring example directory.
 
-Once the app has started you can explore the example schema by opening Playground endpoint at http://localhost:8080/playground.
+Once the app has started you can explore the example schema by opening the GraphQL Playground endpoint at http://localhost:8080/playground.

From cea0002aea660c35248d8b9fc62e0c4c5527fffa Mon Sep 17 00:00:00 2001
From: Shane Myrick <accounts@shanemyrick.com>
Date: Wed, 16 Oct 2019 10:52:09 -0700
Subject: [PATCH 3/4] Update parent/child for the examples

---
 examples/federation/base-app/pom.xml   |  4 ++--
 examples/federation/extend-app/pom.xml |  4 ++--
 examples/federation/pom.xml            | 10 +++++-----
 examples/pom.xml                       |  2 +-
 examples/spring/pom.xml                |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/federation/base-app/pom.xml b/examples/federation/base-app/pom.xml
index 63f7a9ffc..8ed991c2d 100644
--- a/examples/federation/base-app/pom.xml
+++ b/examples/federation/base-app/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.expediagroup</groupId>
-        <artifactId>graphql-kotlin</artifactId>
+        <artifactId>federation</artifactId>
         <version>1.1.1-SNAPSHOT</version>
-        <relativePath>../../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>base-app</artifactId>
diff --git a/examples/federation/extend-app/pom.xml b/examples/federation/extend-app/pom.xml
index 5bb3a08c1..17d9c0fdd 100644
--- a/examples/federation/extend-app/pom.xml
+++ b/examples/federation/extend-app/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.expediagroup</groupId>
-        <artifactId>graphql-kotlin</artifactId>
+        <artifactId>federation</artifactId>
         <version>1.1.1-SNAPSHOT</version>
-        <relativePath>../../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>extend-app</artifactId>
diff --git a/examples/federation/pom.xml b/examples/federation/pom.xml
index d96f03bbe..6cf1fe7c9 100644
--- a/examples/federation/pom.xml
+++ b/examples/federation/pom.xml
@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>graphql-kotlin</artifactId>
         <groupId>com.expediagroup</groupId>
+        <artifactId>examples</artifactId>
         <version>1.1.1-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>federation</artifactId>
@@ -78,7 +78,7 @@
                             <phase>validate</phase>
                             <configuration>
                                 <target name="ktlint">
-                                    <java taskname="ktlint" dir="${project.basedir}" fork="true" failonerror="true" classname="com.github.shyiko.ktlint.Main" classpathref="maven.plugin.classpath">
+                                    <java taskname="ktlint" dir="${project.basedir}" fork="true" failonerror="true" classname="com.pinterest.ktlint.Main" classpathref="maven.plugin.classpath">
                                         <arg value="src/**/*.kt" />
                                         <arg value="--reporter=plain" />
                                         <arg value="--reporter=checkstyle,output=${project.build.directory}/ktlint.xml" />
@@ -94,10 +94,10 @@
                         <dependency>
                             <groupId>io.gitlab.arturbosch.detekt</groupId>
                             <artifactId>detekt-cli</artifactId>
-                            <version>${detekt-cli.version}</version>
+                            <version>${detekt.version}</version>
                         </dependency>
                         <dependency>
-                            <groupId>com.github.shyiko</groupId>
+                            <groupId>com.pinterest</groupId>
                             <artifactId>ktlint</artifactId>
                             <version>${ktlint.version}</version>
                         </dependency>
diff --git a/examples/pom.xml b/examples/pom.xml
index 4d5bbd289..8d58087ce 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>graphql-kotlin</artifactId>
         <groupId>com.expediagroup</groupId>
+        <artifactId>graphql-kotlin</artifactId>
         <version>1.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml
index a220b380a..201a61cc0 100644
--- a/examples/spring/pom.xml
+++ b/examples/spring/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.expediagroup</groupId>
-        <artifactId>graphql-kotlin</artifactId>
+        <artifactId>examples</artifactId>
         <version>1.1.1-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>spring-example</artifactId>

From 6cd8288e5fae1b4c8dc8571623b3d829f097ae45 Mon Sep 17 00:00:00 2001
From: Shane Myrick <accounts@shanemyrick.com>
Date: Wed, 16 Oct 2019 13:04:47 -0700
Subject: [PATCH 4/4] Update maven settings for root directory

---
 examples/federation/base-app/pom.xml    |  1 +
 examples/federation/extend-app/pom.xml  |  1 +
 examples/federation/pom.xml             | 58 -------------------------
 examples/spring/pom.xml                 |  1 +
 graphql-kotlin-federation/pom.xml       |  5 ++-
 graphql-kotlin-schema-generator/pom.xml |  1 +
 graphql-kotlin-spring-server/pom.xml    |  1 +
 pom.xml                                 |  3 +-
 8 files changed, 11 insertions(+), 60 deletions(-)

diff --git a/examples/federation/base-app/pom.xml b/examples/federation/base-app/pom.xml
index 8ed991c2d..d3c23b79c 100644
--- a/examples/federation/base-app/pom.xml
+++ b/examples/federation/base-app/pom.xml
@@ -14,6 +14,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <project.root>${project.basedir}/../../..</project.root>
         <!-- skip release plugins -->
         <maven.source.skip>true</maven.source.skip>
     </properties>
diff --git a/examples/federation/extend-app/pom.xml b/examples/federation/extend-app/pom.xml
index 17d9c0fdd..eb49bb7db 100644
--- a/examples/federation/extend-app/pom.xml
+++ b/examples/federation/extend-app/pom.xml
@@ -14,6 +14,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <project.root>${project.basedir}/../../..</project.root>
         <!-- skip release plugins -->
         <maven.source.skip>true</maven.source.skip>
     </properties>
diff --git a/examples/federation/pom.xml b/examples/federation/pom.xml
index 6cf1fe7c9..b2d047dfe 100644
--- a/examples/federation/pom.xml
+++ b/examples/federation/pom.xml
@@ -45,64 +45,6 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.8</version>
-                    <executions>
-                        <!-- those can be run separately with mvn clean antrun:run@<target_id> -->
-                        <execution>
-                            <id>detekt</id>
-                            <phase>validate</phase>
-                            <configuration>
-                                <target name="detekt">
-                                    <java taskname="detekt" dir="${project.basedir}" fork="true" failonerror="true" classname="io.gitlab.arturbosch.detekt.cli.Main" classpathref="maven.plugin.classpath">
-                                        <arg value="--fail-fast" />
-                                        <arg value="--input" />
-                                        <arg value="${project.basedir}${file.separator}src" />
-                                        <arg value="--config" />
-                                        <arg value="${project.parent.relativePath}${file.separator}detekt.yml" />
-                                        <arg value="--report" />
-                                        <arg value="html:${project.basedir}${file.separator}target${file.separator}site${file.separator}detekt.html" />
-                                        <arg value="--report" />
-                                        <arg value="xml:${project.basedir}${file.separator}target${file.separator}site${file.separator}detekt.xml" />
-                                    </java>
-                                </target>
-                            </configuration>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>ktlint</id>
-                            <phase>validate</phase>
-                            <configuration>
-                                <target name="ktlint">
-                                    <java taskname="ktlint" dir="${project.basedir}" fork="true" failonerror="true" classname="com.pinterest.ktlint.Main" classpathref="maven.plugin.classpath">
-                                        <arg value="src/**/*.kt" />
-                                        <arg value="--reporter=plain" />
-                                        <arg value="--reporter=checkstyle,output=${project.build.directory}/ktlint.xml" />
-                                    </java>
-                                </target>
-                            </configuration>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>io.gitlab.arturbosch.detekt</groupId>
-                            <artifactId>detekt-cli</artifactId>
-                            <version>${detekt.version}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>com.pinterest</groupId>
-                            <artifactId>ktlint</artifactId>
-                            <version>${ktlint.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml
index 201a61cc0..be99c64e1 100644
--- a/examples/spring/pom.xml
+++ b/examples/spring/pom.xml
@@ -14,6 +14,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <project.root>${project.basedir}/../..</project.root>
         <!-- skip release plugins -->
         <maven.source.skip>true</maven.source.skip>
     </properties>
diff --git a/graphql-kotlin-federation/pom.xml b/graphql-kotlin-federation/pom.xml
index d9df1fc85..e22fb043f 100644
--- a/graphql-kotlin-federation/pom.xml
+++ b/graphql-kotlin-federation/pom.xml
@@ -10,9 +10,12 @@
     </parent>
 
     <artifactId>graphql-kotlin-federation</artifactId>
-    <name>graphql-kotlin-federation</name>
     <packaging>jar</packaging>
 
+    <properties>
+        <project.root>${project.basedir}/..</project.root>
+    </properties>
+
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
diff --git a/graphql-kotlin-schema-generator/pom.xml b/graphql-kotlin-schema-generator/pom.xml
index 3d727f679..82c9b2ff2 100644
--- a/graphql-kotlin-schema-generator/pom.xml
+++ b/graphql-kotlin-schema-generator/pom.xml
@@ -14,6 +14,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <project.root>${project.basedir}/..</project.root>
         <rxjava2.version>2.2.12</rxjava2.version>
     </properties>
 
diff --git a/graphql-kotlin-spring-server/pom.xml b/graphql-kotlin-spring-server/pom.xml
index 000fecec8..43448c7bb 100644
--- a/graphql-kotlin-spring-server/pom.xml
+++ b/graphql-kotlin-spring-server/pom.xml
@@ -12,6 +12,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <project.root>${project.basedir}/..</project.root>
         <reactor.version>3.3.0.RELEASE</reactor.version>
         <reactor-kotlin-extensions.version>1.0.0.RELEASE</reactor-kotlin-extensions.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index f12bc8b44..d955c49ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
         <!-- Project Versions -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
+        <project.root>${project.basedir}</project.root>
 
         <!-- Dependency Versions -->
         <graphql-java.version>13.0</graphql-java.version>
@@ -133,7 +134,7 @@
                                         <arg value="--input" />
                                         <arg value="${project.basedir}${file.separator}src" />
                                         <arg value="--config" />
-                                        <arg value="${project.parent.relativePath}${file.separator}detekt.yml" />
+                                        <arg value="${project.root}${file.separator}detekt.yml" />
                                         <arg value="--report" />
                                         <arg value="html:${project.basedir}${file.separator}target${file.separator}site${file.separator}detekt.html" />
                                         <arg value="--report" />