Skip to content

Commit 2df2d50

Browse files
ludochludoch
authored
Merge branch 'main' into enable-dependabot
2 parents 23ea1ef + 944a8f9 commit 2df2d50

2 files changed

Lines changed: 57 additions & 44 deletions

File tree

‎pom.xml‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@
6868
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6969
<auto-service.version>1.1.1</auto-service.version>
7070
<auto-value.version>1.11.1</auto-value.version>
71-
<grpc.version>1.81.0</grpc.version>
71+
<grpc.version>1.84.0</grpc.version>
7272
<jetty.version>9.4.58.v20250814</jetty.version>
7373
<jetty12.version>12.0.39</jetty12.version>
7474
<jetty121.version>12.1.13</jetty121.version>
75-
<slf4j.version>2.0.18</slf4j.version>
76-
<protoc.version>4.35.1</protoc.version>
75+
<slf4j.version>2.0.20</slf4j.version>
76+
<protoc.version>4.36.2</protoc.version>
7777
<distributionManagement.snapshot.url>https://oss.sonatype.org/content/repositories/google-snapshots/</distributionManagement.snapshot.url>
7878
<distributionManagement.snapshot.id>sonatype-nexus-snapshots</distributionManagement.snapshot.id>
7979
<distributionManagement.release.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</distributionManagement.release.url>
@@ -281,6 +281,13 @@
281281

282282
<dependencyManagement>
283283
<dependencies>
284+
<dependency>
285+
<groupId>io.grpc</groupId>
286+
<artifactId>grpc-bom</artifactId>
287+
<version>${grpc.version}</version>
288+
<type>pom</type>
289+
<scope>import</scope>
290+
</dependency>
284291
<dependency>
285292
<groupId>io.grpc</groupId>
286293
<artifactId>grpc-netty-shaded</artifactId>
@@ -411,12 +418,12 @@
411418
<dependency>
412419
<groupId>com.google.api-client</groupId>
413420
<artifactId>google-api-client-appengine</artifactId>
414-
<version>2.9.0</version>
421+
<version>2.9.1</version>
415422
</dependency>
416423
<dependency>
417424
<groupId>com.google.api-client</groupId>
418425
<artifactId>google-api-client</artifactId>
419-
<version>2.9.0</version>
426+
<version>2.9.1</version>
420427
</dependency>
421428
<dependency>
422429
<groupId>com.google.appengine</groupId>
@@ -437,7 +444,7 @@
437444
<dependency>
438445
<groupId>com.google.cloud.datastore</groupId>
439446
<artifactId>datastore-v1-proto-client</artifactId>
440-
<version>3.2.0</version>
447+
<version>3.7.0</version>
441448
</dependency>
442449
<dependency>
443450
<groupId>com.google.geometry</groupId>
@@ -447,7 +454,7 @@
447454
<dependency>
448455
<groupId>org.easymock</groupId>
449456
<artifactId>easymock</artifactId>
450-
<version>5.6.0</version>
457+
<version>5.7.0</version>
451458
</dependency>
452459
<dependency>
453460
<groupId>com.google.appengine</groupId>
@@ -500,12 +507,12 @@
500507
<dependency>
501508
<groupId>com.google.api.grpc</groupId>
502509
<artifactId>proto-google-cloud-datastore-v1</artifactId>
503-
<version>3.2.0</version>
510+
<version>3.7.0</version>
504511
</dependency>
505512
<dependency>
506513
<groupId>com.google.api.grpc</groupId>
507514
<artifactId>proto-google-common-protos</artifactId>
508-
<version>2.73.0</version>
515+
<version>2.78.0</version>
509516
</dependency>
510517
<dependency>
511518
<groupId>com.google.code.findbugs</groupId>
@@ -536,7 +543,7 @@
536543
<dependency>
537544
<groupId>com.google.guava</groupId>
538545
<artifactId>guava</artifactId>
539-
<version>33.6.0-jre</version>
546+
<version>33.7.2-jre</version>
540547
</dependency>
541548
<dependency>
542549
<groupId>com.google.errorprone</groupId>
@@ -596,28 +603,28 @@
596603
<dependency>
597604
<groupId>org.apache.maven</groupId>
598605
<artifactId>maven-core</artifactId>
599-
<version>3.9.16</version>
606+
<version>3.10.0</version>
600607
</dependency>
601608
<dependency>
602609
<groupId>org.apache.ant</groupId>
603610
<artifactId>ant</artifactId>
604-
<version>1.10.17</version>
611+
<version>1.10.18</version>
605612
</dependency>
606613
<dependency>
607614
<groupId>org.apache.maven.plugin-tools</groupId>
608615
<artifactId>maven-plugin-annotations</artifactId>
609-
<version>3.15.2</version>
616+
<version>3.16.0</version>
610617
<scope>provided</scope>
611618
</dependency>
612619
<dependency>
613620
<groupId>org.apache.maven</groupId>
614621
<artifactId>maven-plugin-api</artifactId>
615-
<version>3.9.16</version>
622+
<version>3.10.0</version>
616623
</dependency>
617624
<dependency>
618625
<groupId>org.jspecify</groupId>
619626
<artifactId>jspecify</artifactId>
620-
<version>1.0.0</version>
627+
<version>1.0.1</version>
621628
</dependency>
622629
<dependency>
623630
<groupId>org.eclipse.jetty.toolchain</groupId>
@@ -643,7 +650,7 @@
643650
<dependency>
644651
<groupId>org.jsoup</groupId>
645652
<artifactId>jsoup</artifactId>
646-
<version>1.23.1</version>
653+
<version>1.23.2</version>
647654
</dependency>
648655
<dependency>
649656
<groupId>org.apache.lucene</groupId>
@@ -678,28 +685,28 @@
678685
<dependency>
679686
<groupId>com.fasterxml.jackson.core</groupId>
680687
<artifactId>jackson-core</artifactId>
681-
<version>2.22.1</version>
688+
<version>2.22.3</version>
682689
</dependency>
683690
<dependency>
684691
<groupId>joda-time</groupId>
685692
<artifactId>joda-time</artifactId>
686-
<version>2.14.2</version>
693+
<version>2.15.0</version>
687694
</dependency>
688695
<dependency>
689696
<groupId>org.json</groupId>
690697
<artifactId>json</artifactId>
691-
<version>20260522</version>
698+
<version>20260814</version>
692699
</dependency>
693700
<dependency>
694701
<groupId>commons-codec</groupId>
695702
<artifactId>commons-codec</artifactId>
696-
<version>1.22.0</version>
703+
<version>1.22.1</version>
697704
</dependency>
698705
<!-- test dependencies -->
699706
<dependency>
700707
<groupId>com.google.guava</groupId>
701708
<artifactId>guava-testlib</artifactId>
702-
<version>33.6.0-jre</version>
709+
<version>33.7.2-jre</version>
703710
<scope>test</scope>
704711
</dependency>
705712
<dependency>
@@ -717,7 +724,7 @@
717724
<dependency>
718725
<groupId>com.google.testparameterinjector</groupId>
719726
<artifactId>test-parameter-injector</artifactId>
720-
<version>1.22</version>
727+
<version>1.24</version>
721728
<scope>test</scope>
722729
</dependency>
723730

