flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump Gradle and plugin versions 

Android plugins weren't touched, since they will need a lot more testing
when doing so.
This commit is contained in:
Eric Anderson 2020-12-17 15:02:27 -08:00 committed by GitHub
parent 499694e9da
commit ec70b64610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alts/build.gradle
View File

@ -83,8 +83,7 @@ shadowJar {
publishing {
publications {
maven(MavenPublication) {
// use shadowJar and remove the original Jar
artifact shadowJar
// We want this to throw an exception if it isn't working
def originalJar = artifacts.find { dep -> dep.classifier == 'original'}
artifacts.remove(originalJar)

2
core/src/test/java/io/grpc/internal/JndiResourceResolverTest.java
View File

@ -27,6 +27,7 @@ import io.grpc.internal.JndiResourceResolverFactory.JndiResourceResolver;
import io.grpc.internal.JndiResourceResolverFactory.RecordFetcher;
import java.util.Arrays;
import java.util.List;
import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -49,6 +50,7 @@ public class JndiResourceResolverTest {
assertEquals("blah\\blah", JndiResourceResolver.unquote("\"blah\\\\blah\""));
}
@IgnoreJRERequirement
@Test
public void jndiResolverWorks() throws Exception {
Assume.assumeNoException(new JndiResourceResolverFactory().unavailabilityCause());

4
examples/example-hostname/build.gradle
View File

@ -2,8 +2,8 @@ plugins {
id 'application' // Provide convenience executables for trying out the examples.
id 'java'
id "com.google.protobuf" version "0.8.10"
id 'com.google.cloud.tools.jib' version '2.1.0' // For releasing to Docker Hub
id "com.google.protobuf" version "0.8.14"
id 'com.google.cloud.tools.jib' version '2.7.0' // For releasing to Docker Hub
}
repositories {

2
examples/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

1
netty/shaded/build.gradle
View File

@ -14,7 +14,6 @@ dependencies {
runtimeOnly libraries.netty_tcnative,
libraries.netty_epoll
testShadowImplementation files(shadowJar),
configurations.shadow,
project(':grpc-testing-proto'),
project(':grpc-testing'),
libraries.truth

12
settings.gradle
View File

@ -2,15 +2,15 @@ pluginManagement {
plugins {
id "com.android.application" version "3.5.0"
id "com.android.library" version "3.5.0"
id "com.github.johnrengelman.shadow" version "2.0.4"
id "com.github.kt3k.coveralls" version "2.0.1"
id "com.google.osdetector" version "1.4.0"
id "com.github.johnrengelman.shadow" version "6.1.0"
id "com.github.kt3k.coveralls" version "2.10.2"
id "com.google.osdetector" version "1.6.2"
id "com.google.protobuf" version "0.8.14"
id "digital.wup.android-maven-publish" version "3.6.2"
id "me.champeau.gradle.japicmp" version "0.2.5"
id "me.champeau.gradle.jmh" version "0.5.0"
id "net.ltgt.errorprone" version "1.2.1"
id "ru.vyarus.animalsniffer" version "1.5.0"
id "me.champeau.gradle.jmh" version "0.5.2"
id "net.ltgt.errorprone" version "1.3.0"
id "ru.vyarus.animalsniffer" version "1.5.2"
}
resolutionStrategy {
eachPlugin {

5
xds/build.gradle
View File

@ -132,8 +132,9 @@ jacocoTestReport {
publishing {
publications {
maven(MavenPublication) {
artifact shadowJar
artifacts.removeAll { it.classifier == 'original' }
// We want this to throw an exception if it isn't working
def originalJar = artifacts.find { dep -> dep.classifier == 'original'}
artifacts.remove(originalJar)
pom.withXml {
def dependenciesNode = new Node(null, 'dependencies')

5
xds/src/test/java/io/grpc/xds/internal/sds/trust/SdsX509TrustManagerTest.java
View File

@ -48,7 +48,6 @@ import org.junit.runners.JUnit4;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import sun.security.validator.ValidatorException;
/**
* Unit tests for {@link SdsX509TrustManager}.
@ -283,7 +282,7 @@ public class SdsX509TrustManagerTest {
try {
trustManager.checkServerTrusted(badServerCert, "ECDHE_ECDSA", sslEngine);
fail("exception expected");
} catch (ValidatorException expected) {
} catch (CertificateException expected) {
assertThat(expected).hasMessageThat()
.endsWith("unable to find valid certification path to requested target");
}
@ -310,7 +309,7 @@ public class SdsX509TrustManagerTest {
try {
trustManager.checkServerTrusted(badServerCert, "ECDHE_ECDSA", sslSocket);
fail("exception expected");
} catch (ValidatorException expected) {
} catch (CertificateException expected) {
assertThat(expected).hasMessageThat()
.endsWith("unable to find valid certification path to requested target");
}