Skip to content

Commit fb98270

Browse files
rmichelarmichela
authored
Merge pull request #192 from guohao/master
Bump version of grpc and protobuf
2 parents 02b8ae4 + bc21d57 commit fb98270

File tree

25 files changed

+140
-100
lines changed

25 files changed

+140
-100
lines changed

‎canteen/canteen-bootstrap/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<plugin>
2828
<groupId>org.codehaus.mojo</groupId>
2929
<artifactId>exec-maven-plugin</artifactId>
30-
<version>1.6.0</version>
30+
<version>3.1.0</version>
3131
<executions>
3232
<execution>
3333
<id>osx-x86_64</id>
@@ -140,7 +140,7 @@
140140
<plugin>
141141
<groupId>org.codehaus.mojo</groupId>
142142
<artifactId>build-helper-maven-plugin</artifactId>
143-
<version>3.0.0</version>
143+
<version>3.3.0</version>
144144
<executions>
145145
<execution>
146146
<id>osx-x86_64</id>

‎canteen/canteen-it/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
<dependency>
2929
<groupId>org.assertj</groupId>
3030
<artifactId>assertj-core</artifactId>
31-
<version>3.6.2</version>
31+
<version>3.23.1</version>
3232
<scope>test</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.codehaus.plexus</groupId>
3636
<artifactId>plexus-utils</artifactId>
37-
<version>3.1.0</version>
37+
<version>3.5.0</version>
3838
<scope>test</scope>
3939
</dependency>
4040

@@ -45,7 +45,7 @@
4545
<plugin>
4646
<groupId>org.apache.maven.plugins</groupId>
4747
<artifactId>maven-shade-plugin</artifactId>
48-
<version>3.2.1</version>
48+
<version>3.4.1</version>
4949
<executions>
5050
<execution>
5151
<phase>package</phase>
@@ -59,7 +59,7 @@
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-jar-plugin</artifactId>
62-
<version>2.4</version>
62+
<version>3.3.0</version>
6363
<configuration>
6464
<archive>
6565
<manifest>
@@ -85,7 +85,7 @@
8585

8686
<plugin>
8787
<artifactId>maven-failsafe-plugin</artifactId>
88-
<version>2.22.0</version>
88+
<version>2.22.2</version>
8989
<executions>
9090
<execution>
9191
<goals>

‎canteen/canteen-maven-plugin/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<dependency>
2525
<groupId>org.apache.maven</groupId>
2626
<artifactId>maven-core</artifactId>
27-
<version>3.8.4</version>
27+
<version>3.8.6</version>
2828
</dependency>
2929

3030
<dependency>
3131
<groupId>org.apache.maven</groupId>
3232
<artifactId>maven-plugin-api</artifactId>
33-
<version>3.8.4</version>
33+
<version>3.8.6</version>
3434
</dependency>
3535

3636
<dependency>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.apache.maven.plugin-tools</groupId>
4444
<artifactId>maven-plugin-annotations</artifactId>
45-
<version>3.6.2</version>
45+
<version>3.7.0</version>
4646
<scope>provided</scope>
4747
</dependency>
4848
</dependencies>

‎canteen/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-checkstyle-plugin</artifactId>
67-
<version>3.1.1</version>
67+
<version>3.2.0</version>
6868
<dependencies>
6969
<dependency>
7070
<groupId>com.puppycrawl.tools</groupId>
7171
<artifactId>checkstyle</artifactId>
72-
<version>8.29</version>
72+
<version>9.3</version>
7373
</dependency>
7474
</dependencies>
7575
<executions>
@@ -92,7 +92,7 @@
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-javadoc-plugin</artifactId>
95-
<version>3.1.0</version>
95+
<version>3.4.1</version>
9696
<executions>
9797
<execution>
9898
<id>attach-javadocs</id>
@@ -106,7 +106,7 @@
106106
<plugin>
107107
<groupId>org.apache.maven.plugins</groupId>
108108
<artifactId>maven-source-plugin</artifactId>
109-
<version>3.0.1</version>
109+
<version>3.2.1</version>
110110
<executions>
111111
<execution>
112112
<id>attach-sources</id>
@@ -138,7 +138,7 @@
138138
<plugin>
139139
<groupId>org.apache.maven.plugins</groupId>
140140
<artifactId>maven-gpg-plugin</artifactId>
141-
<version>1.6</version>
141+
<version>3.0.1</version>
142142
<executions>
143143
<execution>
144144
<id>sign-artifacts</id>
@@ -153,7 +153,7 @@
153153
<plugin>
154154
<groupId>org.sonatype.plugins</groupId>
155155
<artifactId>nexus-staging-maven-plugin</artifactId>
156-
<version>1.6.8</version>
156+
<version>1.6.13</version>
157157
<extensions>true</extensions>
158158
<configuration>
159159
<serverId>ossrh</serverId>