@@ -730,7 +737,7 @@
730737
<dependency>
731738
<groupId>org.mockito</groupId>
732739
<artifactId>mockito-bom</artifactId>
733-
<version>5.23.0</version>
740+
<version>5.24.0</version>
734741
<scope>import</scope>
735742
<type>pom</type>
736743
</dependency>
@@ -743,12 +750,12 @@
743750
<dependency>
744751
<groupId>com.google.cloud</groupId>
745752
<artifactId>google-cloud-logging</artifactId>
746-
<version>3.35.0</version>
753+
<version>3.40.0</version>
747754
</dependency>
748755
<dependency>
749756
<groupId>org.apache.commons</groupId>
750757
<artifactId>commons-lang3</artifactId>
751-
<version>3.20.0</version>
758+
<version>3.21.0</version>
752759
</dependency>
753760
<dependency>
754761
<groupId>javax.annotation</groupId>
@@ -758,12 +765,12 @@
758765
<dependency>
759766
<groupId>com.google.auth</groupId>
760767
<artifactId>google-auth-library-oauth2-http</artifactId>
761-
<version>1.25.0</version>
768+
<version>1.54.0</version>
762769
</dependency>
763770
<dependency>
764771
<groupId>com.google.cloud</groupId>
765772
<artifactId>google-cloud-storage</artifactId>
766-
<version>2.63.0</version>
773+
<version>2.75.0</version>
767774
</dependency>
768775
</dependencies>
769776
</dependencyManagement>
@@ -795,7 +802,7 @@
795802
<plugin>
796803
<groupId>org.apache.maven.plugins</groupId>
797804
<artifactId>maven-surefire-plugin</artifactId>
798-
<version>3.5.6</version>
805+
<version>3.6.0</version>
799806
<configuration>
800807
<systemPropertyVariables>
801808
<appengine.runtime.dir>../deployment/target/runtime-deployment-${project.version}</appengine.runtime.dir>
@@ -818,7 +825,7 @@
818825
<plugin>
819826
<groupId>org.codehaus.mojo</groupId>
820827
<artifactId>versions-maven-plugin</artifactId>
821-
<version>2.21.0</version>
828+
<version>2.22.0</version>
822829
<configuration>
823830
<rulesUri>file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
824831
<generateBackupPoms>false</generateBackupPoms>
@@ -870,7 +877,7 @@
870877
<plugin>
871878
<groupId>org.apache.maven.plugins</groupId>
872879
<artifactId>maven-compiler-plugin</artifactId>
873-
<version>3.15.0</version>
880+
<version>3.16.0</version>
874881
</plugin>
875882
<plugin>
876883
<groupId>org.apache.maven.plugins</groupId>
@@ -939,7 +946,7 @@
939946
<plugin>
940947
<groupId>org.codehaus.mojo</groupId>
941948
<artifactId>javacc-maven-plugin</artifactId>
942-
<version>3.2.0</version>
949+
<version>3.2.1</version>
943950
</plugin>
944951
<plugin>
945952
<groupId>org.codehaus.mojo</groupId>
@@ -992,7 +999,7 @@
992999
<!-- Call mvn versions:display-plugin-updates -->
9931000
<groupId>org.codehaus.mojo</groupId>
9941001
<artifactId>versions-maven-plugin</artifactId>
995-
<version>2.21.0</version>
1002+
<version>2.22.0</version>
9961003
</plugin>
9971004
</plugins>
9981005
</reporting>

