Skip to content

Commit c8aff22

Browse files
lesvlesv
authored
Merge pull request GoogleCloudPlatform#408 from GoogleCloudPlatform/env-flex
update /flexible/* to env-flex 1. app.yaml -> env:flex 2. remove any compat samples 3. Make sure we use new appengine & jetty plugins 4. Update artivactId’s and groupId’s to flexible where appropriate TODO: [ ] flexible/async-rest - shouldn’t be using Docker [ ] flexible/endpoints - does appengine:deploy work? [ ] flexible/* - See if we really want to use EnvVar’s to pass values, perhaps we should modify to use web.xml context vars. [ ] flexible/memcache — NEED WORK
2 parents c044248 + 987a2cf commit c8aff22

File tree

83 files changed

+308
-776
lines changed

Some content is hidden

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

83 files changed

+308
-776
lines changed

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

Lines changed: 1 addition & 1 deletion
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-
<type>jar</type>
39+
<version>2.5</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

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

Lines changed: 1 addition & 1 deletion
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-
<type>jar</type>
39+
<version>2.5</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

‎appengine/datastore/indexes/pom.xml

Lines changed: 1 addition & 1 deletion
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-
<type>jar</type>
39+
<version>2.5</version>
4040
<scope>provided</scope>
4141
</dependency>
4242

‎appengine/datastore/pom.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
<artifactId>appengine-api-1.0-sdk</artifactId>
3434
<version>${appengine.sdk.version}</version>
3535
</dependency>
36+
37+
<dependency>
38+
<groupId>javax.servlet</groupId>
39+
<artifactId>servlet-api</artifactId>
40+
<version>2.5</version>
41+
<scope>provided</scope>
42+
</dependency>
43+
3644
<dependency>
3745
<groupId>com.google.auto.value</groupId>
3846
<artifactId>auto-value</artifactId>
@@ -51,12 +59,6 @@
5159
<version>20.0</version>
5260
</dependency>
5361

54-
<dependency>
55-
<groupId>javax.servlet</groupId>
56-
<artifactId>servlet-api</artifactId>
57-
<type>jar</type>
58-
<scope>provided</scope>
59-
</dependency>
6062
<dependency>
6163
<groupId>joda-time</groupId>
6264
<artifactId>joda-time</artifactId>

‎appengine/helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
3030
<dependency>
3131
<groupId>javax.servlet</groupId>
3232
<artifactId>servlet-api</artifactId>
33-
<type>jar</type>
33+
<version>2.5</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
</dependencies>

‎appengine/images/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
4545
<dependency>
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>servlet-api</artifactId>
48-
<type>jar</type>
48+
<version>2.5</version>
4949
<scope>provided</scope>
5050
</dependency>
5151
</dependencies>

‎appengine/oauth2/pom.xml

Lines changed: 1 addition & 1 deletion
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-
<type>jar</type>
40+
<version>2.5</version>
4141
<scope>provided</scope>
4242
</dependency>
4343

‎appengine/urlfetch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
3131
<dependency>
3232
<groupId>javax.servlet</groupId>
3333
<artifactId>servlet-api</artifactId>
34-
<type>jar</type>
34+
<version>2.5</version>
3535
<scope>provided</scope>
3636
</dependency>
3737
<dependency>

‎appengine/xmpp/README.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎appengine/xmpp/pom.xml

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)