From b2978a95e8fb3afdfe01fdfd0d967e92c403834e Mon Sep 17 00:00:00 2001
From: Davor Bonaci <davor@google.com>
Date: Tue, 12 Apr 2016 21:43:32 -0700
Subject: [PATCH 1/2] Update 'examples' archetype

This makes the test run in the 'install' phase, as opposed to the
'integration-test' phase.
---
 sdks/java/maven-archetypes/examples/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sdks/java/maven-archetypes/examples/pom.xml b/sdks/java/maven-archetypes/examples/pom.xml
index 3b513da3391c..1d8266460795 100644
--- a/sdks/java/maven-archetypes/examples/pom.xml
+++ b/sdks/java/maven-archetypes/examples/pom.xml
@@ -49,6 +49,21 @@
         <plugin>
           <artifactId>maven-archetype-plugin</artifactId>
           <version>2.4</version>
+          <executions>
+            <!-- archetype-packaging above binds this plugin's goals as follows:
+                     archetype:jar to the package phase,
+                     archetype:integration-test to the integration-test phase,
+                     archetype:update-local-catalog to the install phase.
+                 We defer the integration-test goal to the install phase, since
+                 this test actually depends on the core SDK to be installed. -->
+            <execution>
+              <id>default-integration-test</id>
+              <phase>install</phase>
+              <goals>
+                <goal>integration-test</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
       </plugins>
     </pluginManagement>

From 8afd3483bd4a4734dca141ef2d93e3d6a9db9331 Mon Sep 17 00:00:00 2001
From: Davor Bonaci <davor@google.com>
Date: Wed, 13 Apr 2016 10:11:45 -0700
Subject: [PATCH 2/2] Update 'starter' archetype

This makes the test run in the 'install' phase, as opposed to the
'integration-test' phase.
---
 sdks/java/maven-archetypes/starter/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml
index 2c7b6b9dfebd..d5357c751a8a 100644
--- a/sdks/java/maven-archetypes/starter/pom.xml
+++ b/sdks/java/maven-archetypes/starter/pom.xml
@@ -50,6 +50,21 @@
         <plugin>
           <artifactId>maven-archetype-plugin</artifactId>
           <version>2.4</version>
+          <executions>
+            <!-- archetype-packaging above binds this plugin's goals as follows:
+                     archetype:jar to the package phase,
+                     archetype:integration-test to the integration-test phase,
+                     archetype:update-local-catalog to the install phase.
+                 We defer the integration-test goal to the install phase, since
+                 this test actually depends on the core SDK to be installed. -->
+            <execution>
+              <id>default-integration-test</id>
+              <phase>install</phase>
+              <goals>
+                <goal>integration-test</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
       </plugins>
     </pluginManagement>