Commit 987a2cf
Les Vogel
Fix invalid servlet dependency...
1 parent 96699cc commit 987a2cf
20 files changed
Lines changed: 23 additions & 471 deletions
File tree
- appengine
- datastore
- indexes-exploding
- indexes-perfect
- indexes
- helloworld
- images
- oauth2
- urlfetch
- xmpp
- src/main
- java/com/example/appengine/xmpp
- webapp/WEB-INF
- taskqueue/deferred
- unittests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | <dependency> | |
| 37 | 37 | <groupId>javax.servlet</groupId> | |
| 38 | 38 | <artifactId>servlet-api</artifactId> | |
| 39 | - <type>jar</type> | ||
| 39 | + <version>2.5</version> | ||
| 40 | 40 | <scope>provided</scope> | |
| 41 | 41 | </dependency> | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | <dependency> | |
| 37 | 37 | <groupId>javax.servlet</groupId> | |
| 38 | 38 | <artifactId>servlet-api</artifactId> | |
| 39 | - <type>jar</type> | ||
| 39 | + <version>2.5</version> | ||
| 40 | 40 | <scope>provided</scope> | |
| 41 | 41 | </dependency> | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | <dependency> | |
| 37 | 37 | <groupId>javax.servlet</groupId> | |
| 38 | 38 | <artifactId>servlet-api</artifactId> | |
| 39 | - <type>jar</type> | ||
| 39 | + <version>2.5</version> | ||
| 40 | 40 | <scope>provided</scope> | |
| 41 | 41 | </dependency> | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,6 +33,14 @@ | |||
| 33 | 33 | <artifactId>appengine-api-1.0-sdk</artifactId> | |
| 34 | 34 | <version>${appengine.sdk.version}</version> | |
| 35 | 35 | </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 | + | ||
| 36 | 44 | <dependency> | |
| 37 | 45 | <groupId>com.google.auto.value</groupId> | |
| 38 | 46 | <artifactId>auto-value</artifactId> | |
@@ -51,12 +59,6 @@ | |||
| 51 | 59 | <version>20.0</version> | |
| 52 | 60 | </dependency> | |
| 53 | 61 | ||
| 54 | - <dependency> | ||
| 55 | - <groupId>javax.servlet</groupId> | ||
| 56 | - <artifactId>servlet-api</artifactId> | ||
| 57 | - <type>jar</type> | ||
| 58 | - <scope>provided</scope> | ||
| 59 | - </dependency> | ||
| 60 | 62 | <dependency> | |
| 61 | 63 | <groupId>joda-time</groupId> | |
| 62 | 64 | <artifactId>joda-time</artifactId> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -30,7 +30,7 @@ Copyright 2015 Google Inc. All Rights Reserved. | |||
| 30 | 30 | <dependency> | |
| 31 | 31 | <groupId>javax.servlet</groupId> | |
| 32 | 32 | <artifactId>servlet-api</artifactId> | |
| 33 | - <type>jar</type> | ||
| 33 | + <version>2.5</version> | ||
| 34 | 34 | <scope>provided</scope> | |
| 35 | 35 | </dependency> | |
| 36 | 36 | </dependencies> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,7 +45,7 @@ Copyright 2015 Google Inc. All Rights Reserved. | |||
| 45 | 45 | <dependency> | |
| 46 | 46 | <groupId>javax.servlet</groupId> | |
| 47 | 47 | <artifactId>servlet-api</artifactId> | |
| 48 | - <type>jar</type> | ||
| 48 | + <version>2.5</version> | ||
| 49 | 49 | <scope>provided</scope> | |
| 50 | 50 | </dependency> | |
| 51 | 51 | </dependencies> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -37,7 +37,7 @@ | |||
| 37 | 37 | <dependency> | |
| 38 | 38 | <groupId>javax.servlet</groupId> | |
| 39 | 39 | <artifactId>servlet-api</artifactId> | |
| 40 | - <type>jar</type> | ||
| 40 | + <version>2.5</version> | ||
| 41 | 41 | <scope>provided</scope> | |
| 42 | 42 | </dependency> | |
| 43 | 43 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -31,7 +31,7 @@ Copyright 2015 Google Inc. All Rights Reserved. | |||
| 31 | 31 | <dependency> | |
| 32 | 32 | <groupId>javax.servlet</groupId> | |
| 33 | 33 | <artifactId>servlet-api</artifactId> | |
| 34 | - <type>jar</type> | ||
| 34 | + <version>2.5</version> | ||
| 35 | 35 | <scope>provided</scope> | |
| 36 | 36 | </dependency> | |
| 37 | 37 | <dependency> | |
This file was deleted.
This file was deleted.
0 commit comments