🔧 Upgrade lombok

kids-first · May 28, 2024 · fce7233 · fce7233
1 parent 03b36f7
commit fce7233
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -77,6 +77,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.32</version>
             <optional>true</optional>
         </dependency>
 
@@ -128,9 +129,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
-            <version>2.35.1</version>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
+            <version>3.6.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/test/java/io/kidsfirst/keys/CavaticaTests.java b/src/test/java/io/kidsfirst/keys/CavaticaTests.java
@@ -11,9 +11,9 @@
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.ok;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+
 
 @Slf4j
 public class CavaticaTests extends AbstractTest {
@@ -46,7 +46,7 @@ public class CavaticaTests extends AbstractTest {
             "}";
 
     @BeforeAll
-    private static void initTest(){
+    static void initTest(){
         val userAndToken = createUserAndSecretAndObtainAccessToken("cavatica", "cavatica_secret");
         defaultAccessToken = userAndToken.getAccessToken();
     }

diff --git a/src/test/java/io/kidsfirst/keys/DynamicProxyTests.java b/src/test/java/io/kidsfirst/keys/DynamicProxyTests.java
@@ -28,7 +28,7 @@ public class DynamicProxyTests extends AbstractTest {
     protected static String defaultAccessToken = "";
 
     @BeforeAll
-    private static void initTest() {
+    static void initTest() {
         val userAndToken = createUserAndSecretAndObtainAccessToken("gen3", "cavatica_secret");
         defaultAccessToken = userAndToken.getAccessToken();
     }

diff --git a/src/test/java/io/kidsfirst/keys/FenceDeprecatedTests.java b/src/test/java/io/kidsfirst/keys/FenceDeprecatedTests.java
@@ -31,7 +31,7 @@ public class FenceDeprecatedTests extends AbstractTest {
 
     protected static String defaultAccessToken = "";
     @BeforeAll
-    private static void initTest(){
+    static void initTest(){
         val userAndToken = createUserAndSecretAndObtainAccessToken("cavatica", "cavatica_secret");
         defaultAccessToken = userAndToken.getAccessToken();
     }

diff --git a/src/test/java/io/kidsfirst/keys/FenceTests.java b/src/test/java/io/kidsfirst/keys/FenceTests.java
@@ -30,7 +30,7 @@ public class FenceTests extends AbstractTest {
     protected static String defaultAccessToken = "";
 
     @BeforeAll
-    private static void initTest() {
+    static void initTest() {
         val userAndToken = createUserAndSecretAndObtainAccessToken("gen3", "cavatica_secret");
         defaultAccessToken = userAndToken.getAccessToken();
     }

diff --git a/src/test/java/io/kidsfirst/keys/KeyStoreTests.java b/src/test/java/io/kidsfirst/keys/KeyStoreTests.java
@@ -19,7 +19,7 @@ public class KeyStoreTests extends AbstractTest {
     private final String keyStoreUri = "/key-store";
     protected static String defaultAccessToken = "";
     @BeforeAll
-    private static void initTest(){
+    static void initTest(){
         val userAndToken = createUserAndSecretAndObtainAccessToken("cavatica", "cavatica_secret");
         defaultAccessToken = userAndToken.getAccessToken();
     }