Skip to content

Commit 0491b31

Browse files
author
Bill Prin
committed
Merge branch 'master' into bigquery
2 parents 23440b6 + b423e7e commit 0491b31

File tree

3 files changed

+94
-14
lines changed

3 files changed

+94
-14
lines changed

‎pom.xml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
4+
<modelVersion>4.0.0</modelVersion>
5+
<version>1.0.0</version>
6+
7+
<groupId>com.google.cloud</groupId>
8+
<artifactId>doc-samples</artifactId>
9+
<packaging>pom</packaging>
10+
11+
<properties>
12+
<appengine.version>1.9.19</appengine.version>
13+
<appengine.app.version>1</appengine.app.version>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
</properties>
16+
17+
<prerequisites>
18+
<maven>3.1.0</maven>
19+
</prerequisites>
20+
21+
<modules>
22+
<module>taskqueue/deferred</module>
23+
<module>unittests</module>
24+
</modules>
25+
26+
<dependencyManagement>
27+
<dependencies>
28+
<!-- Compile/runtime dependencies -->
29+
<dependency>
30+
<groupId>com.google.appengine</groupId>
31+
<artifactId>appengine-api-1.0-sdk</artifactId>
32+
<version>${appengine.version}</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>javax.servlet</groupId>
36+
<artifactId>servlet-api</artifactId>
37+
<version>2.5</version>
38+
<scope>provided</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>jstl</groupId>
42+
<artifactId>jstl</artifactId>
43+
<version>1.2</version>
44+
</dependency>
45+
46+
<!-- Test Dependencies -->
47+
<dependency>
48+
<groupId>junit</groupId>
49+
<artifactId>junit</artifactId>
50+
<version>4.12-beta-1</version>
51+
<scope>test</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.mockito</groupId>
55+
<artifactId>mockito-all</artifactId>
56+
<version>1.9.5</version>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.google.appengine</groupId>
61+
<artifactId>appengine-testing</artifactId>
62+
<version>${appengine.version}</version>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.google.appengine</groupId>
67+
<artifactId>appengine-api-stubs</artifactId>
68+
<version>${appengine.version}</version>
69+
<scope>test</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>com.google.appengine</groupId>
73+
<artifactId>appengine-api-1.0-sdk</artifactId>
74+
<version>${appengine.target.version}</version>
75+
</dependency>
76+
</dependencies>
77+
</dependencyManagement>
78+
79+
</project>

‎taskqueue/deferred/pom.xml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
<packaging>war</packaging>
66
<version>1.0-SNAPSHOT</version>
77

8+
<parent>
9+
<artifactId>doc-samples</artifactId>
10+
<groupId>com.google.cloud</groupId>
11+
<version>1.0.0</version>
12+
<relativePath>../..</relativePath>
13+
</parent>
14+
815
<groupId>com.google.cloud.taskqueue.samples</groupId>
916
<artifactId>defer-sample</artifactId>
1017

@@ -23,44 +30,32 @@
2330
<dependency>
2431
<groupId>com.google.appengine</groupId>
2532
<artifactId>appengine-api-1.0-sdk</artifactId>
26-
<version>${appengine.version}</version>
2733
</dependency>
2834
<dependency>
2935
<groupId>javax.servlet</groupId>
3036
<artifactId>servlet-api</artifactId>
31-
<version>2.5</version>
32-
<scope>provided</scope>
3337
</dependency>
3438
<dependency>
3539
<groupId>jstl</groupId>
3640
<artifactId>jstl</artifactId>
37-
<version>1.2</version>
3841
</dependency>
3942

4043
<!-- Test Dependencies -->
4144
<dependency>
4245
<groupId>junit</groupId>
4346
<artifactId>junit</artifactId>
44-
<version>4.12-beta-1</version>
45-
<scope>test</scope>
4647
</dependency>
4748
<dependency>
4849
<groupId>org.mockito</groupId>
4950
<artifactId>mockito-all</artifactId>
50-
<version>1.9.5</version>
51-
<scope>test</scope>
5251
</dependency>
5352
<dependency>
5453
<groupId>com.google.appengine</groupId>
5554
<artifactId>appengine-testing</artifactId>
56-
<version>${appengine.version}</version>
57-
<scope>test</scope>
5855
</dependency>
5956
<dependency>
6057
<groupId>com.google.appengine</groupId>
6158
<artifactId>appengine-api-stubs</artifactId>
62-
<version>${appengine.version}</version>
63-
<scope>test</scope>
6459
</dependency>
6560
</dependencies>
6661

‎unittests/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<packaging>war</packaging>
66
<version>1.0-SNAPSHOT</version>
77

8+
<parent>
9+
<artifactId>doc-samples</artifactId>
10+
<groupId>com.google.cloud</groupId>
11+
<version>1.0.0</version>
12+
<relativePath>..</relativePath>
13+
</parent>
14+
15+
816
<groupId>com.google.appengine.samples</groupId>
917
<artifactId>appengine-local-testing-samples</artifactId>
1018

@@ -24,8 +32,6 @@
2432
<dependency>
2533
<groupId>javax.servlet</groupId>
2634
<artifactId>servlet-api</artifactId>
27-
<version>2.5</version>
28-
<scope>provided</scope>
2935
</dependency>
3036
<dependency>
3137
<groupId>jstl</groupId>

0 commit comments

Comments
 (0)