‎contrib/grpc-contrib/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@
7777
<extension>
7878
<groupId>kr.motd.maven</groupId>
7979
<artifactId>os-maven-plugin</artifactId>
80-
<version>1.4.1.Final</version>
80+
<version>1.7.1</version>
8181
</extension>
8282
</extensions>
8383
<plugins>
8484
<plugin>
8585
<groupId>org.xolstice.maven.plugins</groupId>
8686
<artifactId>protobuf-maven-plugin</artifactId>
87-
<version>0.5.0</version>
87+
<version>0.6.1</version>
8888
<configuration>
8989
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
9090
<pluginId>grpc-java</pluginId>

‎contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/FallbackResolver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public FallbackResolver thenCheck(@Nonnull NameResolverProvider provider) {
5858
}
5959

6060
@Override
61-
public NameResolver newNameResolver(URI targetUri, Attributes params) {
61+
public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) {
6262
for (NameResolverProvider provider : providers) {
63-
NameResolver resolver = provider.newNameResolver(targetUri, params);
63+
NameResolver resolver = provider.newNameResolver(targetUri, args);
6464
if (resolver != null) {
6565
return resolver;
6666
}

‎contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/StaticResolver.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private static class StaticResolverProvider extends NameResolverProvider {
9292

9393
@Nullable
9494
@Override
95-
public NameResolver newNameResolver(URI targetUri, Attributes params) {
95+
public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) {
9696
if (scheme.equals(targetUri.getScheme())) {
9797
final String authority = targetUri.getAuthority();
9898

@@ -154,8 +154,8 @@ private static class StaticResolverFactory extends NameResolver.Factory {
154154

155155
@Nullable
156156
@Override
157-
public NameResolver newNameResolver(URI targetUri, Attributes params) {
158-
return provider.newNameResolver(targetUri, params);
157+
public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) {
158+
return provider.newNameResolver(targetUri, args);
159159
}
160160

161161
@Override

‎contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/FallbackResolverTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package com.salesforce.grpc.contrib;
99

10-
import io.grpc.Attributes;
1110
import io.grpc.NameResolver;
1211
import io.grpc.NameResolverProvider;
1312
import org.junit.Test;
@@ -18,6 +17,8 @@
1817

1918
@SuppressWarnings("ALL")
2019
public class FallbackResolverTest {
20+
21+
private final NameResolverFakes fakes = new NameResolverFakes();
2122
@Test
2223
public void firstShouldFind() throws Exception {
2324
NameResolver fakeResolver = new FakeResolver();
@@ -26,7 +27,7 @@ public void firstShouldFind() throws Exception {
2627

2728
NameResolver.Factory factory = FallbackResolver.startWith(canResolve).thenCheck(cannotResolve);
2829

29-
assertEquals(fakeResolver, factory.newNameResolver(new URI("aaa://foo"), Attributes.EMPTY));
30+
assertEquals(fakeResolver, factory.newNameResolver(new URI("aaa://foo"), fakes.fakeArgs));
3031
}
3132

3233
@Test
@@ -37,7 +38,7 @@ public void secondShouldFind() throws Exception {
3738

3839
NameResolver.Factory factory = FallbackResolver.startWith(cannotResolve).thenCheck(canResolve);
3940

40-
assertEquals(fakeResolver, factory.newNameResolver(new URI("bbb://foo"), Attributes.EMPTY));
41+
assertEquals(fakeResolver, factory.newNameResolver(new URI("bbb://foo"), fakes.fakeArgs));
4142
}
4243

4344
@Test
@@ -46,7 +47,7 @@ public void neitherShouldFind() throws Exception {
4647

4748
NameResolver.Factory factory = FallbackResolver.startWith(cannotResolve).thenCheck(cannotResolve);
4849

49-
assertNull(factory.newNameResolver(new URI("bbb://foo"), Attributes.EMPTY));
50+
assertNull(factory.newNameResolver(new URI("bbb://foo"), fakes.fakeArgs));
5051
}
5152

5253
@Test
@@ -80,7 +81,7 @@ protected int priority() {
8081
}
8182

8283
@Override
83-
public NameResolver newNameResolver(URI targetUri, Attributes params) {
84+
public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) {
8485
return resolver;
8586
}
8687

‎contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/NameResolverFakes.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright (c) 2019, Salesforce.com, Inc.
3+
* All rights reserved.
4+
* Licensed under the BSD 3-Clause license.
5+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
6+
*/
7+
8+
package com.salesforce.grpc.contrib;
9+
10+
import io.grpc.NameResolver;
11+
import io.grpc.SynchronizationContext;
12+
import io.grpc.internal.GrpcUtil;
13+
14+
import java.util.Map;
15+
16+
public class NameResolverFakes {
17+
final SynchronizationContext fakeSyncContext = new SynchronizationContext(new Thread.UncaughtExceptionHandler() {
18+
@Override
19+
public void uncaughtException(Thread t, Throwable e) {
20+
e.printStackTrace();
21+
}
22+
});
23+
final NameResolver.ServiceConfigParser fakeParser =new NameResolver.ServiceConfigParser() {
24+
@Override
25+
public NameResolver.ConfigOrError parseServiceConfig(Map<String, ?> rawServiceConfig) {
26+
return NameResolver.ConfigOrError.fromConfig(new Object());
27+
}
28+
};
29+
30+
final NameResolver.Args fakeArgs = NameResolver.Args.newBuilder()
31+
.setDefaultPort(GrpcUtil.DEFAULT_PORT_PLAINTEXT)
32+
.setProxyDetector(GrpcUtil.DEFAULT_PROXY_DETECTOR)
33+
.setSynchronizationContext(fakeSyncContext)
34+
.setServiceConfigParser(fakeParser)
35+
.build();
36+
}

‎contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/StaticResolverProviderTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,31 @@
2020
import static org.junit.Assert.*;
2121

2222
public class StaticResolverProviderTest {
23+
24+
private final NameResolverFakes fakes = new NameResolverFakes();
25+
2326
private final InetSocketAddress staticAddress = new InetSocketAddress("localhost", 55555);
2427

2528
@Test
2629
public void ProviderShouldProvide() {
2730
NameResolverProvider provider = StaticResolver.provider(staticAddress);
28-
NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), Attributes.EMPTY);
31+
NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), fakes.fakeArgs);
2932

3033
assertThat(resolver).isNotNull();
3134
}
3235

3336
@Test
3437
public void ResolverShouldHaveCorrectAuthority() {
3538
NameResolverProvider provider = StaticResolver.provider(staticAddress);
36-
NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), Attributes.EMPTY);
39+
NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), fakes.fakeArgs);
3740

3841
assertThat(resolver.getServiceAuthority()).isEqualTo("some.service");
3942
}
4043

4144
@Test
4245
public void ResolverShouldResolve() {
4346
NameResolverProvider provider = StaticResolver.provider(staticAddress);
44-
NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), Attributes.EMPTY);
47+
NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), fakes.fakeArgs);
4548

4649
AtomicBoolean isResolved = new AtomicBoolean();
4750

0 commit comments

Comments
 (0)