Finish migration to java17, boot 3.0, spring 6

spring-cloud-function-context/pom.xml

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -47,6 +47,16 @@
 			<artifactId>jackson-module-kotlin</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency> 
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+		<dependency>
+		    <groupId>javax.activation</groupId>
+		    <artifactId>javax.activation-api</artifactId>
+		    <version>1.2.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>

spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwarePojoFunctionRegistryTests.java

@@ -133,7 +133,7 @@ public class BeanFactoryAwarePojoFunctionRegistryTests {
 	}
 
 	// POJO Function
-	private static class MyFunctionLike {
+	public static class MyFunctionLike {
 		public String uppercase(String value) {
 			return value.toUpperCase();
 		}

spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java

@@ -135,7 +135,7 @@ public class SimpleFunctionRegistryTests {
 		};
 
 		FunctionRegistration<Function<Map<String, Person>, String>> registration = new FunctionRegistration<>(
-				function, "echo").type(FunctionType.of(functionType));
+				function, "echo").type(functionType);
 		SimpleFunctionRegistry catalog = new SimpleFunctionRegistry(this.conversionService, this.messageConverter,
 				new JacksonMapper(new ObjectMapper()));
 		catalog.register(registration);