‎runtime/test/src/test/java/com/google/apphosting/runtime/jetty/SizeLimitHandlerTest.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.hamcrest.CoreMatchers.containsString;
2121
import static org.hamcrest.CoreMatchers.equalTo;
2222
import static org.hamcrest.MatcherAssert.assertThat;
23+
import static org.hamcrest.Matchers.anyOf;
2324
import static org.hamcrest.Matchers.lessThan;
2425
import static org.hamcrest.Matchers.lessThanOrEqualTo;
2526
import static org.junit.Assert.assertNotNull;
@@ -227,11 +228,13 @@ public void testRequestContentAboveMaxLength() throws Exception {
227228
.send(completionListener::complete);
228229

229230
Result result = completionListener.get(5, TimeUnit.SECONDS);
230-
assertThat(result.getResponse().getStatus(), equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413));
231-
232-
// If the request was not aborted, then we expect to see the error message in the response body.
233-
if (result.getResponseFailure() == null) {
231+
if (result.getResponseFailure() == null && result.getRequestFailure() == null) {
232+
assertThat(result.getResponse().getStatus(), equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413));
234233
assertThat(received.toString(), containsString("Request body is too large"));
234+
} else {
235+
assertThat(
236+
result.getResponse().getStatus(),
237+
anyOf(equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413), equalTo(0)));
235238
}
236239
}
237240

@@ -285,11 +288,13 @@ public void testRequestContentAboveMaxLengthGzip() throws Exception {
285288
.send(completionListener::complete);
286289

287290
Result result = completionListener.get(5, TimeUnit.SECONDS);
288-
assertThat(result.getResponse().getStatus(), equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413));
289-
290-
// If the request was not aborted, then we expect to see the error message in the response body.
291-
if (result.getResponseFailure() == null) {
291+
if (result.getResponseFailure() == null && result.getRequestFailure() == null) {
292+
assertThat(result.getResponse().getStatus(), equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413));
292293
assertThat(received.toString(), containsString("Request body is too large"));
294+
} else {
295+
assertThat(
296+
result.getResponse().getStatus(),
297+
anyOf(equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413), equalTo(0)));
293298
}
294299
}
295300

@@ -336,11 +341,12 @@ public void testRequestContentLengthHeader() throws Exception {
336341

337342
Result result = completionListener.get(5, TimeUnit.SECONDS);
338343
Response response = result.getResponse();
339-
assertThat(response.getStatus(), equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413));
340-
341-
// If the request was not aborted, then we expect to see the error message in the response body.
342-
if (result.getResponseFailure() == null) {
344+
if (result.getResponseFailure() == null && result.getRequestFailure() == null) {
345+
assertThat(response.getStatus(), equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413));
343346
assertThat(received.toString(), containsString("Request body is too large"));
347+
} else {
348+
assertThat(
349+
response.getStatus(), anyOf(equalTo(HttpStatus.PAYLOAD_TOO_LARGE_413), equalTo(0)));
344350
}
345351
}
346352

0 commit comments

Comments
 (0)