Upgrade gradle to 6.0.1

Author: oliemansm

build.gradle

@@ -42,7 +42,6 @@ plugins {
 subprojects {
     apply plugin: 'idea'
     apply plugin: 'java'
-    apply plugin: 'maven'
     apply plugin: 'maven-publish'
     apply plugin: "com.jfrog.bintray"
     apply plugin: 'io.franzbecker.gradle-lombok'

graphql-java-servlet/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
     compileOnly 'org.osgi:org.osgi.service.cm:1.5.0'
     compileOnly 'org.osgi:org.osgi.service.component:1.3.0'
-    compileOnly 'biz.aQute.bnd:biz.aQute.bndlib:3.1.0'
+    compileOnly 'biz.aQute.bnd:biz.aQute.bndlib:4.3.1'
 
     testCompile 'io.github.graphql-java:graphql-java-annotations:5.2'
 

graphql-java-servlet/src/main/java/graphql/servlet/OsgiGraphQLHttpServlet.java

@@ -3,6 +3,13 @@
 import static graphql.schema.GraphQLObjectType.newObject;
 import static graphql.schema.GraphQLSchema.newSchema;
 
+import aQute.bnd.component.annotations.Activate;
+import aQute.bnd.component.annotations.Component;
+import aQute.bnd.component.annotations.Deactivate;
+import aQute.bnd.component.annotations.Reference;
+import aQute.bnd.component.annotations.ReferenceCardinality;
+import aQute.bnd.component.annotations.ReferencePolicy;
+import aQute.bnd.component.annotations.ReferencePolicyOption;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLCodeRegistry;
@@ -39,13 +46,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.osgi.service.component.annotations.ReferencePolicyOption;
 
 @Component(
     service = {javax.servlet.http.HttpServlet.class, javax.servlet.Servlet.class},