Skip to content

Commit 3f0e09d

Browse files
averikitschaverikitsch
authored
chore: update renovate (GoogleCloudPlatform#8560)
* chore: update renovate dependencies * update deps * Update pom.xml
1 parent 8d62b45 commit 3f0e09d

File tree

7 files changed

+106
-53
lines changed

7 files changed

+106
-53
lines changed

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

Lines changed: 2 additions & 2 deletions
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>3.1.0</version>
63+
<version>4.0.1</version>
6464
<type>jar</type>
6565
<scope>provided</scope>
6666
</dependency>
@@ -166,7 +166,7 @@
166166
<plugin>
167167
<groupId>org.eclipse.jetty</groupId>
168168
<artifactId>jetty-maven-plugin</artifactId>
169-
<version>9.4.51.v20230217</version>
169+
<version>10.0.15</version>
170170
</plugin>
171171
</plugins>
172172
</build>

‎appengine-java8/iap/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ Copyright 2017 Google Inc.
4040
<dependencies>
4141
<dependency>
4242
<groupId>javax.servlet</groupId>
43-
<artifactId>servlet-api</artifactId>
44-
<version>2.5</version>
43+
<artifactId>javax.servlet-api</artifactId>
44+
<version>3.1.0</version>
45+
<type>jar</type>
4546
<scope>provided</scope>
4647
</dependency>
4748
</dependencies>

‎appengine-java8/pubsub/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<plugin>
102102
<groupId>org.eclipse.jetty</groupId>
103103
<artifactId>jetty-maven-plugin</artifactId>
104-
<version>9.4.51.v20230217 </version>
104+
<version>9.4.51.v20230217</version>
105105
</plugin>
106106
</plugins>
107107
</build>

‎cloud-sql/mysql/servlet/pom.xml‎

Lines changed: 2 additions & 2 deletions
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>3.1.0</version>
44+
<version>4.0.1</version>
4545
<type>jar</type>
4646
<scope>provided</scope>
4747
</dependency>
@@ -117,7 +117,7 @@
117117
<plugin>
118118
<groupId>org.eclipse.jetty</groupId>
119119
<artifactId>jetty-maven-plugin</artifactId>
120-
<version>9.4.51.v20230217</version>
120+
<version>10.0.15</version>
121121
<configuration>
122122
<scanIntervalSeconds>1</scanIntervalSeconds>
123123
</configuration>

‎renovate.json‎

Lines changed: 95 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,120 +11,122 @@
1111
],
1212
"packageRules": [
1313
{
14-
"packagePatterns": [
14+
"matchPackagePatterns": [
1515
"^com.fasterxml.jackson.core:"
1616
],
1717
"groupName": "Jackson core packages"
18-
},
18+
},
1919
{
20-
"packagePatterns": [
20+
"matchPackagePatterns": [
2121
"^com.google.appengine:"
2222
],
2323
"groupName": "AppEngine packages"
2424
},
2525
{
26-
"packagePatterns": [
26+
"matchPackagePatterns": [
2727
"^com.google.cloud.bigtable:"
2828
],
2929
"groupName": "Bigtable packages"
3030
},
3131
{
32-
"packagePatterns": [
32+
"matchPackagePatterns": [
3333
"^com.google.cloud.sql:"
3434
],
3535
"groupName": "Cloud SQL connectors"
3636
},
3737
{
38-
"matchPackagePrefixes": [ "com.google" ],
38+
"matchPackagePrefixes": [
39+
"com.google"
40+
],
3941
"allowedVersions": "!/.+-sp\\.[0-9]+$/"
4042
},
4143
{
42-
"packagePatterns": [
44+
"matchPackagePatterns": [
4345
"^org.apache.beam:"
4446
],
4547
"groupName": "Apache Beam packages"
4648
},
4749
{
48-
"packagePatterns": [
50+
"matchPackagePatterns": [
4951
"io.grpc:(?:protoc-gen-)?grpc-*"
5052
],
5153
"groupName": "gRPC packages"
5254
},
5355
{
54-
"packagePatterns": [
56+
"matchPackagePatterns": [
57+
"^org.eclipse.jetty:"
58+
],
59+
"groupName": "Jetty packages"
60+
},
61+
{
62+
"matchPackagePatterns": [
5563
"^io.micronaut(?:\.validation)?:"
5664
],
5765
"groupName": "Micronaut packages"
5866
},
5967
{
60-
"packagePatterns": [
68+
"matchPackagePatterns": [
6169
"^io.quarkus:"
6270
],
6371
"groupName": "Quarkus packages"
6472
},
6573
{
66-
"packagePatterns": [
74+
"matchPackagePatterns": [
6775
"^io.vertx:"
6876
],
6977
"groupName": "Vertx packages"
7078
},
7179
{
72-
"packagePatterns": [
80+
"matchPackagePatterns": [
7381
"^io.opencensus:"
7482
],
7583
"groupName": "OpenCensus packages"
7684
},
7785
{
78-
"packagePatterns": [
79-
"^org.eclipse.jetty:"
80-
],
81-
"groupName": "Jetty packages"
82-
},
83-
{
84-
"packagePatterns": [
86+
"matchPackagePatterns": [
8587
"^org.slf4j:"
8688
],
8789
"groupName": "SLF4J packages"
88-
},
89-
{
90-
"packageNames": [
91-
"javax.servlet:javax.servlet-api"
92-
],
93-
"rangeStrategy": "pin"
9490
},
9591
{
96-
"packageNames": [
92+
"matchPackageNames": [
9793
"com.microsoft.sqlserver:mssql-jdbc"
9894
],
9995
"allowedVersions": "/.+jre8.?/"
10096
},
10197
{
102-
"packagePatterns": [
98+
"matchPackagePatterns": [
10399
"scala"
104100
],
105101
"enabled": false
106102
},
107103
{
108-
"packagePatterns": [
104+
"matchPackagePatterns": [
109105
"^spark-sql"
110106
],
111107
"enabled": false
112108
},
113109
{
114-
"packagePatterns": [
110+
"matchPackagePatterns": [
115111
"^jackson-module-scala"
116112
],
117113
"enabled": false
118114
},
119115
{
120-
"packagePatterns": [
116+
"matchPackagePatterns": [
121117
"^io.ktor:",
122118
"^com.amazonaws:"
123119
],
124120
"schedule": [
125121
"before 3am on the first day of the month"
126122
]
127123
},
124+
{
125+
"matchPackagePatterns": [
126+
"org.springframework.boot"
127+
],
128+
"matchCurrentVersion": "!/.*[SNAPSHOT | M]/"
129+
},
128130
{
129131
"matchPackageNames": [
130132
"com.google.apis:google-api-services-dataflow"
@@ -133,22 +135,78 @@
133135
"description": "@anguillanneuf: This package is no longer actively maintained. Best to use the version specified in https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-dataflow/v1b3"
134136
},
135137
{
136-
"matchPackagePatterns": [ "org.springframework.boot" ],
137-
"matchCurrentVersion": "!/.*[SNAPSHOT | M]/"
138+
"matchPackagePatterns": [
139+
"org.springframework.boot"
140+
],
141+
"matchPaths": [
142+
"appengine-java11/**",
143+
"appengine-java8/**",
144+
"flexible/*",
145+
"flexible/java-11/**",
146+
"flexible/java-8/**",
147+
"cloud-sql/**",
148+
"monitoring/**",
149+
"pubsub/spring/**",
150+
"recaptcha_enterprise/**",
151+
"run/endpoints-v2-backend/*",
152+
"spanner/**",
153+
"vision/**"
154+
],
155+
"allowedVersions": "<3",
156+
"description": "@akitsch: Spring Boot V3 requires Java 17"
138157
},
139158
{
140-
"matchPackagePatterns": [ "org.springframework.boot" ],
141-
"matchPaths": ["appengine-java11/**", "appengine-java8/**", "flexible/*", "flexible/java-11/**", "flexible/java-8/**", "cloud-sql/**", "monitoring/**", "pubsub/spring/**", "recaptcha_enterprise/**", "run/endpoints-v2-backend/*", "spanner/**", "vision/**"],
142-
"allowedVersions": "<3"
159+
"matchPackagePatterns": [
160+
"^org.eclipse.jetty:"
161+
],
162+
"groupName": "Jetty packages",
163+
"allowedVersions": "<10",
164+
"matchPaths": [
165+
"appengine-java8/**",
166+
"appengine-java11/**",
167+
"appengine-java17/**",
168+
"flexible/java-8/**",
169+
"iap/**",
170+
"memorystore/redis/**",
171+
"unittests/**"
172+
],
173+
"description": "@akitsch: Java 8 on App Engine supports servlets V3.1 and Jetty V9 https://cloud.google.com/appengine/docs/flexible/java/runtime. Folders appengine-java1* needs to be migrated"
174+
},
175+
{
176+
"matchPackageNames": [
177+
"javax.servlet:javax.servlet-api"
178+
],
179+
"allowedVersions": "3.1.0",
180+
"matchPaths": [
181+
"appengine-java8/**",
182+
"appengine-java11/**",
183+
"appengine-java17/**",
184+
"flexible/java-8/**",
185+
"iap/**",
186+
"session-handling/**",
187+
"memorystore/redis/**",
188+
"unittests/**"
189+
],
190+
"description": "@akitsch: Java 8 on App Engine supports servlets V3.1 and Jetty V9 https://cloud.google.com/appengine/docs/flexible/java/runtime. Folders appengine-java1* needs to be migrated"
191+
},
192+
{
193+
"matchPackagePatterns": ["^io.micronaut"],
194+
"groupName": "Micronaut packages",
195+
"allowedVersions": "<4",
196+
"matchPaths": [
197+
"appengine-java11/**",
198+
"flexible/java-11/**"
199+
],
200+
"description": "@akitsch: Micronaut V4 requires Java 17"
143201
}
144202
],
145203
"labels": [
146204
"automerge"
147205
],
148206
"rebaseWhen": "never",
149-
"dependencyDashboard": true,
207+
"dependencyDashboard": true,
150208
"dependencyDashboardLabels": [
151209
"type: process"
152210
],
153211
"semanticCommits": true
154-
}
212+
}

‎unittests/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
</dependency>
4444
<dependency>
4545
<groupId>javax.servlet</groupId>
46-
<artifactId>servlet-api</artifactId>
47-
<version>2.5</version>
46+
<artifactId>javax.servlet-api</artifactId>
47+
<version>3.1.0</version>
48+
<type>jar</type>
4849
<scope>provided</scope>
4950
</dependency>
5051

‎vision/face-detection/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@
8484
<version>1.1.5</version>
8585
<scope>test</scope>
8686
</dependency>
87-
<dependency>
88-
<!-- for checking HTTP response codes -->
89-
<groupId>javax.servlet</groupId>
90-
<artifactId>javax.servlet-api</artifactId>
91-
<version>3.1.0</version>
92-
<scope>test</scope>
93-
</dependency>
9487
</dependencies>
9588
<build>
9689
<plugins>

0 commit comments

Comments
 (0)