diff --git a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
index c93960677..0e359e7e3 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
+++ b/spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	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>
-
 	<artifactId>spring-cloud-function-grpc</artifactId>
 	<packaging>jar</packaging>
 	<name>spring-cloud-function-grpc</name>
 	<description>Spring Cloud Function gRPC Support</description>
-
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
 		<version>4.0.2-SNAPSHOT</version>
 	</parent>
-
 	<properties>
 		<grpc.version>1.16.1</grpc.version>
 		<disable.checks>true</disable.checks>
 	</properties>
-
 	<dependencies>
 		<dependency>
-		    <groupId>io.grpc</groupId>
-		    <artifactId>grpc-netty</artifactId>
-		    <version>${grpc.version}</version>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
-		    <groupId>io.grpc</groupId>
-		    <artifactId>grpc-protobuf</artifactId>
-		    <version>${grpc.version}</version>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-netty</artifactId>
+			<version>${grpc.version}</version>
 		</dependency>
 		<dependency>
-		    <groupId>io.grpc</groupId>
-		    <artifactId>grpc-services</artifactId>
-		    <version>${grpc.version}</version>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-protobuf</artifactId>
+			<version>${grpc.version}</version>
 		</dependency>
 		<dependency>
-		    <groupId>io.grpc</groupId>
-		    <artifactId>grpc-stub</artifactId>
-		    <version>${grpc.version}</version>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-services</artifactId>
+			<version>${grpc.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-stub</artifactId>
+			<version>${grpc.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -61,44 +62,41 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	
 	<build>
 		<extensions>
-		    <extension>
-		      <groupId>kr.motd.maven</groupId>
-		      <artifactId>os-maven-plugin</artifactId>
-		      <version>1.6.1</version>
-		    </extension>
+			<extension>
+				<groupId>kr.motd.maven</groupId>
+				<artifactId>os-maven-plugin</artifactId>
+				<version>1.6.1</version>
+			</extension>
 		</extensions>
 		<plugins>
-			
 			<plugin>
-	            <groupId>org.apache.maven.plugins</groupId>
-	            <artifactId>maven-checkstyle-plugin</artifactId>
-		        </plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
 			<plugin>
-		      <groupId>org.xolstice.maven.plugins</groupId>
-		      <artifactId>protobuf-maven-plugin</artifactId>
-		      <version>0.6.1</version>
-		      <configuration>
-		        <protocArtifact>
+				<groupId>org.xolstice.maven.plugins</groupId>
+				<artifactId>protobuf-maven-plugin</artifactId>
+				<version>0.6.1</version>
+				<configuration>
+					<protocArtifact>
 		          com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
 		        </protocArtifact>
-		        <pluginId>grpc-java</pluginId>
-		        <pluginArtifact>
+					<pluginId>grpc-java</pluginId>
+					<pluginArtifact>
 		          io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
 		        </pluginArtifact>
-		      </configuration>
-		      <executions>
-		        <execution>
-		          <goals>
-		            <goal>compile</goal>
-		            <goal>compile-custom</goal>
-		          </goals>
-		        </execution>
-		      </executions>
-		    </plugin>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>compile-custom</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
-
 </project>
diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml
index 6110930f7..932708a25 100644
--- a/spring-cloud-function-context/pom.xml
+++ b/spring-cloud-function-context/pom.xml
@@ -47,16 +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>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>
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionCatalog.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionCatalog.java
index 3f2aa902e..b8a84a8ef 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionCatalog.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionCatalog.java
@@ -21,8 +21,6 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import javax.activation.MimeType;
-
 
 /**
  * @author Dave Syer
@@ -33,7 +31,6 @@ public interface FunctionCatalog {
 	/**
 	 * Will look up the instance of the functional interface by name only.
 	 *
-	 * @param                    <T> instance type
 	 * @param functionDefinition the definition of the functional interface. Must
 	 *                           not be null;
 	 * @return instance of the functional interface registered with this catalog
@@ -87,13 +84,7 @@ public interface FunctionCatalog {
 		return this.lookup(null, functionDefinition, expectedOutputMimeTypes);
 	}
 
-	<T> T lookup(Class<?> type, String functionDefinition, String... expectedOutputMimeTypes); //{
-//		throw new UnsupportedOperationException("This instance of FunctionCatalog does not support this operation");
-//	}
-
-
-
-
+	<T> T lookup(Class<?> type, String functionDefinition, String... expectedOutputMimeTypes);
 
 	Set<String> getNames(Class<?> type);
 
diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerProperties.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerProperties.java
index fe694272a..e5e61c779 100644
--- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerProperties.java
+++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerProperties.java
@@ -16,12 +16,13 @@
 
 package org.springframework.cloud.function.deployer;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.function.context.FunctionProperties;
 import org.springframework.util.Assert;
 
+
 /**
  * Configuration properties for deciding how to locate the functional class to execute.
  *