mirror of https://github.com/grpc/grpc-java.git
Upgrade dependencies
All the changes outside libs.versions.toml and examples were because of ErrorProne. It didn't actually find anything to fix; signal vs noise has gotten pretty bad with the newer checks. Status was changed for ErrorProne's SuperCallToObjectMethod. With the old code it didn't notice the trivial implementation. The fail-for-test code wasn't used, so it was easiest to just remove it. Some of the libs had their versions inlined; now that we have :checkForUpdates it isn't much of a risk for versions to diverge when there's only a few artifacts sharing a version. If we need 4+ artifacts to have the same version, then it makes sense to still use a shared version. Dependencies not upgraded: google-auth-libray, mockito, netty, cronet
This commit is contained in:
Eric Anderson
GitHub
parent
68b14aaa49
commit
c985797d90
|
|
@ -234,10 +234,6 @@ public final class Status {
|
|||
}
|
||||
}
|
||||
|
||||
private static final String TEST_EQUALS_FAILURE_PROPERTY = "io.grpc.Status.failOnEqualsForTest";
|
||||
private static final boolean FAIL_ON_EQUALS_FOR_TEST =
|
||||
Boolean.parseBoolean(System.getProperty(TEST_EQUALS_FAILURE_PROPERTY, "false"));
|
||||
|
||||
// Create the canonical list of Status instances indexed by their code values.
|
||||
private static final List<Status> STATUS_LIST = buildStatusList();
|
||||
|
||||
|
|
@ -662,8 +658,6 @@ public final class Status {
|
|||
*/
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
assert !FAIL_ON_EQUALS_FOR_TEST
|
||||
: "Status.equals called; disable this by setting " + TEST_EQUALS_FAILURE_PROPERTY;
|
||||
return super.equals(obj);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
@ -60,6 +60,6 @@ dependencies {
|
|||
implementation 'org.apache.tomcat:annotations-api:6.0.53'
|
||||
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
testImplementation 'com.google.truth:truth:1.0.1'
|
||||
testImplementation 'com.google.truth:truth:1.1.5'
|
||||
testImplementation 'io.grpc:grpc-testing:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ android {
|
|||
}
|
||||
|
||||
protobuf {
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.24.0' }
|
||||
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
|
||||
plugins {
|
||||
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.24.0'
|
||||
def protobufVersion = '3.25.1'
|
||||
def protocVersion = protobufVersion
|
||||
|
||||
dependencies {
|
||||
|
|
@ -40,7 +40,7 @@ dependencies {
|
|||
|
||||
testImplementation "io.grpc:grpc-testing:${grpcVersion}"
|
||||
testImplementation "junit:junit:4.13.2"
|
||||
testImplementation "org.mockito:mockito-core:3.4.0"
|
||||
testImplementation "org.mockito:mockito-core:4.4.0"
|
||||
}
|
||||
|
||||
protobuf {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.24.0'
|
||||
def protocVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.24.0'
|
||||
def protobufVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protoc.version>3.24.0</protoc.version>
|
||||
<protoc.version>3.25.1</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<dependency> <!-- prevent downgrade of version in protobuf-java-util from grpc-services -->
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>32.0.1-jre</version>
|
||||
<version>32.1.3-jre</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.24.0'
|
||||
def protobufVersion = '3.25.1'
|
||||
def protocVersion = protobufVersion
|
||||
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ dependencies {
|
|||
implementation "io.grpc:grpc-stub:${grpcVersion}"
|
||||
implementation "io.grpc:grpc-auth:${grpcVersion}"
|
||||
compileOnly "org.apache.tomcat:annotations-api:6.0.53"
|
||||
implementation "com.google.auth:google-auth-library-oauth2-http:0.9.0"
|
||||
implementation "com.google.auth:google-auth-library-oauth2-http:1.4.0"
|
||||
implementation "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24"
|
||||
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protobuf.version>3.24.0</protobuf.version>
|
||||
<protobuf.version>3.25.1</protobuf.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
<dependency>
|
||||
<groupId>com.google.auth</groupId>
|
||||
<artifactId>google-auth-library-oauth2-http</artifactId>
|
||||
<version>0.9.0</version>
|
||||
<version>1.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.api.grpc</groupId>
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<version>4.4.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.24.0'
|
||||
def protocVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.24.0'
|
||||
def protobufVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protoc.version>3.24.0</protoc.version>
|
||||
<protoc.version>3.25.1</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<dependency> <!-- prevent downgrade of version in protobuf-java-util from grpc-services -->
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>32.0.1-jre</version>
|
||||
<version>32.1.3-jre</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.24.0'
|
||||
def protobufVersion = '3.25.1'
|
||||
def protocVersion = protobufVersion
|
||||
|
||||
dependencies {
|
||||
|
|
@ -39,7 +39,7 @@ dependencies {
|
|||
|
||||
testImplementation "io.grpc:grpc-testing:${grpcVersion}"
|
||||
testImplementation "junit:junit:4.13.2"
|
||||
testImplementation "org.mockito:mockito-core:3.4.0"
|
||||
testImplementation "org.mockito:mockito-core:4.4.0"
|
||||
}
|
||||
|
||||
protobuf {
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protobuf.version>3.24.0</protobuf.version>
|
||||
<protoc.version>3.24.0</protoc.version>
|
||||
<protobuf.version>3.25.1</protobuf.version>
|
||||
<protoc.version>3.25.1</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<version>4.4.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protobufVersion = '3.24.0'
|
||||
def protobufVersion = '3.25.1'
|
||||
def protocVersion = protobufVersion
|
||||
|
||||
dependencies {
|
||||
|
|
@ -39,7 +39,7 @@ dependencies {
|
|||
|
||||
testImplementation "io.grpc:grpc-testing:${grpcVersion}"
|
||||
testImplementation "junit:junit:4.13.2"
|
||||
testImplementation "org.mockito:mockito-core:3.4.0"
|
||||
testImplementation "org.mockito:mockito-core:4.4.0"
|
||||
}
|
||||
|
||||
protobuf {
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protobuf.version>3.24.0</protobuf.version>
|
||||
<protoc.version>3.24.0</protoc.version>
|
||||
<protobuf.version>3.25.1</protobuf.version>
|
||||
<protoc.version>3.25.1</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<version>4.4.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ java {
|
|||
}
|
||||
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.24.0'
|
||||
def protocVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ java {
|
|||
}
|
||||
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.24.0'
|
||||
def protocVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ java {
|
|||
}
|
||||
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.24.0'
|
||||
def protocVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.24.0'
|
||||
def protocVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protoc.version>3.24.0</protoc.version>
|
||||
<protoc.version>3.25.1</protoc.version>
|
||||
<!-- required for jdk9 -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ java {
|
|||
// Feel free to delete the comment at the next line. It is just for safely
|
||||
// updating the version in our release process.
|
||||
def grpcVersion = '1.61.0-SNAPSHOT' // CURRENT_GRPC_VERSION
|
||||
def protocVersion = '3.24.0'
|
||||
def protocVersion = '3.25.1'
|
||||
|
||||
dependencies {
|
||||
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<grpc.version>1.61.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
|
||||
<protobuf.version>3.24.0</protobuf.version>
|
||||
<protoc.version>3.24.0</protoc.version>
|
||||
<protobuf.version>3.25.1</protobuf.version>
|
||||
<protoc.version>3.25.1</protoc.version>
|
||||
<!-- required for JDK 8 -->
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
|
@ -55,20 +55,10 @@
|
|||
<artifactId>protobuf-java-util</artifactId>
|
||||
<version>${protobuf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.10.1</version> <!-- prevent downgrade via protobuf-java-util -->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>32.0.1-jre</version> <!-- prevent downgrade of version in protobuf-java-util -->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.j2objc</groupId>
|
||||
<artifactId>j2objc-annotations</artifactId>
|
||||
<version>2.8</version> <!-- prevent downgrade of version in guava -->
|
||||
<version>32.1.3-jre</version> <!-- prevent downgrade of version in protobuf-java-util -->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
|
|
@ -90,7 +80,7 @@
|
|||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<version>4.4.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ import io.opencensus.trace.SpanId;
|
|||
import io.opencensus.trace.TraceId;
|
||||
import io.opencensus.trace.TraceOptions;
|
||||
import io.opencensus.trace.Tracestate;
|
||||
import java.net.InetAddress;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.SocketAddress;
|
||||
import java.nio.charset.Charset;
|
||||
|
|
@ -104,7 +103,8 @@ public class InternalLoggingChannelInterceptorTest {
|
|||
private AtomicReference<Object> actualRequest;
|
||||
private SettableFuture<Void> halfCloseCalled;
|
||||
private SettableFuture<Void> cancelCalled;
|
||||
private SocketAddress peer;
|
||||
@SuppressWarnings("AddressSelection") // It will only be one address
|
||||
private SocketAddress peer = new InetSocketAddress("127.0.0.1", 1234);
|
||||
private LogHelper mockLogHelper;
|
||||
private ConfigFilterHelper mockFilterHelper;
|
||||
private FilterParams filterParams;
|
||||
|
|
@ -119,7 +119,6 @@ public class InternalLoggingChannelInterceptorTest {
|
|||
actualRequest = new AtomicReference<>();
|
||||
halfCloseCalled = SettableFuture.create();
|
||||
cancelCalled = SettableFuture.create();
|
||||
peer = new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 1234);
|
||||
filterParams = FilterParams.create(true, 0, 0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ import io.grpc.internal.NoopServerCall;
|
|||
import io.grpc.observabilitylog.v1.GrpcLogRecord.EventLogger;
|
||||
import io.grpc.observabilitylog.v1.GrpcLogRecord.EventType;
|
||||
import io.opencensus.trace.SpanContext;
|
||||
import java.net.InetAddress;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.SocketAddress;
|
||||
import java.nio.charset.Charset;
|
||||
|
|
@ -87,7 +86,8 @@ public class InternalLoggingServerInterceptorTest {
|
|||
private AtomicReference<Metadata> actualTrailers;
|
||||
private LogHelper mockLogHelper;
|
||||
private ConfigFilterHelper mockFilterHelper;
|
||||
private SocketAddress peer;
|
||||
@SuppressWarnings("AddressSelection") // It will only be one address
|
||||
private SocketAddress peer = new InetSocketAddress("127.0.0.1", 1234);
|
||||
|
||||
@Before
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -101,7 +101,6 @@ public class InternalLoggingServerInterceptorTest {
|
|||
actualResponse = new AtomicReference<>();
|
||||
actualStatus = new AtomicReference<>();
|
||||
actualTrailers = new AtomicReference<>();
|
||||
peer = new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 1234);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ import org.junit.runners.JUnit4;
|
|||
/**
|
||||
* Tests for {@link LogHelper}.
|
||||
*/
|
||||
@SuppressWarnings("AddressSelection") // It will only be one address
|
||||
@RunWith(JUnit4.class)
|
||||
public class LogHelperTest {
|
||||
public static final Marshaller<byte[]> BYTEARRAY_MARSHALLER = new ByteArrayMarshaller();
|
||||
|
|
|
|||
|
|
@ -2,57 +2,45 @@
|
|||
# Compatibility problem with internal version getting onto 1.5.3.
|
||||
# https://github.com/grpc/grpc-java/pull/9118
|
||||
googleauth = "1.4.0"
|
||||
# Update notes / 2023-07-19 sergiitk:
|
||||
# Couldn't update to 32.1.1 because Guava 32.1.0 broke gradle metadata:
|
||||
# https://github.com/google/guava/releases/tag/v32.1.0
|
||||
# 32.1.1 partially fixed this, but our build still breaks with:
|
||||
# Could not resolve com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava.
|
||||
#
|
||||
# TODO(any release manager): attempt removing runtimeOnly dependencies when guava upgraded:
|
||||
# - okhttp: errorprone.annotations
|
||||
#
|
||||
# Allowed to be different from guava-jre.
|
||||
guava = '32.0.1-android'
|
||||
netty = '4.1.100.Final'
|
||||
# Keep the following references of tcnative version in sync whenever it's updated:
|
||||
# SECURITY.md
|
||||
nettytcnative = '2.0.61.Final'
|
||||
opencensus = "0.31.1"
|
||||
opentelemetry = "1.31.0"
|
||||
protobuf = "3.24.0"
|
||||
protobuf = "3.25.1"
|
||||
|
||||
[libraries]
|
||||
android-annotations = "com.google.android:annotations:4.1.1.4"
|
||||
androidx-annotation = "androidx.annotation:annotation:1.6.0"
|
||||
androidx-core = "androidx.core:core:1.10.1"
|
||||
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.1"
|
||||
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.6.1"
|
||||
androidx-annotation = "androidx.annotation:annotation:1.7.0"
|
||||
androidx-core = "androidx.core:core:1.12.0"
|
||||
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.2"
|
||||
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.6.2"
|
||||
androidx-test-core = "androidx.test:core:1.5.0"
|
||||
androidx-test-ext-junit = "androidx.test.ext:junit:1.1.5"
|
||||
androidx-test-rules = "androidx.test:rules:1.5.0"
|
||||
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.23"
|
||||
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23"
|
||||
auto-value = "com.google.auto.value:auto-value:1.10.2"
|
||||
auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.10.2"
|
||||
checkstyle = "com.puppycrawl.tools:checkstyle:10.12.1"
|
||||
auto-value = "com.google.auto.value:auto-value:1.10.4"
|
||||
auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.10.4"
|
||||
checkstyle = "com.puppycrawl.tools:checkstyle:10.12.5"
|
||||
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
|
||||
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
|
||||
cronet-api = "org.chromium.net:cronet-api:108.5359.79"
|
||||
cronet-embedded = "org.chromium.net:cronet-embedded:108.5359.79"
|
||||
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.20.0"
|
||||
errorprone-core = "com.google.errorprone:error_prone_core:2.20.0"
|
||||
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.22.0"
|
||||
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.23.0"
|
||||
errorprone-core = "com.google.errorprone:error_prone_core:2.23.0"
|
||||
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.29.0"
|
||||
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "googleauth" }
|
||||
google-auth-oauth2Http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "googleauth" }
|
||||
# Release notes: https://cloud.google.com/logging/docs/release-notes
|
||||
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.15.5"
|
||||
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.15.14"
|
||||
gson = "com.google.code.gson:gson:2.10.1"
|
||||
guava = { module = "com.google.guava:guava", version.ref = "guava" }
|
||||
guava = "com.google.guava:guava:32.1.3-android"
|
||||
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
|
||||
guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava" }
|
||||
guava-testlib = "com.google.guava:guava-testlib:32.1.3-android"
|
||||
# JRE version is needed for projects where its a transitive dependency, f.e. gcp-observability.
|
||||
# May be different from the -android version.
|
||||
guava-jre = "com.google.guava:guava:32.0.1-jre"
|
||||
guava-jre = "com.google.guava:guava:32.1.3-jre"
|
||||
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.1.12"
|
||||
javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
|
||||
j2objc-annotations = " com.google.j2objc:j2objc-annotations:2.8"
|
||||
|
|
@ -74,22 +62,23 @@ netty-tcnative-classes = { module = "io.netty:netty-tcnative-classes", version.r
|
|||
netty-transport-epoll = { module = "io.netty:netty-transport-native-epoll", version.ref = "netty" }
|
||||
netty-unix-common = { module = "io.netty:netty-transport-native-unix-common", version.ref = "netty" }
|
||||
okhttp = "com.squareup.okhttp:okhttp:2.7.5"
|
||||
okio = "com.squareup.okio:okio:2.10.0"
|
||||
# okio 3.5+ uses Kotlin 1.9+ which requires Android Gradle Plugin 9+
|
||||
okio = "com.squareup.okio:okio:3.4.0"
|
||||
opencensus-api = { module = "io.opencensus:opencensus-api", version.ref = "opencensus" }
|
||||
opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-grpc-metrics", version.ref = "opencensus" }
|
||||
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
|
||||
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
|
||||
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
|
||||
opencensus-proto = "io.opencensus:opencensus-proto:0.2.0"
|
||||
opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry" }
|
||||
opentelemetry-sdk-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
|
||||
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.32.0"
|
||||
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.32.0"
|
||||
perfmark-api = "io.perfmark:perfmark-api:0.26.0"
|
||||
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
|
||||
protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" }
|
||||
protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf" }
|
||||
protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
|
||||
re2j = "com.google.re2j:re2j:1.7"
|
||||
robolectric = "org.robolectric:robolectric:4.10.3"
|
||||
robolectric = "org.robolectric:robolectric:4.11.1"
|
||||
signature-android = "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4"
|
||||
signature-java = "org.codehaus.mojo.signature:java18:1.0"
|
||||
truth = "com.google.truth:truth:1.1.5"
|
||||
|
|
|
|||
|
|
@ -369,6 +369,7 @@ public class NettyAdaptiveCumulatorTest {
|
|||
@Test
|
||||
public void mergeWithCompositeTail_tailExpandable_reallocateInMemory() {
|
||||
int tailFastCapacity = tail.writerIndex() + tail.maxFastWritableBytes();
|
||||
@SuppressWarnings("InlineMeInliner") // Requires Java 11
|
||||
String inSuffixOverFastBytes = Strings.repeat("a", tailFastCapacity + 1);
|
||||
int newTailSize = tail.readableBytes() + inSuffixOverFastBytes.length();
|
||||
composite.addFlattenedComponents(true, tail);
|
||||
|
|
@ -431,6 +432,7 @@ public class NettyAdaptiveCumulatorTest {
|
|||
@Test
|
||||
public void mergeWithCompositeTail_tailNotExpandable_maxCapacityReached() {
|
||||
// Fill in tail to the maxCapacity.
|
||||
@SuppressWarnings("InlineMeInliner") // Requires Java 11
|
||||
String tailSuffixFullCapacity = Strings.repeat("a", tail.maxWritableBytes());
|
||||
tail.writeCharSequence(tailSuffixFullCapacity, US_ASCII);
|
||||
composite.addFlattenedComponents(true, tail);
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@ public class NettyChannelBuilderTest {
|
|||
thrown.expect(IllegalArgumentException.class);
|
||||
thrown.expectMessage("Invalid host or port");
|
||||
|
||||
@SuppressWarnings("AddressSelection") // We actually expect zero addresses!
|
||||
Object unused =
|
||||
NettyChannelBuilder.forAddress(new InetSocketAddress("invalid_authority", 1234));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -546,6 +546,7 @@ public class NettyClientTransportTest {
|
|||
|
||||
@Test
|
||||
public void huffmanCodingShouldNotBePerformed() throws Exception {
|
||||
@SuppressWarnings("InlineMeInliner") // Requires Java 11
|
||||
String longStringOfA = Strings.repeat("a", 128);
|
||||
|
||||
negotiator = ProtocolNegotiators.serverPlaintext();
|
||||
|
|
|
|||
|
|
@ -23,11 +23,6 @@ dependencies {
|
|||
// Make okhttp dependencies compile only
|
||||
compileOnly libraries.okhttp
|
||||
|
||||
// Needed because com.google.guava:guava:32.0.1-android requires
|
||||
// com.google.errorprone:error_prone_annotations version 2.18.0, while we are running newer.
|
||||
// TODO(any release manager): remove when guava is updated
|
||||
runtimeOnly libraries.errorprone.annotations
|
||||
|
||||
// Tests depend on base class defined by core module.
|
||||
testImplementation testFixtures(project(':grpc-core')),
|
||||
testFixtures(project(':grpc-api')),
|
||||
|
|
|
|||
|
|
@ -293,6 +293,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
|
|||
/**
|
||||
* Create a transport connected to a fake peer for test.
|
||||
*/
|
||||
@SuppressWarnings("AddressSelection") // An IP address always returns one address
|
||||
@VisibleForTesting
|
||||
OkHttpClientTransport(
|
||||
OkHttpChannelBuilder.OkHttpTransportFactory transportFactory,
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ public final class Credentials {
|
|||
}
|
||||
|
||||
/** Returns an auth credential for the Basic scheme. */
|
||||
@SuppressWarnings("StringCharset") // Changing old code doesn't fix any bugs and using
|
||||
// Charsets/StandardCharsets adds bloat
|
||||
public static String basic(String userName, String password) {
|
||||
try {
|
||||
String usernameAndPassword = userName + ":" + password;
|
||||
|
|
|
|||
|
|
@ -11,20 +11,20 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
|||
# )
|
||||
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
|
||||
"com.google.android:annotations:4.1.1.4",
|
||||
"com.google.api.grpc:proto-google-common-protos:2.22.0",
|
||||
"com.google.api.grpc:proto-google-common-protos:2.29.0",
|
||||
"com.google.auth:google-auth-library-credentials:1.4.0",
|
||||
"com.google.auth:google-auth-library-oauth2-http:1.4.0",
|
||||
"com.google.auto.value:auto-value-annotations:1.10.2",
|
||||
"com.google.auto.value:auto-value:1.10.2",
|
||||
"com.google.auto.value:auto-value-annotations:1.10.4",
|
||||
"com.google.auto.value:auto-value:1.10.4",
|
||||
"com.google.code.findbugs:jsr305:3.0.2",
|
||||
"com.google.code.gson:gson:2.10.1",
|
||||
"com.google.errorprone:error_prone_annotations:2.20.0",
|
||||
"com.google.errorprone:error_prone_annotations:2.23.0",
|
||||
"com.google.guava:failureaccess:1.0.1",
|
||||
"com.google.guava:guava:32.0.1-android",
|
||||
"com.google.guava:guava:32.1.3-android",
|
||||
"com.google.re2j:re2j:1.7",
|
||||
"com.google.truth:truth:1.1.5",
|
||||
"com.squareup.okhttp:okhttp:2.7.5",
|
||||
"com.squareup.okio:okio:2.10.0",
|
||||
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
|
||||
"io.netty:netty-buffer:4.1.100.Final",
|
||||
"io.netty:netty-codec-http2:4.1.100.Final",
|
||||
"io.netty:netty-codec-http:4.1.100.Final",
|
||||
|
|
@ -143,18 +143,18 @@ def com_google_protobuf():
|
|||
# This statement defines the @com_google_protobuf repo.
|
||||
http_archive(
|
||||
name = "com_google_protobuf",
|
||||
sha256 = "5980276108f948e1ada091475549a8c75dc83c193129aab0e986ceaac3e97131",
|
||||
strip_prefix = "protobuf-24.0",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v24.0/protobuf-24.0.zip"],
|
||||
sha256 = "9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42",
|
||||
strip_prefix = "protobuf-25.1",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz"],
|
||||
)
|
||||
|
||||
def com_google_protobuf_javalite():
|
||||
# java_lite_proto_library rules implicitly depend on @com_google_protobuf_javalite
|
||||
http_archive(
|
||||
name = "com_google_protobuf_javalite",
|
||||
sha256 = "5980276108f948e1ada091475549a8c75dc83c193129aab0e986ceaac3e97131",
|
||||
strip_prefix = "protobuf-24.0",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v24.0/protobuf-24.0.zip"],
|
||||
sha256 = "9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42",
|
||||
strip_prefix = "protobuf-25.1",
|
||||
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz"],
|
||||
)
|
||||
|
||||
def io_grpc_grpc_proto():
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ import org.mockito.ArgumentCaptor;
|
|||
import org.mockito.ArgumentMatchers;
|
||||
|
||||
/** Tests for {@link BinlogHelper}. */
|
||||
@SuppressWarnings("AddressSelection") // It will only be one address
|
||||
@RunWith(JUnit4.class)
|
||||
public final class BinlogHelperTest {
|
||||
private static final Charset US_ASCII = Charset.forName("US-ASCII");
|
||||
|
|
|
|||
Loading…
Reference in New Issue