Upgrade to Spring Boot 3.5.0

mhalbritter · mhalbritter · commit 39e3d6ea3e24 · 2025-05-27T08:36:33.000+02:00
Closes gh-1812
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.5</version>
+		<version>3.5.0</version>
 	</parent>
 	<groupId>io.spring.start</groupId>
 	<artifactId>start-parent</artifactId>
diff --git a/start-site/src/test/java/io/spring/start/site/ProjectGenerationIntegrationTests.java b/start-site/src/test/java/io/spring/start/site/ProjectGenerationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -150,24 +150,32 @@ private Path getHome(BuildSystem buildSystem) {
 
 	private ProcessBuilder createProcessBuilder(Path directory, BuildSystem buildSystem, Path home) {
 		if (buildSystem.id().equals(MavenBuildSystem.ID)) {
-			String command = (isWindows()) ? "mvnw.cmd" : "mvnw";
-			ProcessBuilder processBuilder = new ProcessBuilder(directory.resolve(command).toAbsolutePath().toString(),
-					"-Dmaven.repo.local=" + home.resolve("repository").toAbsolutePath(), "package");
-			processBuilder.environment().put("MAVEN_USER_HOME", home.toAbsolutePath().toString());
-			processBuilder.directory(directory.toFile());
-			return processBuilder;
+			return createMavenProcessBuilder(directory, home);
 		}
 		if (buildSystem.id().equals(GradleBuildSystem.ID)) {
-			String command = (isWindows()) ? "gradlew.bat" : "gradlew";
-			ProcessBuilder processBuilder = new ProcessBuilder(directory.resolve(command).toAbsolutePath().toString(),
-					"--no-daemon", "build");
-			processBuilder.environment().put("GRADLE_USER_HOME", home.toAbsolutePath().toString());
-			processBuilder.directory(directory.toFile());
-			return processBuilder;
+			return createGradleProcessBuilder(directory, home);
 		}
 		throw new IllegalStateException("Unknown build system '%s'".formatted(buildSystem.id()));
 	}
 
+	private ProcessBuilder createGradleProcessBuilder(Path directory, Path home) {
+		String command = (isWindows()) ? "gradlew.bat" : "gradlew";
+		ProcessBuilder processBuilder = new ProcessBuilder(directory.resolve(command).toAbsolutePath().toString(),
+				"--no-daemon", "build");
+		processBuilder.environment().put("GRADLE_USER_HOME", home.toAbsolutePath().toString());
+		processBuilder.directory(directory.toFile());
+		return processBuilder;
+	}
+
+	private ProcessBuilder createMavenProcessBuilder(Path directory, Path home) {
+		String command = (isWindows()) ? "mvnw.cmd" : "mvnw";
+		ProcessBuilder processBuilder = new ProcessBuilder(directory.resolve(command).toAbsolutePath().toString(),
+				"-Dmaven.repo.local=" + home.resolve("repository").toAbsolutePath(), "package");
+		processBuilder.environment().put("MAVEN_USER_HOME", home.toAbsolutePath().toString());
+		processBuilder.directory(directory.toFile());
+		return processBuilder;
+	}
+
 	private boolean isWindows() {
 		return SystemUtils.IS_OS_WINDOWS;
 	}
diff --git a/start-site/src/test/java/io/spring/start/site/SupportedBootVersion.java b/start-site/src/test/java/io/spring/start/site/SupportedBootVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,11 @@ public enum SupportedBootVersion {
 	/**
 	 * 3.4.0.
 	 */
-	V3_4("3.4.0");
+	V3_4("3.4.0"),
+	/**
+	 * 3.5.0.
+	 */
+	V3_5("3.5.0");
 
 	private final String version;
 
@@ -52,7 +56,7 @@ public String toString() {
 	 * @return the latest supported Spring Boot version
 	 */
 	public static SupportedBootVersion latest() {
-		return V3_4;
+		return V3_5;
 	}
 
 }
diff --git a/start-site/src/test/java/io/spring/start/site/extension/build/gradle/GradleBuildSystemHelpDocumentCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/build/gradle/GradleBuildSystemHelpDocumentCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@ class GradleBuildSystemHelpDocumentCustomizerTests extends AbstractExtensionTest
 	void linksAddedToHelpDocumentForGradleBuild() {
 		assertHelpDocument("gradle-build").contains("* [Official Gradle documentation](https://docs.gradle.org)",
 				"* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle)",
-				"* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.0/gradle-plugin)",
-				"* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.0/gradle-plugin/packaging-oci-image.html)");
+				"* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.5.0/gradle-plugin)",
+				"* [Create an OCI image](https://docs.spring.io/spring-boot/3.5.0/gradle-plugin/packaging-oci-image.html)");
 	}
 
 	@Test
diff --git a/start-site/src/test/java/io/spring/start/site/extension/build/maven/MavenBuildSystemHelpDocumentCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/build/maven/MavenBuildSystemHelpDocumentCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@ class MavenBuildSystemHelpDocumentCustomizerTests extends AbstractExtensionTests
 	void linksAddedToHelpDocumentForMavenBuild() {
 		assertHelpDocument("maven-build").contains(
 				"* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)",
-				"* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.0/maven-plugin)",
-				"* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.0/maven-plugin/build-image.html)");
+				"* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/3.5.0/maven-plugin)",
+				"* [Create an OCI image](https://docs.spring.io/spring-boot/3.5.0/maven-plugin/build-image.html)");
 	}
 
 	@Test
