Skip to content

Commit 738ec6c

Browse files
jabubakejabubake
committed
consolidating flex samples into single project
1 parent 21557d3 commit 738ec6c

File tree

176 files changed

+1378
-1031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+1378
-1031
lines changed

‎appengine/channel/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>javax.servlet</groupId>
4444
<artifactId>servlet-api</artifactId>
45-
<version>2.5</version>
45+
<version>3.0-alpha-1</version>
4646
<type>jar</type>
4747
<scope>provided</scope>
4848
</dependency>
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>org.mockito</groupId>
6969
<artifactId>mockito-all</artifactId>
70-
<version>1.10.19</version>
70+
<version>2.0.2-beta</version>
7171
<scope>test</scope>
7272
</dependency>
7373
<dependency>

‎appengine/cloudsql/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>javax.servlet</groupId>
5252
<artifactId>servlet-api</artifactId>
53-
<version>2.5</version>
53+
<version>3.0-alpha-1</version>
5454
<scope>provided</scope>
5555
</dependency>
5656

@@ -72,7 +72,7 @@
7272
<dependency> <!-- ONLY USED LOCALY -->
7373
<groupId>mysql</groupId>
7474
<artifactId>mysql-connector-java</artifactId>
75-
<version>5.1.40</version> <!-- v5.x.x is Java 7, v6.x.x is Java 8 -->
75+
<version>6.0.5</version> <!-- v5.x.x is Java 7, v6.x.x is Java 8 -->
7676
</dependency>
7777
<dependency>
7878
<groupId>com.google.cloud.sql</groupId>

‎appengine/datastore/indexes-exploding/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>javax.servlet</groupId>
3838
<artifactId>servlet-api</artifactId>
39-
<version>2.5</version>
39+
<version>3.0-alpha-1</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>org.mockito</groupId>
5252
<artifactId>mockito-all</artifactId>
53-
<version>1.10.19</version>
53+
<version>2.0.2-beta</version>
5454
<scope>test</scope>
5555
</dependency>
5656
<dependency>

‎appengine/datastore/indexes-perfect/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>javax.servlet</groupId>
3838
<artifactId>servlet-api</artifactId>
39-
<version>2.5</version>
39+
<version>3.0-alpha-1</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>org.mockito</groupId>
5252
<artifactId>mockito-all</artifactId>
53-
<version>1.10.19</version>
53+
<version>2.0.2-beta</version>
5454
<scope>test</scope>
5555
</dependency>
5656
<dependency>

‎appengine/datastore/indexes/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>javax.servlet</groupId>
3838
<artifactId>servlet-api</artifactId>
39-
<version>2.5</version>
39+
<version>3.0-alpha-1</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>org.mockito</groupId>
5252
<artifactId>mockito-all</artifactId>
53-
<version>1.10.19</version>
53+
<version>2.0.2-beta</version>
5454
<scope>test</scope>
5555
</dependency>
5656
<dependency>

‎appengine/datastore/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>javax.servlet</groupId>
3939
<artifactId>servlet-api</artifactId>
40-
<version>2.5</version>
40+
<version>3.0-alpha-1</version>
4141
<scope>provided</scope>
4242
</dependency>
4343

@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>com.google.guava</groupId>
5858
<artifactId>guava</artifactId>
59-
<version>20.0</version>
59+
<version>21.0</version>
6060
</dependency>
6161

6262
<dependency>
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>org.mockito</groupId>
7777
<artifactId>mockito-all</artifactId>
78-
<version>1.10.19</version>
78+
<version>2.0.2-beta</version>
7979
<scope>test</scope>
8080
</dependency>
8181
<dependency>

‎appengine/endpoints-frameworks-v2/backend/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>servlet-api</artifactId>
48-
<version>2.5</version>
48+
<version>3.0-alpha-1</version>
4949
<scope>provided</scope>
5050
</dependency>
5151
<dependency>

‎appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>javax.servlet</groupId>
5050
<artifactId>servlet-api</artifactId>
51-
<version>2.5</version>
51+
<version>3.0-alpha-1</version>
5252
<scope>provided</scope>
5353
</dependency>
5454
<dependency>

‎appengine/guestbook-objectify/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>javax.servlet</groupId>
5151
<artifactId>servlet-api</artifactId>
52-
<version>2.5</version>
52+
<version>3.0-alpha-1</version>
5353
<scope>provided</scope>
5454
</dependency>
5555
<dependency>
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>org.mockito</groupId>
8383
<artifactId>mockito-all</artifactId>
84-
<version>1.10.19</version>
84+
<version>2.0.2-beta</version>
8585
<scope>test</scope>
8686
</dependency>
8787
<dependency>

‎appengine/helloworld-new-plugins/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Copyright 2015 Google Inc.
3939
<dependency>
4040
<groupId>javax.servlet</groupId>
4141
<artifactId>servlet-api</artifactId>
42-
<version>2.5</version>
42+
<version>3.0-alpha-1</version>
4343
<type>jar</type>
4444
<scope>provided</scope>
4545
</dependency>

0 commit comments

Comments
 (0)