Upgrades for groovy, rest-assured, spotless and misc

build.gradle

@@ -27,10 +27,11 @@ buildscript {
       springBoot: '2.7.3',
       jjwt: '0.11.5',
       okta: '3.1.0',
-      oktaAuthnSdk: '2.0.7'
+      oktaAuthnSdk: '2.0.7',
+      restAssured: '5.2.0',
+      groovy: '4.0.6'
     ]
   }
-  ext['groovy.version'] = '3.0.7'
 
   repositories {
     maven {
@@ -169,8 +170,8 @@ subprojects {
     annotationProcessor "org.projectlombok:lombok:${versions.lombok}"
 
     // common test deps
-    testImplementation 'org.codehaus.groovy:groovy-all:3.0.12'
-    testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
+    testImplementation "org.apache.groovy:groovy-all:4.0.6" //${versions.groovy}"
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
     testImplementation 'com.openpojo:openpojo:0.9.1'

cerberus-api-tests/build.gradle

@@ -33,11 +33,11 @@ dependencies {
   implementation group: 'org.testng', name: 'testng', version: '7.5'
   implementation 'junit:junit:4.13.2'
   implementation 'org.slf4j:slf4j-api:1.7.36'
-  implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.12'
-  implementation 'io.rest-assured:rest-assured:4.4.0'
-  implementation group: 'io.rest-assured', name: 'json-schema-validator', version: '4.4.0'
-  implementation group: 'io.rest-assured', name: 'json-path', version: '4.4.0'
-  implementation group: 'io.rest-assured', name: 'xml-path', version: '4.4.0'
+  implementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.6' // versions.groovyf
+  implementation "io.rest-assured:rest-assured:${versions.restAssured}"
+  implementation group: 'io.rest-assured', name: 'json-schema-validator', version: versions.restAssured
+  implementation group: 'io.rest-assured', name: 'json-path', version: versions.restAssured
+  implementation group: 'io.rest-assured', name: 'xml-path', version: versions.restAssured
   implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
   implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
   implementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'

cerberus-auth-connector-okta/src/test/java/com/nike/cerberus/auth/connector/okta/AbstractOktaStateHandlerTest.java

@@ -16,7 +16,7 @@
 
 package com.nike.cerberus.auth.connector.okta;
 
-import static groovy.util.GroovyTestCase.assertEquals;
+import static groovy.test.GroovyTestCase.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;

cerberus-domain/src/test/java/com/nike/cerberus/domain/VaultStyleErrorResponseTest.java

@@ -16,7 +16,7 @@
 
 package com.nike.cerberus.domain;
 
-import static groovy.util.GroovyTestCase.assertEquals;
+import static groovy.test.GroovyTestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
 
 import java.util.Set;

cerberus-web/build.gradle

@@ -88,7 +88,7 @@ dependencies {
   integrationTestImplementation sourceSets.test.output
   integrationTestCompileOnly 'org.projectlombok:lombok'
   integrationTestAnnotationProcessor 'org.projectlombok:lombok'
-  integrationTestImplementation 'io.rest-assured:rest-assured-all:4.4.0'
+  integrationTestImplementation "io.rest-assured:rest-assured-all:${versions.restAssured}"
 }
 configurations{
   integrationTestImplementation.extendsFrom(testImplementation)

cerberus-web/src/main/java/com/nike/cerberus/service/SafeDepositBoxService.java

@@ -779,7 +779,9 @@ protected SafeDepositBoxV2 convertSafeDepositBoxV1ToV2(SafeDepositBoxV1 safeDepo
     return safeDepositBoxV2;
   }
 
-  /** @return The total number of safe deposit boxes. */
+  /**
+   * @return The total number of safe deposit boxes.
+   */
   public int getTotalNumberOfSafeDepositBoxes() {
     return safeDepositBoxDao.getSafeDepositBoxCount();
   }

cerberus-web/src/main/java/com/nike/cerberus/service/SecureDataService.java

@@ -449,7 +449,9 @@ public int getTotalNumberOfKeyValuePairs() {
     return secureDataDao.getSumTopLevelKeyValuePairs();
   }
 
-  /** @return True if the secret has ever been updated, false if it has not. */
+  /**
+   * @return True if the secret has ever been updated, false if it has not.
+   */
   boolean secureDataHasBeenUpdated(SecureDataRecord secureDataRecord) {
     boolean createdBySameAsUpdatedBy =
         secureDataRecord.getCreatedBy().equals(secureDataRecord.getLastUpdatedBy());