diff --git a/start-site/src/test/java/io/spring/start/site/extension/code/kotlin/KotlinCoroutinesCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/code/kotlin/KotlinCoroutinesCustomizerTests.java
@@ -40,7 +40,7 @@ void kotlinCoroutinesIsAdded() {
 			.hasDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-reactor")
 			.hasDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-test", null, "test");
 		assertThat(helpDocument(request)).contains(
-				"* [Coroutines section of the Spring Framework Documentation](https://docs.spring.io/spring-framework/reference/6.2.0/languages/kotlin/coroutines.html)");
+				"* [Coroutines section of the Spring Framework Documentation](https://docs.spring.io/spring-framework/reference/6.2.7/languages/kotlin/coroutines.html)");
 	}
 
 	@Test
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/dgs/DgsBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/dgs/DgsBuildCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
 class DgsBuildCustomizerTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	private Dependency dgsTest;
 
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/graalvm/GraalVmHelpDocumentCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/graalvm/GraalVmHelpDocumentCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ void mavenBuildAddLinkToMavenAotPlugin() {
 		HelpDocument document = customize(description, new MavenBuild());
 		assertThat(document.gettingStarted().additionalLinks().getItems()).singleElement().satisfies((link) -> {
 			assertThat(link.getDescription()).isEqualTo("Configure AOT settings in Build Plugin");
-			assertThat(link.getHref()).isEqualTo("https://docs.spring.io/spring-boot/3.4.0/how-to/aot.html");
+			assertThat(link.getHref()).isEqualTo("https://docs.spring.io/spring-boot/3.5.0/how-to/aot.html");
 		});
 	}
 
