Merge pull request #1489 from zemiles/gh-1466-remove-deployer-references

Remove obsolete function deployer references

Author: olegz

docs/modules/ROOT/nav.adoc

@@ -3,7 +3,6 @@
 ** xref:spring-cloud-function/programming-model.adoc[]
 ** xref:spring-cloud-function/standalone-web-applications.adoc[]
 ** xref:spring-cloud-function/standalone-streaming-applications.adoc[]
-** xref:spring-cloud-function/deploying-a-packaged.adoc[]
 ** xref:functional.adoc[]
 ** xref:spring-cloud-function/serverless-platform-adapters.adoc[]
 *** xref:adapters/aws-intro.adoc[]
@@ -12,4 +11,4 @@
 ** xref:spring-cloud-function/appendix.adoc[]
 *** https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-samples/function-sample-cloudevent[Cloud Events support]
 *** https://github.com/spring-cloud/spring-cloud-function/tree/main/spring-cloud-function-rsocket[RSocket support]
-*** xref:spring-integration.adoc[Spring Integration]
+*** xref:spring-integration.adoc[Spring Integration]

docs/modules/ROOT/pages/spring-cloud-function.adoc

@@ -5,14 +5,12 @@
 ** xref:spring-cloud-function/programming-model.adoc[]
 ** xref:spring-cloud-function/standalone-web-applications.adoc[]
 ** xref:spring-cloud-function/standalone-streaming-applications.adoc[]
-** xref:spring-cloud-function/deploying-a-packaged.adoc[]
 ** xref:spring-cloud-function/functional-bean-definitions.adoc[]
 ** xref:spring-cloud-function/serverless-platform-adapters.adoc[]
 
 ** xref:spring-cloud-function/getting-started.adoc[]
 ** xref:spring-cloud-function/programming-model.adoc[]
 #** xref:spring-cloud-function/standalone-web-applications.adoc[]
 #** xref:spring-cloud-function/standalone-streaming-applications.adoc[]
-#** xref:spring-cloud-function/deploying-a-packaged.adoc[]
 #** xref:spring-cloud-function/functional-bean-definitions.adoc[]
-#** xref:spring-cloud-function/serverless-platform-adapters.adoc[]
+#** xref:spring-cloud-function/serverless-platform-adapters.adoc[]

docs/modules/ROOT/pages/spring-cloud-function/deploying-a-packaged.adoc

@@ -196,7 +196,6 @@
 				<module>spring-cloud-starter-function-web</module>
 				<module>spring-cloud-starter-function-webflux</module>
 				<!-- <module>spring-cloud-function-samples</module> -->
-				<!-- <module>spring-cloud-function-deployer</module> -->
 				<module>spring-cloud-function-adapters</module>
 				<module>spring-cloud-function-integration</module>
 				<!-- <module>spring-cloud-function-rsocket</module> -->

pom.xml

@@ -41,7 +41,6 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -101,7 +100,6 @@
  */
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(FunctionProperties.class)
-@AutoConfigureAfter(name = {"org.springframework.cloud.function.deployer.FunctionDeployerConfiguration"})
 public class ContextFunctionCatalogAutoConfiguration {
 
 

spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java

@@ -41,11 +41,6 @@
 				<artifactId>spring-cloud-starter-function-webflux</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-function-deployer</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-function-adapter-aws</artifactId>

spring-cloud-function-dependencies/pom.xml

@@ -23,7 +23,7 @@
 	<dependencies>
 		<dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-function-deployer</artifactId>
+            <artifactId>spring-cloud-function-context</artifactId>
         </dependency>
 		 <dependency>
             <groupId>org.springframework.cloud</groupId>