From 041abbc6fb3c13ada01e2f8274645c20688d39ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 13:50:33 +0200
Subject: [PATCH] Bump spring-boot.version from 3.1.3 to 3.1.4 (#370)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adrien Lecharpentier <alecharpentier@cloudbees.com>
---
 .../scoring/probes/SCMLinkValidationProbeTest.java        | 4 ++--
 .../jenkinsci/test-repo/{ => test-direct-dir}/pom.xml     | 0
 .../test-incorrect-nested-dir-1/plugin-is-here/pom.xml    | 6 ++++++
 .../test-repo/test-incorrect-nested-dir-1/pom.xml         | 8 ++++++--
 .../jenkinsci/test-repo/test-nested-dir-1/pom.xml         | 5 ++++-
 pom.xml                                                   | 2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)
 rename core/src/test/resources/jenkinsci/test-repo/{ => test-direct-dir}/pom.xml (100%)
 create mode 100644 core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/plugin-is-here/pom.xml

diff --git a/core/src/test/java/io/jenkins/pluginhealth/scoring/probes/SCMLinkValidationProbeTest.java b/core/src/test/java/io/jenkins/pluginhealth/scoring/probes/SCMLinkValidationProbeTest.java
index c1638a68d..e1e1b8be7 100644
--- a/core/src/test/java/io/jenkins/pluginhealth/scoring/probes/SCMLinkValidationProbeTest.java
+++ b/core/src/test/java/io/jenkins/pluginhealth/scoring/probes/SCMLinkValidationProbeTest.java
@@ -229,13 +229,13 @@ void shouldFindRootScmFolderPath() throws IOException {
         ));
         when(plugin.getName()).thenReturn("test-repo");
 
-        when(contextSpy.getScmRepository()).thenReturn(Path.of("src/test/resources/jenkinsci/test-repo"));
+        when(contextSpy.getScmRepository()).thenReturn(Path.of("src/test/resources/jenkinsci/test-repo/test-direct-dir"));
         when(contextSpy.getGitHub()).thenReturn(github);
 
         final SCMLinkValidationProbe probe = getSpy();
         final ProbeResult result = probe.apply(plugin, contextSpy);
 
-        assertThat(contextSpy.getScmFolderPath()).isEqualTo(Optional.of("test-repo"));
+        assertThat(contextSpy.getScmFolderPath()).isEqualTo(Optional.of("test-direct-dir"));
         assertThat(result.status()).isEqualTo(ResultStatus.SUCCESS);
         assertThat(result.message()).isEqualTo("The plugin SCM link is valid.");
         verify(probe).doApply(plugin, contextSpy);
diff --git a/core/src/test/resources/jenkinsci/test-repo/pom.xml b/core/src/test/resources/jenkinsci/test-repo/test-direct-dir/pom.xml
similarity index 100%
rename from core/src/test/resources/jenkinsci/test-repo/pom.xml
rename to core/src/test/resources/jenkinsci/test-repo/test-direct-dir/pom.xml
diff --git a/core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/plugin-is-here/pom.xml b/core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/plugin-is-here/pom.xml
new file mode 100644
index 000000000..767ce99de
--- /dev/null
+++ b/core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/plugin-is-here/pom.xml
@@ -0,0 +1,6 @@
+<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>
+	<groupId>test-group</groupId>
+	<artifactId>test-incorrect-repo</artifactId>
+	<packaging>hpi</packaging>
+</project>
diff --git a/core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/pom.xml b/core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/pom.xml
index 767ce99de..cf23d14ca 100644
--- a/core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/pom.xml
+++ b/core/src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/pom.xml
@@ -1,6 +1,10 @@
 <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>
 	<groupId>test-group</groupId>
-	<artifactId>test-incorrect-repo</artifactId>
-	<packaging>hpi</packaging>
+	<artifactId>test-incorrect-repo-parent</artifactId>
+	<packaging>pom</packaging>
+	<modules>
+		<module>test-incorrect-nested-dir-2</module>
+		<module>plugin-is-here</module>
+	</modules>
 </project>
diff --git a/core/src/test/resources/jenkinsci/test-repo/test-nested-dir-1/pom.xml b/core/src/test/resources/jenkinsci/test-repo/test-nested-dir-1/pom.xml
index 8bb49ae53..a8848f563 100644
--- a/core/src/test/resources/jenkinsci/test-repo/test-nested-dir-1/pom.xml
+++ b/core/src/test/resources/jenkinsci/test-repo/test-nested-dir-1/pom.xml
@@ -1,6 +1,9 @@
 <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>
 	<groupId>test-group</groupId>
-	<artifactId>test-repo</artifactId>
+	<artifactId>test-repo-parent</artifactId>
 	<packaging>pom</packaging>
+	<modules>
+		<module>test-nested-dir-2</module>
+	</modules>
 </project>
diff --git a/pom.xml b/pom.xml
index ffbe429d7..1ab66cf05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
 
 		<jjwt.version>0.11.5</jjwt.version>
 		<testcontainers.version>1.19.0</testcontainers.version>
-		<spring-boot.version>3.1.3</spring-boot.version>
+		<spring-boot.version>3.1.4</spring-boot.version>
 	</properties>
 
 	<dependencyManagement>