Merge branch 'master' into 405-upgrade-to-graphql-java-15

# Conflicts:
#	pom.xml

Author: vojtapol

pom.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-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">
+<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>
 
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-java-tools</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>GraphQL Java Tools</name>
@@ -311,7 +309,7 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <dependencyConvergence/>
+                                <dependencyConvergence />
                             </rules>
                         </configuration>
                     </execution>

src/main/kotlin/graphql/kickstart/tools/TypeDefinitionFactory.kt

@@ -12,5 +12,5 @@ interface TypeDefinitionFactory {
      *
      * @return any new definitions that should be added
      */
-    fun create(existing: List<Definition<*>>): List<Definition<*>>
+    fun create(existing: MutableList<Definition<*>>): List<Definition<*>>
 }

src/main/kotlin/graphql/kickstart/tools/relay/RelayConnectionFactory.kt

@@ -5,7 +5,7 @@ import graphql.language.*
 
 class RelayConnectionFactory : TypeDefinitionFactory {
 
-    override fun create(existing: List<Definition<*>>): List<Definition<*>> {
+    override fun create(existing: MutableList<Definition<*>>): List<Definition<*>> {
         val definitions = mutableListOf<Definition<*>>()
         val definitionsByName = existing.filterIsInstance<TypeDefinition<*>>()
             .associateBy { it.name }