From 7317c090cc100456c735037f9c9f26cd4e042ce1 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Wed, 29 Jul 2015 09:57:57 -0500
Subject: [PATCH] SEC-2963: Disable appengineRun if contains functional tests

---
 samples/gae-xml/gae.gradle | 12 +-----------
 samples/gae-xml/pom.xml    | 10 +++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/samples/gae-xml/gae.gradle b/samples/gae-xml/gae.gradle
index cb8972187c..6caf0a337c 100644
--- a/samples/gae-xml/gae.gradle
+++ b/samples/gae-xml/gae.gradle
@@ -49,14 +49,4 @@ dependencies {
 
 }
 
-appengine.httpPort = reservePorts(1)[0]
-
-def reservePorts(int count) {
-	def sockets = []
-	for(int i in 1..count) {
-		sockets << new ServerSocket(0)
-	}
-	def result = sockets*.localPort
-	sockets*.close()
-	result
-}
\ No newline at end of file
+appengineRun.onlyIf { !gradle.taskGraph.hasTask(appengineFunctionalTest) }
\ No newline at end of file
diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml
index 7cc1a355f7..0617e304a8 100644
--- a/samples/gae-xml/pom.xml
+++ b/samples/gae-xml/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
   <artifactId>spring-security-samples-gae-xml</artifactId>
-  <version>4.0.2.CI-SNAPSHOT</version>
+  <version>4.0.3.CI-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>spring-security-samples-gae-xml</name>
   <description>spring-security-samples-gae-xml</description>
@@ -65,13 +65,13 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.0.2.CI-SNAPSHOT</version>
+      <version>4.0.3.CI-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
-      <version>4.0.2.CI-SNAPSHOT</version>
+      <version>4.0.3.CI-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -139,13 +139,13 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.0.2.CI-SNAPSHOT</version>
+      <version>4.0.3.CI-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-taglibs</artifactId>
-      <version>4.0.2.CI-SNAPSHOT</version>
+      <version>4.0.3.CI-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>