Updated build settings for kickstart organization

Author: oliemansm

.travis.yml

@@ -3,6 +3,6 @@ dist: trusty # https://stackoverflow.com/questions/38912714/travis-failing-junit
 jdk:
   - oraclejdk8
 before_install:
- - chmod +x gradlew
+ - chmod +x travis-build.sh
 script:
-  - ./gradlew check;
+  - ./travis-build.sh

build.gradle

@@ -41,7 +41,7 @@ subprojects {
     repositories {
         mavenLocal()
         jcenter()
-        maven { url "http://dl.bintray.com/oembedler/maven" }
+        maven { url "http://dl.bintray.com/graphql-java-kickstart/releases" }
         maven { url "http://repo.spring.io/libs-milestone" }
     }
 
@@ -133,11 +133,11 @@ subprojects {
 
         bintray {
             user = System.env.BINTRAY_USER ?: project.findProperty('BINTRAY_USER') ?: ''
-            key = System.env.BINTRAY_KEY ?: project.findProperty('BINTRAY_KEY') ?: ''
+            key = System.env.BINTRAY_PASS ?: project.findProperty('BINTRAY_PASS') ?: ''
             publications = ['mainProjectPublication']
             publish = true
             pkg {
-                repo = 'maven'
+                repo = 'releases'
                 name = PROJECT_NAME
                 desc = PROJECT_DESC
                 licenses = [PROJECT_LICENSE]

example-graphql-subscription/build.gradle

@@ -11,7 +11,7 @@ repositories {
 dependencies {
     compile(project(":graphql-spring-boot-starter"))
     compile(project(":graphiql-spring-boot-starter"))
-    compile "com.graphql-java:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
     compile "io.reactivex.rxjava2:rxjava:2.1.5"
 

example-graphql-tools/build.gradle

@@ -29,7 +29,7 @@ repositories {
 dependencies {
     compile(project(":graphql-spring-boot-starter"))
     compile(project(":graphiql-spring-boot-starter"))
-    compile "com.graphql-java:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
     compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")
 

gradle.properties

@@ -18,12 +18,12 @@
 #
 
 PROJECT_VERSION = 5.0.3
-PROJECT_GROUP = com.graphql-java
+PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-boot
 PROJECT_DESC = GraphQL Spring Framework Boot
-PROJECT_GIT_REPO_URL = https://github.com/graphql-java/graphql-spring-boot
+PROJECT_GIT_REPO_URL = https://github.com/graphql-java-kickstart/graphql-spring-boot
 PROJECT_LICENSE = MIT
-PROJECT_LICENSE_URL = https://github.com/graphql-java/spring-boot-graphql/blob/master/LICENSE.md
+PROJECT_LICENSE_URL = https://github.com/graphql-java-kickstart/spring-boot-graphql/blob/master/LICENSE.md
 PROJECT_DEV_ID = apottere
 PROJECT_DEV_NAME = Andrew Potter
 
@@ -39,9 +39,9 @@ TARGET_COMPATIBILITY = 1.8
 LIB_GRAPHQL_JAVA_VER = 9.2
 LIB_JUNIT_VER = 4.12
 LIB_SPRING_CORE_VER = 5.0.4.RELEASE
-LIB_SPRING_BOOT_VER = 2.0.4.RELEASE
-LIB_GRAPHQL_SERVLET_VER = 6.1.3
-LIB_GRAPHQL_JAVA_TOOLS_VER = 5.2.4
+LIB_SPRING_BOOT_VER = 2.0.5.RELEASE
+LIB_GRAPHQL_SERVLET_VER = 6.1.4
+LIB_GRAPHQL_JAVA_TOOLS_VER = 5.3.0
 LIB_COMMONS_IO_VER = 2.6
 
 GRADLE_WRAPPER_VER = 4.7

graphql-spring-boot-autoconfigure/build.gradle

@@ -21,16 +21,15 @@ dependencies {
     compile "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
     compile "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
-    compile "com.graphql-java:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
+    compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
     compile "commons-io:commons-io:$LIB_COMMONS_IO_VER"
-
+    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+    
     compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    compileOnly "com.graphql-java:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
     testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
     testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
     testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
-    testCompile "com.graphql-java:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 }
 
 compileJava.dependsOn(processResources)

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLJavaToolsAutoConfiguration.java

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.module.kotlin.KotlinModule;
-import graphql.language.FieldDefinition;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
 import graphql.servlet.GraphQLSchemaProvider;
@@ -63,19 +62,20 @@ public SchemaParser schemaParser(
 
         if (options != null) {
             builder.options(options);
-        }else if(perFieldObjectMapperProvider.isPresent()) {
+        } else if (perFieldObjectMapperProvider.isPresent()) {
             final SchemaParserOptions.Builder optionsBuilder =
                     newOptions().objectMapperProvider(perFieldObjectMapperProvider.get());
             builder.options(optionsBuilder.build());
         }
 
-        return builder.resolvers(resolvers)
+        return builder
+                .resolvers(resolvers)
                 .build();
     }
 
     @Bean
     @ConditionalOnMissingBean
-    @ConditionalOnProperty(value="graphql.tools.use-default-objectmapper", havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(value = "graphql.tools.use-default-objectmapper", havingValue = "true", matchIfMissing = true)
     public PerFieldObjectMapperProvider perFieldObjectMapperProvider(ObjectMapper objectMapper) {
         objectMapper
                 .registerModule(new Jdk8Module())

graphql-spring-boot-test-autoconfigure/build.gradle

@@ -22,7 +22,7 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER")
     compile(project(":graphql-spring-boot-test"))
     compile(project(":graphql-spring-boot-starter"))
-    compile("com.graphql-java:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER")
+    compile("com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER")
 }
 
 compileJava.dependsOn(processResources)

travis-build.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -ev
+
+if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && [ "${RELEASE}" = "true" ]; then
+    echo "Deploying release to Bintray"
+    ./gradlew clean assemble && ./gradlew check --info && ./gradlew bintrayUpload -x check --info
+fi