Skip to content

Commit 3f0cf2c

Browse files
ludochgae-java-bot
ludoch
authored and
gae-java-bot
committed
Remove grpc gen1 related tests and dependencies only needed for frozen java8 runtime that we do not need to build anymore in open source to target java8 runtime.
PiperOrigin-RevId: 746027316 Change-Id: I76e608c6ef013dd5ea2128613a565bc0041e91f7
1 parent ebe66ac commit 3f0cf2c

21 files changed

+7
-2828
lines changed

‎THIRD-PARTY.txt

-29
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,6 @@ The repository contains 3rd-party code under the following licenses:
6565
* Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
6666
* Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
6767
* Guava Testing Library (com.google.guava:guava-testlib:31.1-jre - https://github.com/google/guava/guava-testlib)
68-
* io.grpc:grpc-alts (io.grpc:grpc-alts:1.45.1 - https://github.com/grpc/grpc-java)
69-
* io.grpc:grpc-api (io.grpc:grpc-api:1.49.0 - https://github.com/grpc/grpc-java)
70-
* io.grpc:grpc-auth (io.grpc:grpc-auth:1.42.1 - https://github.com/grpc/grpc-java)
71-
* io.grpc:grpc-context (io.grpc:grpc-context:1.27.2 - https://github.com/grpc/grpc-java)
72-
* io.grpc:grpc-context (io.grpc:grpc-context:1.42.1 - https://github.com/grpc/grpc-java)
73-
* io.grpc:grpc-context (io.grpc:grpc-context:1.49.0 - https://github.com/grpc/grpc-java)
74-
* io.grpc:grpc-core (io.grpc:grpc-core:1.45.1 - https://github.com/grpc/grpc-java)
75-
* io.grpc:grpc-core (io.grpc:grpc-core:1.49.0 - https://github.com/grpc/grpc-java)
76-
* io.grpc:grpc-googleapis (io.grpc:grpc-googleapis:1.45.1 - https://github.com/grpc/grpc-java)
77-
* io.grpc:grpc-grpclb (io.grpc:grpc-grpclb:1.42.1 - https://github.com/grpc/grpc-java)
78-
* io.grpc:grpc-netty (io.grpc:grpc-netty:1.49.0 - https://github.com/grpc/grpc-java)
79-
* io.grpc:grpc-netty-shaded (io.grpc:grpc-netty-shaded:1.45.1 - https://github.com/grpc/grpc-java)
80-
* io.grpc:grpc-protobuf (io.grpc:grpc-protobuf:1.49.0 - https://github.com/grpc/grpc-java)
81-
* io.grpc:grpc-protobuf-lite (io.grpc:grpc-protobuf-lite:1.42.1 - https://github.com/grpc/grpc-java)
82-
* io.grpc:grpc-protobuf-lite (io.grpc:grpc-protobuf-lite:1.49.0 - https://github.com/grpc/grpc-java)
83-
* io.grpc:grpc-services (io.grpc:grpc-services:1.42.1 - https://github.com/grpc/grpc-java)
84-
* io.grpc:grpc-stub (io.grpc:grpc-stub:1.49.0 - https://github.com/grpc/grpc-java)
85-
* io.grpc:grpc-xds (io.grpc:grpc-xds:1.45.1 - https://github.com/grpc/grpc-java)
8668
* J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
8769
* Jackson (org.codehaus.jackson:jackson-core-asl:1.9.13 - http://jackson.codehaus.org)
8870
* Jackson 2 extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-jackson2:1.41.7 - https://github.com/googleapis/google-http-java-client/google-http-client-jackson2)
@@ -113,17 +95,6 @@ The repository contains 3rd-party code under the following licenses:
11395
* Lucene Core (org.apache.lucene:lucene-core:2.9.4 - http://lucene.apache.org/java/lucene-core)
11496
* MortBay :: Apache EL :: API and Implementation (org.mortbay.jasper:apache-el:8.5.70 - https://github.com/jetty-project/jasper-jsp/apache-el)
11597
* MortBay :: Apache Jasper :: JSP Implementation (org.mortbay.jasper:apache-jsp:8.5.70 - https://github.com/jetty-project/jasper-jsp/apache-jsp)
116-
* Netty/Buffer (io.netty:netty-buffer:4.1.77.Final - https://netty.io/netty-buffer/)
117-
* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.77.Final - https://netty.io/netty-codec-http/)
118-
* Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.77.Final - https://netty.io/netty-codec-http2/)
119-
* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.77.Final - https://netty.io/netty-codec-socks/)
120-
* Netty/Codec (io.netty:netty-codec:4.1.77.Final - https://netty.io/netty-codec/)
121-
* Netty/Common (io.netty:netty-common:4.1.77.Final - https://netty.io/netty-common/)
122-
* Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.77.Final - https://netty.io/netty-handler-proxy/)
123-
* Netty/Handler (io.netty:netty-handler:4.1.77.Final - https://netty.io/netty-handler/)
124-
* Netty/Resolver (io.netty:netty-resolver:4.1.77.Final - https://netty.io/netty-resolver/)
125-
* Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.77.Final - https://netty.io/netty-transport-native-unix-common/)
126-
* Netty/Transport (io.netty:netty-transport:4.1.77.Final - https://netty.io/netty-transport/)
12798
* Objenesis (org.objenesis:objenesis:3.2 - http://objenesis.org/objenesis)
12899
* OpenCensus (io.opencensus:opencensus-api:0.30.0 - https://github.com/census-instrumentation/opencensus-java)
129100
* OpenCensus (io.opencensus:opencensus-api:0.31.1 - https://github.com/census-instrumentation/opencensus-java)

‎appengine-api-1.0-sdk/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@
514514
<include>org.codehaus.jackson:jackson-core-asl:*</include>
515515
<include>io.opencensus:opencensus-api:*</include>
516516
<include>io.opencensus:opencensus-contrib-http-util:*</include>
517-
<include>io.grpc:grpc-api:*</include>
518517
</includes>
519518
</artifactSet>
520519
</configuration>

‎maven-version-rules.xml

-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@
3939
<ignoreVersion type="regex">.*</ignoreVersion>
4040
</ignoreVersions>
4141
</rule>
42-
<rule groupId="io.grpc" comparisonMethod="maven">
43-
<ignoreVersions>
44-
<ignoreVersion type="regex">.*</ignoreVersion>
45-
</ignoreVersions>
46-
</rule>
4742
<rule groupId="org.mortbay.jasper" comparisonMethod="maven">
4843
<ignoreVersions>
4944
<ignoreVersion type="regex">.*</ignoreVersion>

‎pom.xml

+3-66
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@
6666
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6767
<jetty.version>9.4.57.v20241219</jetty.version>
6868
<jetty12.version>12.0.19</jetty12.version>
69-
<io.grpc>1.71.0</io.grpc>
70-
<io.netty>4.1.119.Final</io.netty>
7169
<slf4j.version>2.0.17</slf4j.version>
7270
<distributionManagement.snapshot.url>https://oss.sonatype.org/content/repositories/google-snapshots/</distributionManagement.snapshot.url>
7371
<distributionManagement.snapshot.id>sonatype-nexus-snapshots</distributionManagement.snapshot.id>
@@ -450,7 +448,7 @@
450448
<dependency>
451449
<groupId>com.google.guava</groupId>
452450
<artifactId>guava</artifactId>
453-
<version>33.4.6-jre</version>
451+
<version>33.4.7-jre</version>
454452
</dependency>
455453
<dependency>
456454
<groupId>com.google.errorprone</groupId>
@@ -597,67 +595,6 @@
597595
<artifactId>google-oauth-client-java6</artifactId>
598596
<version>1.39.0</version>
599597
</dependency>
600-
<dependency>
601-
<groupId>io.grpc</groupId>
602-
<artifactId>grpc-api</artifactId>
603-
<version>${io.grpc}</version>
604-
</dependency>
605-
<dependency>
606-
<groupId>io.grpc</groupId>
607-
<artifactId>grpc-stub</artifactId>
608-
<version>${io.grpc}</version>
609-
</dependency>
610-
<dependency>
611-
<groupId>io.grpc</groupId>
612-
<artifactId>grpc-protobuf</artifactId>
613-
<version>${io.grpc}</version>
614-
</dependency>
615-
<dependency>
616-
<groupId>io.grpc</groupId>
617-
<artifactId>grpc-netty</artifactId>
618-
<version>${io.grpc}</version>
619-
</dependency>
620-
<!-- io.netty are transitive deps needed by io.grpc-->
621-
<dependency>
622-
<groupId>io.netty</groupId>
623-
<artifactId>netty-buffer</artifactId>
624-
<version>${io.netty}</version>
625-
</dependency>
626-
<dependency>
627-
<groupId>io.netty</groupId>
628-
<artifactId>netty-codec</artifactId>
629-
<version>${io.netty}</version>
630-
</dependency>
631-
<dependency>
632-
<groupId>io.netty</groupId>
633-
<artifactId>netty-codec-http</artifactId>
634-
<version>${io.netty}</version>
635-
</dependency>
636-
<dependency>
637-
<groupId>io.netty</groupId>
638-
<artifactId>netty-codec-http2</artifactId>
639-
<version>${io.netty}</version>
640-
</dependency>
641-
<dependency>
642-
<groupId>io.netty</groupId>
643-
<artifactId>netty-common</artifactId>
644-
<version>${io.netty}</version>
645-
</dependency>
646-
<dependency>
647-
<groupId>io.netty</groupId>
648-
<artifactId>netty-handler</artifactId>
649-
<version>${io.netty}</version>
650-
</dependency>
651-
<dependency>
652-
<groupId>io.netty</groupId>
653-
<artifactId>netty-transport</artifactId>
654-
<version>${io.netty}</version>
655-
</dependency>
656-
<dependency>
657-
<groupId>io.netty</groupId>
658-
<artifactId>netty-transport-native-unix-common</artifactId>
659-
<version>${io.netty}</version>
660-
</dependency>
661598
<dependency>
662599
<groupId>org.apache.tomcat</groupId>
663600
<artifactId>juli</artifactId>
@@ -687,7 +624,7 @@
687624
<dependency>
688625
<groupId>com.google.guava</groupId>
689626
<artifactId>guava-testlib</artifactId>
690-
<version>33.4.6-jre</version>
627+
<version>33.4.7-jre</version>
691628
<scope>test</scope>
692629
</dependency>
693630
<dependency>
@@ -712,7 +649,7 @@
712649
<dependency>
713650
<groupId>org.mockito</groupId>
714651
<artifactId>mockito-bom</artifactId>
715-
<version>5.16.1</version>
652+
<version>5.17.0</version>
716653
<scope>import</scope>
717654
<type>pom</type>
718655
</dependency>

‎renovate.json

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"com.google.googlejavaformat:google-java-format",
99
"javax.servlet:javax.servlet-api",
1010
"jakarta.servlet:jakarta.servlet-api",
11-
"io.grpc:grpc-stub",
1211
"org.mortbay.jasper:apache-el",
1312
"org.mortbay.jasper:apache-jsp",
1413
"org.apache.lucene:lucene-core",

‎runtime/impl/pom.xml

-61
Original file line numberDiff line numberDiff line change
@@ -114,26 +114,6 @@
114114
<artifactId>shared-sdk</artifactId>
115115
<optional>true</optional>
116116
</dependency>
117-
<dependency>
118-
<groupId>io.grpc</groupId>
119-
<artifactId>grpc-api</artifactId>
120-
<optional>true</optional>
121-
</dependency>
122-
<dependency>
123-
<groupId>io.grpc</groupId>
124-
<artifactId>grpc-stub</artifactId>
125-
<optional>true</optional>
126-
</dependency>
127-
<dependency>
128-
<groupId>io.grpc</groupId>
129-
<artifactId>grpc-protobuf</artifactId>
130-
<optional>true</optional>
131-
</dependency>
132-
<dependency>
133-
<groupId>io.grpc</groupId>
134-
<artifactId>grpc-netty</artifactId>
135-
<optional>true</optional>
136-
</dependency>
137117
<dependency>
138118
<groupId>com.fasterxml.jackson.core</groupId>
139119
<artifactId>jackson-core</artifactId>
@@ -175,47 +155,6 @@
175155
</exclusions>
176156
<optional>true</optional>
177157
</dependency>
178-
<!-- io.netty are transitive deps needed by io.grpc-->
179-
<dependency>
180-
<groupId>io.netty</groupId>
181-
<artifactId>netty-buffer</artifactId>
182-
<optional>true</optional>
183-
</dependency>
184-
<dependency>
185-
<groupId>io.netty</groupId>
186-
<artifactId>netty-codec</artifactId>
187-
<optional>true</optional>
188-
</dependency>
189-
<dependency>
190-
<groupId>io.netty</groupId>
191-
<artifactId>netty-codec-http</artifactId>
192-
<optional>true</optional>
193-
</dependency>
194-
<dependency>
195-
<groupId>io.netty</groupId>
196-
<artifactId>netty-codec-http2</artifactId>
197-
<optional>true</optional>
198-
</dependency>
199-
<dependency>
200-
<groupId>io.netty</groupId>
201-
<artifactId>netty-common</artifactId>
202-
<optional>true</optional>
203-
</dependency>
204-
<dependency>
205-
<groupId>io.netty</groupId>
206-
<artifactId>netty-handler</artifactId>
207-
<optional>true</optional>
208-
</dependency>
209-
<dependency>
210-
<groupId>io.netty</groupId>
211-
<artifactId>netty-transport</artifactId>
212-
<optional>true</optional>
213-
</dependency>
214-
<dependency>
215-
<groupId>io.netty</groupId>
216-
<artifactId>netty-transport-native-unix-common</artifactId>
217-
<optional>true</optional>
218-
</dependency>
219158
<!-- Test dependencies. -->
220159
<dependency>
221160
<groupId>com.google.appengine</groupId>

0 commit comments

Comments
 (0)