SDCSRM-185 Fix Dependabot test failures in rh-service (#54)

ONSdigital · Apr 2, 2024 · e7ebeb8 · e7ebeb8
1 parent 5cb62be
commit e7ebeb8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.3</version>
     </parent>
 
     <dependencyManagement>
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>com.google.cloud</groupId>
                 <artifactId>spring-cloud-gcp-dependencies</artifactId>
-                <version>5.0.0</version>
+                <version>5.1.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>9.23</version>
+            <version>9.37.3</version>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
@@ -169,7 +169,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.16.0</version>
+                <version>3.21.2</version>
                 <configuration>
                     <excludeFromFailureFile>exclude-pmd.properties</excludeFromFailureFile>
                     <failurePriority>3</failurePriority>
@@ -250,7 +250,7 @@
             <plugin>
                 <groupId>com.coveo</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.13</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/src/main/java/uk/gov/ons/ssdc/rhservice/crypto/EncodeJws.java b/src/main/java/uk/gov/ons/ssdc/rhservice/crypto/EncodeJws.java
@@ -8,7 +8,6 @@
 import com.nimbusds.jose.Payload;
 import com.nimbusds.jose.crypto.RSASSASigner;
 import com.nimbusds.jose.jwk.RSAKey;
-import com.nimbusds.jose.shaded.json.JSONObject;
 import java.util.Map;
 import org.springframework.stereotype.Service;
 import uk.gov.ons.ssdc.rhservice.model.dto.Key;
@@ -53,7 +52,6 @@ private JWSHeader buildHeader(Key key) {
   }
 
   private Payload buildClaims(Map<String, Object> claims) {
-    JSONObject jsonObject = new JSONObject(claims);
-    return new Payload(jsonObject);
+    return new Payload(claims);
   }
 }
diff --git a/src/main/java/uk/gov/ons/ssdc/rhservice/service/LaunchDataFieldSetter.java b/src/main/java/uk/gov/ons/ssdc/rhservice/service/LaunchDataFieldSetter.java
@@ -53,10 +53,12 @@ public void stampLaunchDataFieldsOnUAC(UacUpdateDTO uacUpdateDTO) {
 
   private List<EqLaunchSettings> getEqLaunchSettingsFromCollectionExercise(
       String collectionExerciseId, String collectionInstrumentUrl) {
-    return collectionExerciseRepository.readCollectionExerciseUpdate(collectionExerciseId)
+    return collectionExerciseRepository
+        .readCollectionExerciseUpdate(collectionExerciseId)
         .orElseThrow(
             () -> new RuntimeException("Collection Exercise not found: " + collectionExerciseId))
-        .getCollectionInstrumentRules().stream()
+        .getCollectionInstrumentRules()
+        .stream()
         .filter(
             collexInstrumentRule ->
                 collexInstrumentRule.getCollectionInstrumentUrl().equals(collectionInstrumentUrl))