Skip to content

Commit 7317c09

Browse files
author
Rob Winch
committed
SEC-2963: Disable appengineRun if contains functional tests
1 parent 485fbdc commit 7317c09

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

samples/gae-xml/gae.gradle

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,4 @@ dependencies {
4949

5050
}
5151

52-
appengine.httpPort = reservePorts(1)[0]
53-
54-
def reservePorts(int count) {
55-
def sockets = []
56-
for(int i in 1..count) {
57-
sockets << new ServerSocket(0)
58-
}
59-
def result = sockets*.localPort
60-
sockets*.close()
61-
result
62-
}
52+
appengineRun.onlyIf { !gradle.taskGraph.hasTask(appengineFunctionalTest) }

samples/gae-xml/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.security</groupId>
55
<artifactId>spring-security-samples-gae-xml</artifactId>
6-
<version>4.0.2.CI-SNAPSHOT</version>
6+
<version>4.0.3.CI-SNAPSHOT</version>
77
<packaging>war</packaging>
88
<name>spring-security-samples-gae-xml</name>
99
<description>spring-security-samples-gae-xml</description>
@@ -65,13 +65,13 @@
6565
<dependency>
6666
<groupId>org.springframework.security</groupId>
6767
<artifactId>spring-security-core</artifactId>
68-
<version>4.0.2.CI-SNAPSHOT</version>
68+
<version>4.0.3.CI-SNAPSHOT</version>
6969
<scope>compile</scope>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.springframework.security</groupId>
7373
<artifactId>spring-security-web</artifactId>
74-
<version>4.0.2.CI-SNAPSHOT</version>
74+
<version>4.0.3.CI-SNAPSHOT</version>
7575
<scope>compile</scope>
7676
</dependency>
7777
<dependency>
@@ -139,13 +139,13 @@
139139
<dependency>
140140
<groupId>org.springframework.security</groupId>
141141
<artifactId>spring-security-config</artifactId>
142-
<version>4.0.2.CI-SNAPSHOT</version>
142+
<version>4.0.3.CI-SNAPSHOT</version>
143143
<scope>runtime</scope>
144144
</dependency>
145145
<dependency>
146146
<groupId>org.springframework.security</groupId>
147147
<artifactId>spring-security-taglibs</artifactId>
148-
<version>4.0.2.CI-SNAPSHOT</version>
148+
<version>4.0.3.CI-SNAPSHOT</version>
149149
<scope>runtime</scope>
150150
</dependency>
151151
<dependency>

0 commit comments

Comments
 (0)