@@ -63,7 +63,7 @@ void gradleBuildAddLinkToGradleAotPlugin() {
 		HelpDocument document = customize(description, new GradleBuild());
 		assertThat(document.gettingStarted().additionalLinks().getItems()).singleElement().satisfies((link) -> {
 			assertThat(link.getDescription()).isEqualTo("Configure AOT settings in Build Plugin");
-			assertThat(link.getHref()).isEqualTo("https://docs.spring.io/spring-boot/3.4.0/how-to/aot.html");
+			assertThat(link.getHref()).isEqualTo("https://docs.spring.io/spring-boot/3.5.0/how-to/aot.html");
 		});
 	}
 
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/htmx/HtmxBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/htmx/HtmxBuildCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
  */
 class HtmxBuildCustomizerTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	private final Dependency htmx = Dependency.withId("htmx", "io.github.wimdeblauwe", "htmx-spring-boot");
 
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/mybatis/MyBatisTestBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/mybatis/MyBatisTestBuildCustomizerTests.java
@@ -31,7 +31,7 @@
  */
 class MyBatisTestBuildCustomizerTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	@Test
 	void mybatisIsAddedWithSecurity() {
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/observability/ObservabilityHelpDocumentCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/observability/ObservabilityHelpDocumentCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ class ObservabilityHelpDocumentCustomizerTests extends AbstractExtensionTests {
 	void linksAddedToHelpDocumentForGradleBuild() {
 		assertHelpDocument("distributed-tracing").contains(
 				"* [Distributed Tracing Reference Guide](https://docs.micrometer.io/tracing/reference/index.html)",
-				"* [Getting Started with Distributed Tracing](https://docs.spring.io/spring-boot/3.4.0/reference/actuator/tracing.html)");
+				"* [Getting Started with Distributed Tracing](https://docs.spring.io/spring-boot/3.5.0/reference/actuator/tracing.html)");
 	}
 
 	@Test
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/sbom/SbomProjectGenerationConfigurationTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/sbom/SbomProjectGenerationConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ void shouldAddMavenPlugin() {
 	@Test
 	void shouldAddGradlePlugin() {
 		ProjectRequest request = createProjectRequest("sbom-cyclone-dx");
-		assertThat(gradleBuild(request)).hasPlugin("org.cyclonedx.bom", "1.10.0");
+		assertThat(gradleBuild(request)).hasPlugin("org.cyclonedx.bom", "2.3.0");
 	}
 
 }
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/solace/SolaceBinderBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/solace/SolaceBinderBuildCustomizerTests.java
@@ -32,7 +32,7 @@
  */
 class SolaceBinderBuildCustomizerTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	@Test
 	void binderNotAddedWhenSolaceNotSelected() {
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureDockerComposeProjectGenerationConfigurationTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureDockerComposeProjectGenerationConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
  */
 class SpringAzureDockerComposeProjectGenerationConfigurationTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	@Test
 	void doesNothingWithoutDockerCompose() {
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureMavenBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureMavenBuildCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package io.spring.start.site.extension.dependency.springazure;
 
 import io.spring.initializr.web.project.ProjectRequest;
+import io.spring.start.site.SupportedBootVersion;
 import io.spring.start.site.extension.AbstractExtensionTests;
 import org.junit.jupiter.api.Test;
 
@@ -30,15 +31,17 @@
  */
 class SpringAzureMavenBuildCustomizerTests extends AbstractExtensionTests {
 
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
+
 	@Test
 	void shouldDoNothingIfAzureSupportIsntSelected() {
-		ProjectRequest request = createProjectRequest("web");
+		ProjectRequest request = createProjectRequest(BOOT_VERSION, "web");
 		assertThat(mavenPom(request)).doesNotContain("azure-container-apps-maven-plugin");
 	}
 
 	@Test
 	void azureContainerAppsMavenPluginAddedWhenAzureSupportPresent() {
-		ProjectRequest request = createProjectRequest("azure-support");
+		ProjectRequest request = createProjectRequest(BOOT_VERSION, "azure-support");
 		assertThat(mavenPom(request)).hasText("/project/build/plugins/plugin[1]/groupId", "com.microsoft.azure")
 			.hasText("/project/build/plugins/plugin[1]/artifactId", "azure-container-apps-maven-plugin");
 	}
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureProjectGenerationConfigurationTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureProjectGenerationConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
  */
 class SpringAzureProjectGenerationConfigurationTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	@ParameterizedTest
 	@MethodSource("azureDependencies")
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureTestcontainersProjectGenerationConfigurationTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springazure/SpringAzureTestcontainersProjectGenerationConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
  */
 class SpringAzureTestcontainersProjectGenerationConfigurationTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	@Test
 	void springAzureTestcontainersDependencyIsAdded() {
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionHelpDocumentCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionHelpDocumentCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
  */
 class SpringCloudFunctionHelpDocumentCustomizerTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	private static final String AZURE_SECTION_TITLE = "## Running Spring Cloud Function applications on Microsoft Azure";
 
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springshell/SpringShellTestBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springshell/SpringShellTestBuildCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
  */
 class SpringShellTestBuildCustomizerTests extends AbstractExtensionTests {
 
-	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.latest();
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
 
 	@Test
 	void shellTestIsAddedWithSpringShell() {
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/testcontainers/TestcontainersProjectGenerationConfigurationTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/testcontainers/TestcontainersProjectGenerationConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,8 @@
  */
 class TestcontainersProjectGenerationConfigurationTests extends AbstractExtensionTests {
 
+	private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_4;
+
 	@Test
 	void buildWithOnlyTestContainers() {
 		assertThat(generateProject("testcontainers")).mavenBuild().hasDependency(getDependency("testcontainers"));
@@ -424,13 +426,13 @@ void shouldAddHelpSection() {
 	}
 
 	private ProjectStructure generateProject(String... dependencies) {
-		ProjectRequest request = createProjectRequest(SupportedBootVersion.latest(), dependencies);
+		ProjectRequest request = createProjectRequest(BOOT_VERSION, dependencies);
 		request.setType("maven-build");
 		return generateProject(request);
 	}
 
 	private TextAssert assertHelpDocument(String... dependencyIds) {
-		ProjectRequest request = createProjectRequest(SupportedBootVersion.latest(), dependencyIds);
+		ProjectRequest request = createProjectRequest(BOOT_VERSION, dependencyIds);
 		return assertThat(helpDocument(request));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void kotlinCoroutinesIsAdded() {`
`40`	`40`	`.hasDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-reactor")`
`41`	`41`	`.hasDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-test", null, "test");`
`42`	`42`	`assertThat(helpDocument(request)).contains(`
`43`		`- "* [Coroutines section of the Spring Framework Documentation](https://docs.spring.io/spring-framework/reference/6.2.0/languages/kotlin/coroutines.html)");`
	`43`	`+ "* [Coroutines section of the Spring Framework Documentation](https://docs.spring.io/spring-framework/reference/6.2.7/languages/kotlin/coroutines.html)");`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Test`