Fix compilation and test problems

Author: artembilan

applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java

@@ -31,9 +31,9 @@
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.Pollers;
 import org.springframework.integration.file.FileHeaders;
-import org.springframework.integration.file.FileWritingMessageHandler;
 import org.springframework.integration.file.dsl.FileWritingMessageHandlerSpec;
 import org.springframework.integration.file.dsl.Files;
+import org.springframework.integration.file.outbound.FileWritingMessageHandler;
 import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.file.splitter.FileSplitter;
 import org.springframework.integration.ftp.dsl.Ftp;

basic/file/src/main/java/org/springframework/integration/samples/filecopy/FileCopyDemoCommon.java

@@ -21,8 +21,8 @@
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.expression.common.LiteralExpression;
-import org.springframework.integration.file.FileReadingMessageSource;
-import org.springframework.integration.file.FileWritingMessageHandler;
+import org.springframework.integration.file.inbound.FileReadingMessageSource;
+import org.springframework.integration.file.outbound.FileWritingMessageHandler;
 
 /**
  * Displays the names of the input and output directories.
@@ -34,7 +34,7 @@
 public class FileCopyDemoCommon {
 
 	public static void displayDirectories(ApplicationContext context) {
-		File inDir = (File) new DirectFieldAccessor(context.getBean(FileReadingMessageSource.class)).getPropertyValue("directory");
+		File inDir = (File) new DirectFieldAccessor(context.getBean(FileReadingMessageSource.class)).getPropertyValue("directoryExpression.value");
 		LiteralExpression expression = (LiteralExpression) new DirectFieldAccessor(context.getBean(FileWritingMessageHandler.class)).getPropertyValue("destinationDirectoryExpression");
 		File outDir = new File(expression.getValue());
 		System.out.println("Input directory is: " + inDir.getAbsolutePath());

basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java

@@ -22,7 +22,6 @@
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ImportResource;
@@ -40,7 +39,7 @@
  * @version 1.0
  *
  */
-@SpringBootApplication(exclude = JpaRepositoriesAutoConfiguration.class)
+@SpringBootApplication
 @ImportResource("spring-integration-context.xml")
 public class Main {
 

basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java

@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.DirectChannel;

basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java

@@ -30,7 +30,7 @@
 import org.xml.sax.InputSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.ws.SimpleWebServiceInboundGateway;
+import org.springframework.integration.ws.inbound.SimpleWebServiceInboundGateway;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.ws.context.DefaultMessageContext;

build.gradle

@@ -240,7 +240,7 @@ subprojects { subproject ->
 			jrubyVersion = '9.4.13.0'
 			jpaApiVersion = '3.2.0'
 			jstlVersion = '1.2'
-			junitJupiterVersion = '5.12.2'
+			junitJupiterVersion = '6.0.0'
 			log4jVersion = '2.24.3'
 			mailVersion = '2.0.3'
 			mockitoVersion = '5.18.0'