Merge branch 'master' into renovate/org.osgi-org.osgi.service.component.annotations-1.x

Author: oliemansm

graphql-java-servlet/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
     compileOnly 'org.osgi:org.osgi.service.cm:1.6.0'
-    compileOnly 'org.osgi:org.osgi.service.component:1.3.0'
+    compileOnly 'org.osgi:org.osgi.service.component:1.4.0'
     compileOnly 'org.osgi:org.osgi.service.component.annotations:1.4.0'
     compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.4.0'
     compileOnly 'org.osgi:org.osgi.annotation:6.0.0'
@@ -34,10 +34,10 @@ dependencies {
     // Unit testing
     testImplementation "org.codehaus.groovy:groovy-all:2.5.14"
     testImplementation "org.spockframework:spock-core:1.3-groovy-2.5"
-    testRuntimeOnly "cglib:cglib-nodep:3.2.4"
-    testRuntimeOnly "org.objenesis:objenesis:2.6"
+    testRuntimeOnly "cglib:cglib-nodep:3.3.0"
+    testRuntimeOnly "org.objenesis:objenesis:3.2"
     testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
-    testImplementation 'org.springframework:spring-test:4.3.7.RELEASE'
-    testRuntimeOnly 'org.springframework:spring-web:4.3.7.RELEASE'
+    testImplementation 'org.springframework:spring-test:5.3.6'
+    testRuntimeOnly 'org.springframework:spring-web:5.3.6'
     testImplementation 'com.google.guava:guava:30.1.1-jre'
 }