From a8723c4d212c2a898dd1b402ba1936c4c8cf64cf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 14 May 2024 17:39:15 +0000
Subject: [PATCH] chore(deps): update maven all non-major dependencies (#21)

* chore(deps): update maven all non-major dependencies

* chore: changing db version to be compatible with environment

* fix: reverted flyway due to oracle

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
---
 core/pom.xml                                  |  16 +-
 spring/pom.xml                                | 299 +++++++++---------
 .../AbstractTestContainerIntegrationTest.java |   4 +-
 3 files changed, 163 insertions(+), 156 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 83e1db7..019be4f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.5</version>
                 <configuration>
                     <argLine>@{argLine}</argLine>
                     <skipTests>${skip.unit.tests}</skipTests>
@@ -111,7 +111,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.12</version>
                 <configuration>
                     <skip>${jacoco.skip}</skip>
                     <excludes>
@@ -167,7 +167,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.3</version>
                 <configuration>
                     <source>${java.version}</source>
                     <doctitle>Javadoc Documentation for ${project.name} ${project.version}
@@ -180,7 +180,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -222,7 +222,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <configuration>
                     <skip>${checkstyle.skip}</skip>
                     <configLocation>google_checks.xml</configLocation>
@@ -244,7 +244,7 @@
             <plugin>
                 <groupId>org.cyclonedx</groupId>
                 <artifactId>cyclonedx-maven-plugin</artifactId>
-                <version>2.7.9</version>
+                <version>2.8.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
diff --git a/spring/pom.xml b/spring/pom.xml
index 64e41e3..bd44d5a 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -1,95 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.5</version>
         <relativePath/>
     </parent>
 
-    <groupId>ca.bc.gov.nrs-commons</groupId>
-    <artifactId>forest-client-spring</artifactId>
-    <version>0.0.1</version>
-    <name>forest-client-spring</name>
-    <description>Forest Client Spring Commons</description>
+  <groupId>ca.bc.gov.nrs-commons</groupId>
+  <artifactId>forest-client-spring</artifactId>
+  <version>0.0.1</version>
+  <name>forest-client-spring</name>
+  <description>Forest Client Spring Commons</description>
 
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
-        <jdk.version>17</jdk.version>
-        <maven.compiler.version>3.10.1</maven.compiler.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <java.version>17</java.version>
+    <jdk.version>17</jdk.version>
+    <maven.compiler.version>3.10.1</maven.compiler.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <skip.integration.tests>true</skip.integration.tests>
-        <skip.unit.tests>false</skip.unit.tests>
-        <jacoco.skip>true</jacoco.skip>
-        <checkstyle.skip>true</checkstyle.skip>
+    <skip.integration.tests>true</skip.integration.tests>
+    <skip.unit.tests>false</skip.unit.tests>
+    <jacoco.skip>true</jacoco.skip>
+    <checkstyle.skip>true</checkstyle.skip>
 
-        <jacoco.output.data>${project.build.directory}/coverage-reports</jacoco.output.data>
+    <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>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
 
-        <sonar.organization>bcgov-sonarcloud</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-        <sonar.projectKey>bcgov_nr-forest-client-commons</sonar.projectKey>
-        <sonar.coverage.jacoco.xmlReportPaths>
-            target/coverage-reports/merged-test-report/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
-        <sonar.coverage.exclusions>
-            **/configuration/**,
-            **/exception/**,
-            **/dto/**,
-            **/entity/**,
-            **/models/**,
-            **/repository/**,
-            **/*$*Builder*,
-            **/ApplicationConstant*
-        </sonar.coverage.exclusions>
-        <sonar.java.checkstyle.reportPaths>target/checkstyle-result.xml</sonar.java.checkstyle.reportPaths>
+    <sonar.organization>bcgov-sonarcloud</sonar.organization>
+    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+    <sonar.projectKey>bcgov_nr-forest-client-commons</sonar.projectKey>
+    <sonar.coverage.jacoco.xmlReportPaths>
+      target/coverage-reports/merged-test-report/jacoco.xml
+    </sonar.coverage.jacoco.xmlReportPaths>
+    <sonar.coverage.exclusions>
+      **/configuration/**,
+      **/exception/**,
+      **/dto/**,
+      **/entity/**,
+      **/models/**,
+      **/repository/**,
+      **/*$*Builder*,
+      **/ApplicationConstant*
+    </sonar.coverage.exclusions>
+    <sonar.java.checkstyle.reportPaths>target/checkstyle-result.xml
+    </sonar.java.checkstyle.reportPaths>
 
-        <testcontainers.version>1.18.1</testcontainers.version>
+        <testcontainers.version>1.19.8</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>
-    </properties>
+    <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>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>ca.bc.gov.nrs-commons</groupId>
-            <artifactId>forest-client-core</artifactId>
-            <version>0.0.2</version>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>ca.bc.gov.nrs-commons</groupId>
+      <artifactId>forest-client-core</artifactId>
+      <version>0.0.2</version>
+    </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-r2dbc</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-data-r2dbc</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <optional>true</optional>
+    </dependency>
 
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -136,7 +138,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>oracle-xe</artifactId>
-            <version>1.18.1</version>
+            <version>1.19.8</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -156,29 +158,34 @@
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-bom</artifactId>
-                <version>${testcontainers.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-			<dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>2.0</version>
-			</dependency>
-        </dependencies>
-    </dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers-bom</artifactId>
+        <version>${testcontainers.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flywaydb</groupId>
+        <artifactId>flyway-core</artifactId>
+        <version>9.16.3</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.5</version>
                 <executions>
                     <execution>
                         <id>integration-tests</id>
@@ -201,7 +208,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.5</version>
                 <configuration>
                     <argLine>@{argLine}</argLine>
                     <skipTests>${skip.unit.tests}</skipTests>
@@ -219,7 +226,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.12</version>
                 <configuration>
                     <skip>${jacoco.skip}</skip>
                     <excludes>
@@ -329,7 +336,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.3</version>
                 <configuration>
                     <source>${java.version}</source>
                     <doctitle>Javadoc Documentation for ${project.name} ${project.version}
@@ -342,7 +349,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -386,7 +393,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <configuration>
                     <skip>${checkstyle.skip}</skip>
                     <configLocation>google_checks.xml</configLocation>
@@ -408,7 +415,7 @@
             <plugin>
                 <groupId>org.cyclonedx</groupId>
                 <artifactId>cyclonedx-maven-plugin</artifactId>
-                <version>2.7.9</version>
+                <version>2.8.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -425,60 +432,60 @@
                 </configuration>
             </plugin>
 
-        </plugins>
-        <finalName>nr-forest-client-backend</finalName>
-    </build>
+    </plugins>
+    <finalName>nr-forest-client-backend</finalName>
+  </build>
 
-    <profiles>
-        <profile>
-            <id>dev</id>
-        </profile>
+  <profiles>
+    <profile>
+      <id>dev</id>
+    </profile>
 
-        <profile>
-            <id>all-tests</id>
-            <properties>
-                <build.profile.id>all-tests</build.profile.id>
-                <skip.integration.tests>false</skip.integration.tests>
-                <skip.unit.tests>false</skip.unit.tests>
-                <jacoco.skip>false</jacoco.skip>
-            </properties>
-        </profile>
+    <profile>
+      <id>all-tests</id>
+      <properties>
+        <build.profile.id>all-tests</build.profile.id>
+        <skip.integration.tests>false</skip.integration.tests>
+        <skip.unit.tests>false</skip.unit.tests>
+        <jacoco.skip>false</jacoco.skip>
+      </properties>
+    </profile>
 
-        <profile>
-            <id>integration-test</id>
-            <properties>
-                <build.profile.id>integration-test</build.profile.id>
-                <skip.integration.tests>false</skip.integration.tests>
-                <skip.unit.tests>true</skip.unit.tests>
-            </properties>
-        </profile>
-    </profiles>
+    <profile>
+      <id>integration-test</id>
+      <properties>
+        <build.profile.id>integration-test</build.profile.id>
+        <skip.integration.tests>false</skip.integration.tests>
+        <skip.unit.tests>true</skip.unit.tests>
+      </properties>
+    </profile>
+  </profiles>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>github</id>
-            <name>Github Packages</name>
-            <url>https://maven.pkg.github.com/bcgov/nr-forest-client-commons</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
+  <repositories>
+    <repository>
+      <id>spring-milestones</id>
+      <name>Spring Milestones</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>github</id>
+      <name>Github Packages</name>
+      <url>https://maven.pkg.github.com/bcgov/nr-forest-client-commons</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 
-     <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>Github Packages</name>
-            <url>https://maven.pkg.github.com/bcgov/nr-forest-client-commons</url>
-        </repository>
-    </distributionManagement>
+  <distributionManagement>
+    <repository>
+      <id>github</id>
+      <name>Github Packages</name>
+      <url>https://maven.pkg.github.com/bcgov/nr-forest-client-commons</url>
+    </repository>
+  </distributionManagement>
 
 </project>
diff --git a/spring/src/test/java/ca/bc/gov/app/extensions/AbstractTestContainerIntegrationTest.java b/spring/src/test/java/ca/bc/gov/app/extensions/AbstractTestContainerIntegrationTest.java
index 1f8ce8d..47b122c 100644
--- a/spring/src/test/java/ca/bc/gov/app/extensions/AbstractTestContainerIntegrationTest.java
+++ b/spring/src/test/java/ca/bc/gov/app/extensions/AbstractTestContainerIntegrationTest.java
@@ -19,7 +19,7 @@ public abstract class AbstractTestContainerIntegrationTest {
   static final OracleContainer database;
 
   static {
-    database = new OracleContainer("gvenzl/oracle-xe:21.3.0-slim-faststart")
+    database = new OracleContainer("gvenzl/oracle-xe:18.4.0-slim-faststart")
         .withDatabaseName("legacyfsa")
         .withUsername("THE")
         .withPassword(UUID.randomUUID().toString().substring(24));
@@ -43,7 +43,7 @@ static void registerDynamicProperties(DynamicPropertyRegistry registry) {
     registry
         .add(
             "ca.bc.gov.nrs.oracle.host",
-            () -> "127.0.0.1"//database::getHost
+            database::getHost
         );
 
     registry