Skip to content

Commit 4e4a065

Browse files
kolea2kolea2
authored
Revert "fix(deps): update dependency javax.servlet:javax.servlet-api to v4 (#6735)" (#6870)
This reverts commit ceb0bca.
1 parent accb0f5 commit 4e4a065

File tree

83 files changed

+83
-83
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

+83
-83
lines changed

‎appengine-java11-bundled-services/datastore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>javax.servlet</groupId>
4848
<artifactId>javax.servlet-api</artifactId>
49-
<version>4.0.1</version>
49+
<version>3.1.0</version>
5050
<type>jar</type>
5151
<scope>provided</scope>
5252
</dependency>

‎appengine-java11/cloudsql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>javax.servlet</groupId>
5656
<artifactId>javax.servlet-api</artifactId>
57-
<version>4.0.1</version>
57+
<version>3.1.0</version>
5858
<type>jar</type>
5959
<scope>provided</scope>
6060
</dependency>

‎appengine-java11/gaeinfo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Copyright 2019 Google LLC
5252
<dependency>
5353
<groupId>javax.servlet</groupId>
5454
<artifactId>javax.servlet-api</artifactId>
55-
<version>4.0.1</version>
55+
<version>3.1.0</version>
5656
<scope>provided</scope>
5757
</dependency>
5858

‎appengine-java11/guestbook-cloud-firestore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>javax.servlet</groupId>
8080
<artifactId>javax.servlet-api</artifactId>
81-
<version>4.0.1</version>
81+
<version>3.1.0</version>
8282
<type>jar</type>
8383
<scope>provided</scope>
8484
</dependency>

‎appengine-java11/helloworld-servlet/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ limitations under the License.
5858
<dependency>
5959
<groupId>javax.servlet</groupId>
6060
<artifactId>javax.servlet-api</artifactId>
61-
<version>4.0.1</version>
61+
<version>3.1.0</version>
6262
<scope>provided</scope>
6363
</dependency>
6464

‎appengine-java11/oauth2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>javax.servlet</groupId>
8686
<artifactId>javax.servlet-api</artifactId>
87-
<version>4.0.1</version>
87+
<version>3.1.0</version>
8888
<type>jar</type>
8989
<scope>provided</scope>
9090
</dependency>

‎appengine-java11/spanner/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>javax.servlet</groupId>
7575
<artifactId>javax.servlet-api</artifactId>
76-
<version>4.0.1</version>
76+
<version>3.1.0</version>
7777
<scope>provided</scope>
7878
</dependency>
7979
</dependencies>

‎appengine-java8/analytics/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>javax.servlet</groupId>
6161
<artifactId>javax.servlet-api</artifactId>
62-
<version>4.0.1</version>
62+
<version>3.1.0</version>
6363
<type>jar</type>
6464
<scope>provided</scope>
6565
</dependency>

‎appengine-java8/appidentity/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>javax.servlet</groupId>
5959
<artifactId>javax.servlet-api</artifactId>
60-
<version>4.0.1</version>
60+
<version>3.1.0</version>
6161
<type>jar</type>
6262
<scope>provided</scope>
6363
</dependency>

‎appengine-java8/bigquery/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
4646
<artifactId>javax.servlet-api</artifactId>
47-
<version>4.0.1</version>
47+
<version>3.1.0</version>
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
</dependency>

‎appengine-java8/bigtable/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ dependencies {
5050
compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version:'2.0.50.Final'
5151
compile group: 'jstl', name: 'jstl', version:'1.2'
5252

53-
providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'4.0.1'
53+
providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'
5454

5555
testCompile group: 'com.google.truth', name: 'truth', version:'1.1.3'
5656
testCompile group: 'junit', name: 'junit', version:'4.13.2'

‎appengine-java8/bigtable/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ limitations under the License.
5454
<dependency>
5555
<groupId>javax.servlet</groupId>
5656
<artifactId>javax.servlet-api</artifactId>
57-
<version>4.0.1</version>
57+
<version>3.1.0</version>
5858
<type>jar</type>
5959
<scope>provided</scope>
6060
</dependency>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
4646
<artifactId>javax.servlet-api</artifactId>
47-
<version>4.0.1</version>
47+
<version>3.1.0</version>
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
</dependency>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
4646
<artifactId>javax.servlet-api</artifactId>
47-
<version>4.0.1</version>
47+
<version>3.1.0</version>
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
</dependency>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>javax.servlet-api</artifactId>
48-
<version>4.0.1</version>
48+
<version>3.1.0</version>
4949
<type>jar</type>
5050
<scope>provided</scope>
5151
</dependency>

‎appengine-java8/datastore-schedule-export/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>javax.servlet</groupId>
4343
<artifactId>javax.servlet-api</artifactId>
44-
<version>4.0.1</version>
44+
<version>3.1.0</version>
4545
<type>jar</type>
4646
<scope>provided</scope>
4747
</dependency>

‎appengine-java8/datastore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>javax.servlet-api</artifactId>
48-
<version>4.0.1</version>
48+
<version>3.1.0</version>
4949
<type>jar</type>
5050
<scope>provided</scope>
5151
</dependency>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>javax.servlet</groupId>
6767
<artifactId>javax.servlet-api</artifactId>
68-
<version>4.0.1</version>
68+
<version>3.1.0</version>
6969
<type>jar</type>
7070
<scope>provided</scope>
7171
</dependency>

‎appengine-java8/endpoints-v2-guice/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>javax.servlet</groupId>
7070
<artifactId>javax.servlet-api</artifactId>
71-
<version>4.0.1</version>
71+
<version>3.1.0</version>
7272
<type>jar</type>
7373
<scope>provided</scope>
7474
</dependency>

‎appengine-java8/endpoints-v2-migration/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ apply plugin: 'com.google.cloud.tools.endpoints-framework-server'
4242
// [END apply_plugins]
4343

4444
dependencies {
45-
providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'4.0.1'
45+
providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'
4646
compile 'jstl:jstl:1.2'
4747
compile group: 'javax.inject', name: 'javax.inject', version: '1'
4848

‎appengine-java8/endpoints-v2-migration/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ limitations under the License.
5454
<dependency>
5555
<groupId>javax.servlet</groupId>
5656
<artifactId>javax.servlet-api</artifactId>
57-
<version>4.0.1</version>
57+
<version>3.1.0</version>
5858
<type>jar</type>
5959
<scope>provided</scope>
6060
</dependency>

‎appengine-java8/endpoints-v2-skeleton/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies {
4242
compile 'com.google.appengine:appengine-api-1.0-sdk:2.0.4'
4343

4444
compile 'javax.inject:javax.inject:1'
45-
compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
45+
compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
4646
}
4747
// [END dependencies]
4848

‎appengine-java8/endpoints-v2-skeleton/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ limitations under the License.
5252
<dependency>
5353
<groupId>javax.servlet</groupId>
5454
<artifactId>javax.servlet-api</artifactId>
55-
<version>4.0.1</version>
55+
<version>3.1.0</version>
5656
<type>jar</type>
5757
<scope>provided</scope>
5858
</dependency>

‎appengine-java8/firebase-backend/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>javax.servlet</groupId>
5454
<artifactId>javax.servlet-api</artifactId>
55-
<version>4.0.1</version>
55+
<version>3.1.0</version>
5656
<scope>provided</scope>
5757
</dependency>
5858
<dependency>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>javax.servlet</groupId>
5252
<artifactId>javax.servlet-api</artifactId>
53-
<version>4.0.1</version>
53+
<version>3.1.0</version>
5454
<type>jar</type>
5555
<scope>provided</scope>
5656
</dependency>

‎appengine-java8/firebase-tictactoe/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>javax.servlet-api</artifactId>
48-
<version>4.0.1</version>
48+
<version>3.1.0</version>
4949
<type>jar</type>
5050
<scope>provided</scope>
5151
</dependency>

‎appengine-java8/gaeinfo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Copyright 2017 Google Inc.
4848
<dependency>
4949
<groupId>javax.servlet</groupId>
5050
<artifactId>javax.servlet-api</artifactId>
51-
<version>4.0.1</version>
51+
<version>3.1.0</version>
5252
<type>jar</type>
5353
<scope>provided</scope>
5454
</dependency>

‎appengine-java8/guestbook-cloud-datastore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>javax.servlet</groupId>
5353
<artifactId>javax.servlet-api</artifactId>
54-
<version>4.0.1</version>
54+
<version>3.1.0</version>
5555
<type>jar</type>
5656
<scope>provided</scope>
5757
</dependency>

‎appengine-java8/helloworld/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ apply plugin: 'com.google.cloud.tools.appengine' // App Engine tasks
3636

3737
dependencies {
3838
implementation 'com.google.appengine:appengine-api-1.0-sdk:+' // Latest App Engine Api's
39-
providedCompile 'javax.servlet:javax.servlet-api:4.0.1'
39+
providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
4040

4141
implementation 'jstl:jstl:1.2'
4242

‎appengine-java8/helloworld/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ limitations under the License.
4848
<dependency>
4949
<groupId>javax.servlet</groupId>
5050
<artifactId>javax.servlet-api</artifactId>
51-
<version>4.0.1</version>
51+
<version>3.1.0</version>
5252
<type>jar</type>
5353
<scope>provided</scope>
5454
</dependency>

‎appengine-java8/images/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Copyright 2015 Google Inc.
5151
<dependency>
5252
<groupId>javax.servlet</groupId>
5353
<artifactId>javax.servlet-api</artifactId>
54-
<version>4.0.1</version>
54+
<version>3.1.0</version>
5555
<type>jar</type>
5656
<scope>provided</scope>
5757
</dependency>

‎appengine-java8/mail/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Copyright 2016 Google Inc.
3939
<dependency>
4040
<groupId>javax.servlet</groupId>
4141
<artifactId>javax.servlet-api</artifactId>
42-
<version>4.0.1</version>
42+
<version>3.1.0</version>
4343
<type>jar</type>
4444
<scope>provided</scope>
4545
</dependency>

‎appengine-java8/mailgun/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>javax.servlet</groupId>
4141
<artifactId>javax.servlet-api</artifactId>
42-
<version>4.0.1</version>
42+
<version>3.1.0</version>
4343
<type>jar</type>
4444
<scope>provided</scope>
4545
</dependency>

‎appengine-java8/mailjet/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
4646
<artifactId>javax.servlet-api</artifactId>
47-
<version>4.0.1</version>
47+
<version>3.1.0</version>
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
</dependency>

‎appengine-java8/memcache/pom.xml

+1-1
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>javax.servlet-api</artifactId>
42-
<version>4.0.1</version>
42+
<version>3.1.0</version>
4343
<type>jar</type>
4444
<scope>provided</scope>
4545
</dependency>

‎appengine-java8/metadata/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Copyright 2017 Google Inc.
4343
<dependency>
4444
<groupId>javax.servlet</groupId>
4545
<artifactId>javax.servlet-api</artifactId>
46-
<version>4.0.1</version>
46+
<version>3.1.0</version>
4747
<type>jar</type>
4848
<scope>provided</scope>
4949
</dependency>

‎appengine-java8/multitenancy/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>javax.servlet</groupId>
5050
<artifactId>javax.servlet-api</artifactId>
51-
<version>4.0.1</version>
51+
<version>3.1.0</version>
5252
<type>jar</type>
5353
<scope>provided</scope>
5454
</dependency>

‎appengine-java8/oauth2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
4646
<artifactId>javax.servlet-api</artifactId>
47-
<version>4.0.1</version>
47+
<version>3.1.0</version>
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
</dependency>

‎appengine-java8/pubsub/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>javax.servlet</groupId>
6767
<artifactId>javax.servlet-api</artifactId>
68-
<version>4.0.1</version>
68+
<version>3.1.0</version>
6969
<type>jar</type>
7070
<scope>provided</scope>
7171
</dependency>

‎appengine-java8/remote-server/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>javax.servlet</groupId>
5252
<artifactId>javax.servlet-api</artifactId>
53-
<version>4.0.1</version>
53+
<version>3.1.0</version>
5454
<type>jar</type>
5555
<scope>provided</scope>
5656
</dependency>

‎appengine-java8/requests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ limitations under the License.
4040
<dependency>
4141
<groupId>javax.servlet</groupId>
4242
<artifactId>javax.servlet-api</artifactId>
43-
<version>4.0.1</version>
43+
<version>3.1.0</version>
4444
<type>jar</type>
4545
<scope>provided</scope>
4646
</dependency>

‎appengine-java8/search/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Copyright 2015 Google Inc.
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
4646
<artifactId>javax.servlet-api</artifactId>
47-
<version>4.0.1</version>
47+
<version>3.1.0</version>
4848
<type>jar</type>
4949
<scope>provided</scope>
5050
</dependency>

‎appengine-java8/sendgrid/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Copyright 2018 Google LLC
3939
<dependency>
4040
<groupId>javax.servlet</groupId>
4141
<artifactId>javax.servlet-api</artifactId>
42-
<version>4.0.1</version>
42+
<version>3.1.0</version>
4343
<type>jar</type>
4444
<scope>provided</scope>
4545
</dependency>

‎appengine-java8/spanner/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>javax.servlet</groupId>
6262
<artifactId>javax.servlet-api</artifactId>
63-
<version>4.0.1</version>
63+
<version>3.1.0</version>
6464
<scope>provided</scope>
6565
</dependency>
6666
<dependency>

0 commit comments

Comments
 (0)