Upgrade gradle to 6.0.1

oliemansm · oliemansm · commit 2dee089b8895 · 2019-11-25T08:43:00.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,7 @@ buildscript {
 plugins {
     id 'net.researchgate.release' version '2.7.0'
     id 'io.franzbecker.gradle-lombok' version '3.2.0' apply false
-    id "com.jfrog.artifactory" version "4.8.1" apply false
+    id "com.jfrog.artifactory" version "4.11.0" apply false
     id "biz.aQute.bnd" version "4.3.1" apply false
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,4 @@ LIB_JACKSON_VER = 2.10.0
 SOURCE_COMPATIBILITY = 1.8
 TARGET_COMPATIBILITY = 1.8
 
-GRADLE_WRAPPER_VER = 4.10.3
+GRADLE_WRAPPER_VER = 6.0.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Thu Nov 14 18:53:34 CET 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle
@@ -6,7 +6,6 @@ buildscript {
 }
 
 apply plugin: 'groovy'
-apply plugin: 'osgi'
 apply plugin: 'java-library-distribution'
 apply plugin: 'biz.aQute.bnd.builder'
 
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,3 @@
-enableFeaturePreview('STABLE_PUBLISHING')
-
 rootProject.name = 'graphql-java-servlet'
 
 include ':graphql-java-kickstart'

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ buildscript {`
`35`	`35`	`plugins {`
`36`	`36`	`id 'net.researchgate.release' version '2.7.0'`
`37`	`37`	`id 'io.franzbecker.gradle-lombok' version '3.2.0' apply false`
`38`		`- id "com.jfrog.artifactory" version "4.8.1" apply false`
	`38`	`+ id "com.jfrog.artifactory" version "4.11.0" apply false`
`39`	`39`	`id "biz.aQute.bnd" version "4.3.1" apply false`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`apply plugin: 'groovy'`
`9`		`-apply plugin: 'osgi'`
`10`	`9`	`apply plugin: 'java-library-distribution'`
`11`	`10`	`apply plugin: 'biz.aQute.bnd.builder'`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-enableFeaturePreview('STABLE_PUBLISHING')`
`2`		`-`
`3`	`1`	`rootProject.name = 'graphql-java-servlet'`
`4`	`2`
`5`	`3`	`include ':graphql-java-kickstart'`