Move AWS sample alongside other samples

spring-cloud-function-adapters/pom.xml

@@ -17,7 +17,6 @@
 	<modules>
 		<module>spring-cloud-function-adapter-aws</module>
 		<module>spring-cloud-function-adapter-openwhisk</module>
-		<module>spring-cloud-function-adapter-samples</module>
+  	</modules>
-  </modules>
 
 </project>

spring-cloud-function-adapters/spring-cloud-function-adapter-samples/pom.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-function-adapter-samples</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>function-adapter-sample-aws</module>
-	</modules>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

spring-cloud-function-samples/function-sample-aws/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>io.spring.sample</groupId>
-	<artifactId>function-adapter-sample-aws</artifactId>
+	<artifactId>function-sample-aws</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 

spring-cloud-function-samples/pom.xml

@@ -18,6 +18,7 @@
 		<module>function-sample-pojo</module>
 		<module>function-sample-compiler</module>
 		<module>function-sample-task</module>
+		<module>function-sample-aws</module>
 	</modules>
 
 	<build>