Merge modules

This commit merges the common, webmvc and webflux modules into a single
web module for supporting GraphQL with all Spring web frameworks.
We're working here with optional dependencies to build the support
for Spring MVC on one side and Spring WebFlux on the other.

Also, this commit updates the starter modules to adopt the official
naming convention. For now, starter modules will host both the
configuration infrastructure and the transitive dependencies to activate
support.

settings.gradle

@@ -1,7 +1,4 @@
 rootProject.name = 'spring-graphql'
-include 'spring-graphql-boot-starter-webmvc'
-include 'spring-graphql-boot-starter-webflux'
-include 'spring-graphql-webmvc'
-include 'spring-graphql-webflux'
-include 'spring-graphql-common'
-
+include 'spring-boot-starter-graphql-web'
+include 'spring-boot-starter-graphql-webflux'
+include 'spring-graphql-web'

spring-boot-starter-graphql-web/build.gradle

@@ -0,0 +1,7 @@
+description = "Starter for building GraphQL Java applications with Spring MVC"
+
+dependencies {
+    api project(':spring-graphql-web')
+	api 'io.projectreactor:reactor-core'
+    api 'org.springframework.boot:spring-boot-starter-web'
+}

spring-boot-starter-graphql-webflux/build.gradle

@@ -0,0 +1,6 @@
+description = "Starter for building GraphQL Java applications with Spring WebFlux"
+
+dependencies {
+    api project(':spring-graphql-web')
+    api 'org.springframework.boot:spring-boot-starter-webflux'
+}

spring-graphql-boot-starter-webflux/build.gradle

@@ -1,9 +0,0 @@
-description = "Starter for building GraphQL Java applications with Spring WebFlux"
-
-dependencies {
-    implementation project(':spring-graphql-webflux')
-    implementation 'org.springframework.boot:spring-boot-autoconfigure'
-
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile 'org.springframework.boot:spring-boot-starter-webflux'
-}

spring-graphql-boot-starter-webmvc/build.gradle

@@ -1,9 +0,0 @@
-description = "Starter for building GraphQL Java applications with Spring WebFlux"
-
-dependencies {
-    implementation project(':spring-graphql-webmvc')
-    implementation 'org.springframework.boot:spring-boot-autoconfigure'
-
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile 'org.springframework.boot:spring-boot-starter-web'
-}

spring-graphql-common/build.gradle

@@ -1,7 +0,0 @@
-description = "Common module for GraphQL Java Spring support"
-
-dependencies {
-    api 'io.projectreactor:reactor-core'
-    api "com.graphql-java:graphql-java"
-    implementation "org.springframework:spring-web"
-}

spring-graphql-web/build.gradle

@@ -0,0 +1,16 @@
+description = "GraphQL Java support with Spring Web frameworks"
+
+dependencies {
+	api "com.graphql-java:graphql-java"
+
+	compileOnly "org.springframework:spring-context"
+	compileOnly "org.springframework:spring-webflux"
+
+	compileOnly 'org.springframework:spring-webmvc'
+	compileOnly 'javax.servlet:javax.servlet-api'
+
+	testImplementation "com.fasterxml.jackson.core:jackson-databind"
+	testImplementation "org.springframework:spring-webflux"
+	testImplementation 'org.springframework:spring-webmvc'
+	testImplementation 'javax.servlet:javax.servlet-api'
+}

spring-graphql-webflux/build.gradle

@@ -1,10 +0,0 @@
-description = "GraphQL Java Spring WebFlux integration"
-
-dependencies {
-    api 'com.graphql-java:graphql-java'
-
-    implementation project(':spring-graphql-common')
-	implementation 'org.springframework:spring-context'
-    implementation 'org.springframework:spring-webflux'
-    implementation 'com.fasterxml.jackson.core:jackson-databind'
-}

spring-graphql-webmvc/build.gradle

@@ -1,10 +0,0 @@
-description = "GraphQL Java Spring MVC integration"
-
-dependencies {
-    api 'com.graphql-java:graphql-java'
-
-    implementation project(':spring-graphql-common')
-	implementation 'org.springframework:spring-webmvc'
-    implementation 'com.fasterxml.jackson.core:jackson-databind'
-    implementation 'javax.servlet:javax.servlet-api'
-}