From 427db2baead977be22f9a84c7b5bdf0d2655b738 Mon Sep 17 00:00:00 2001
From: Zoe Wang <zoewang@amazon.com>
Date: Mon, 12 Oct 2020 17:19:25 -0700
Subject: [PATCH] Copying the global.vm to archetype resources folder because
 it's no longer global

---
 ...ugfix-AWSLambdaMavenArchetype-9037fcf.json |  5 ++
 archetypes/archetype-lambda/pom.xml           | 53 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 .changes/next-release/bugfix-AWSLambdaMavenArchetype-9037fcf.json

diff --git a/.changes/next-release/bugfix-AWSLambdaMavenArchetype-9037fcf.json b/.changes/next-release/bugfix-AWSLambdaMavenArchetype-9037fcf.json
new file mode 100644
index 000000000000..2469ca1874ae
--- /dev/null
+++ b/.changes/next-release/bugfix-AWSLambdaMavenArchetype-9037fcf.json
@@ -0,0 +1,5 @@
+{
+    "category": "AWS Lambda Maven Archetype", 
+    "type": "bugfix", 
+    "description": "Fixed an issue where archetype generation failed with latest maven-archetype-plugin. See [#1981](https://github.com/aws/aws-sdk-java-v2/issues/1981)"
+}
diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
index 9d15154f2df5..4cbb805e531b 100644
--- a/archetypes/archetype-lambda/pom.xml
+++ b/archetypes/archetype-lambda/pom.xml
@@ -31,7 +31,8 @@
     </description>
 
     <properties>
-        <maven.archetype.version>3.1.2</maven.archetype.version>
+        <maven.archetype.version>3.2.0</maven.archetype.version>
+        <maven.resource.plugin.version>3.2.0</maven.resource.plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
     </properties>
 
@@ -118,6 +119,56 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+
+            <!-- workaround to copy the global.vm and serviceMapping.vm to the sub folders
+                 because gloabl.vm is not so global any more
+                 see https://github.com/aws/aws-sdk-java-v2/issues/1981 -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven.resource.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/classes/archetype-resources</outputDirectory>
+                            <encoding>UTF-8</encoding>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/target/classes/</directory>
+                                    <includes>
+                                        <include>global.vm</include>
+                                        <include>serviceMapping.vm</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources-to-sub-folder</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/classes/archetype-resources/src/main/java</outputDirectory>
+                            <encoding>UTF-8</encoding>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/target/classes/</directory>
+                                    <includes>
+                                        <include>global.vm</include>
+                                        <include>serviceMapping.vm</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file