Bump spring-boot.version from 3.1.3 to 3.1.4 (#370)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adrien Lecharpentier <[email protected]>
jenkins-infra · Sep 26, 2023 · 041abbc · 041abbc
1 parent 606615a
commit 041abbc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
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
@@ -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/...est/resources/jenkinsci/test-repo/pom.xml → ...nkinsci/test-repo/test-direct-dir/pom.xml b/...est/resources/jenkinsci/test-repo/pom.xml → ...nkinsci/test-repo/test-direct-dir/pom.xml
diff --git a/...src/test/resources/jenkinsci/test-repo/test-incorrect-nested-dir-1/plugin-is-here/pom.xml b/...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
@@ -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
@@ -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
@@ -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>