Merge branch 'main' into renovate/major-vite

bcgov · Nov 28, 2023 · d5c9643 · d5c9643
2 parents 052e65f + c6a3e42
commit d5c9643
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.0</version>
         <relativePath />
     </parent>
 
@@ -40,7 +40,7 @@
         <jacoco.output.data>${project.build.directory}/coverage-reports</jacoco.output.data>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
-        <testcontainers.version>1.19.1</testcontainers.version>
+        <testcontainers.version>1.19.3</testcontainers.version>
         <junit-jupiter-api.version>5.9.1</junit-jupiter-api.version>
         <junit-platform.version>1.9.1</junit-platform.version>
         <oci.revision>${project.version}</oci.revision>
@@ -92,6 +92,11 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.10.0</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -140,7 +145,7 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
-            <version>3.0.3</version>
+            <version>3.3.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
@@ -29,7 +29,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.WordUtils;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
@@ -292,7 +291,7 @@ private Mono<ClientDetailsDto> buildAddress(
                     addressDto.addressCity(),
                     addressDto.postalCode().trim().replaceAll("\\s+", ""),
                     index.getAndIncrement(),
-                    WordUtils.capitalize(addressDto.addressType()).concat(" address")
+                    (addressDto.addressType() != null ? addressDto.addressType() : "").concat(" address").toUpperCase()
                 )
             )
             .flatMap(address -> loadCountry(address.country().text()).map(address::withCountry))

diff --git a/backend/src/test/java/ca/bc/gov/app/TestConstants.java b/backend/src/test/java/ca/bc/gov/app/TestConstants.java
@@ -227,7 +227,7 @@ public class TestConstants {
         "goodStanding": true,
         "addresses": [
           {
-            "locationName": "Mailing address",
+            "locationName": "MAILING ADDRESS",
             "streetAddress": "501 Belleville Street",
             "country": {"value":"CA","text":"Canada"},
             "province": {"value":"BC","text":"British Columbia"},
@@ -245,7 +245,7 @@ public class TestConstants {
             "email": "",
             "index": 1,
             "locationNames": [{
-            "text": "Mailing address",
+            "text": "MAILING ADDRESS",
             "value": "0"
             }]
           }

diff --git a/legacy/pom.xml b/legacy/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.5</version>
+    <version>3.2.0</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -44,7 +44,7 @@
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
 
-    <testcontainers.version>1.19.1</testcontainers.version>
+    <testcontainers.version>1.19.3</testcontainers.version>
 
     <junit-jupiter-api.version>5.9.1</junit-jupiter-api.version>
     <junit-platform.version>1.9.1</junit-platform.version>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.dhatim</groupId>
       <artifactId>fastexcel</artifactId>
-      <version>0.15.7</version>
+      <version>0.16.4</version>
     </dependency>
 
     <dependency>
@@ -142,6 +142,7 @@
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
+      <version>9.16.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -152,7 +153,7 @@
     <dependency>
       <groupId>org.wiremock</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <version>3.0.3</version>
+      <version>3.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>3.2.0</version>
 		<relativePath />
 		<!-- lookup parent from repository -->
 	</parent>
@@ -38,7 +38,7 @@
 		<jacoco.output.data>${project.build.directory}/coverage-reports</jacoco.output.data>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
-		<testcontainers.version>1.19.1</testcontainers.version>
+		<testcontainers.version>1.19.3</testcontainers.version>
 		<junit-jupiter-api.version>5.9.1</junit-jupiter-api.version>
 		<junit-platform.version>1.9.1</junit-platform.version>
 		<assertj.version>3.24.2</assertj.version>
@@ -130,7 +130,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>oracle-xe</artifactId>
-			<version>1.19.1</version>
+			<version>1.19.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -141,6 +141,7 @@
 		<dependency>
 			<groupId>org.flywaydb</groupId>
 			<artifactId>flyway-core</artifactId>
+			<version>9.16.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -151,7 +152,7 @@
 		<dependency>
 			<groupId>org.wiremock</groupId>
 			<artifactId>wiremock-standalone</artifactId>
-			<version>3.0.3</version>
+			<version>3.3.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>