Merge branch 'master' of https://github.com/graphql-java/graphql-java-annotations

Author: yarinvak

build.gradle

@@ -1,4 +1,3 @@
-import java.text.SimpleDateFormat
 import aQute.bnd.gradle.Bundle
 
 buildscript {
@@ -11,7 +10,7 @@ buildscript {
     }
 }
 plugins {
-    id "com.jfrog.bintray" version "1.7"
+    id "com.jfrog.bintray" version "1.8.4"
     id 'net.researchgate.release' version '2.3.4'
     id "com.github.hierynomus.license" version "0.14.0"
 }
@@ -24,8 +23,8 @@ apply plugin: 'biz.aQute.bnd.builder'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven-publish'
 
-def releaseVersion = System.properties.RELEASE_VERSION
-version = releaseVersion ? releaseVersion : new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date())
+//def releaseVersion = System.properties.RELEASE_VERSION
+//version = releaseVersion ? releaseVersion : new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date())
 
 // custom tasks for creating source/javadoc jars
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -143,7 +142,7 @@ publishing {
                             id 'guy120494'
                             name 'Guy Smorodinsky'
                         }
-                        developer{
+                        developer {
                             id 'osher-sade'
                             name 'Osher Sade'
                         }
@@ -170,6 +169,13 @@ bintray {
         version {
             name = project.version
             released = new Date()
+            mavenCentralSync {
+                sync = true //[Default: true] Determines whether to sync the version to Maven Central.
+                user = System.getenv('OSS_USER') ?: project.findProperty('OSS_USER') ?: ''
+                password = System.getenv('OSS_PASS') ?: project.findProperty('OSS_PASS') ?: ''
+                close = '1'
+                //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
+            }
         }
     }
 }
@@ -178,3 +184,8 @@ task bundle(type: Bundle) {
     from sourceSets.main.output
     bndfile = file('bundle.bnd')
 }
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.0'
+}
+

gradle.properties

@@ -5,6 +5,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
-bintray.user=DUMMY_USER
-bintray.key=DUMMY_KEY
-version = 6.1
+version = 6.2