Skip to content

Commit

Permalink
Update dependencies (#3013)
Browse files Browse the repository at this point in the history
- Dropwizard Metrics 4.1.11 -> 4.1.12.1
- gRPC 1.31.0 -> 1.31.1
- kafka-clients 2.5.0 -> 2.6.0
- Micrometer 1.5.3 -> 1.5.4, 1.3.11 -> 1.3.12
- RxJava 3.0.5 -> 3.0.6
- Spring Boot 2.3.2 -> 2.3.3
- Shaded dependencies:
  - fastutil 8.4.0 -> 8.4.1
  - JCTools 3.0.0 -> 3.1.0
- Examples:
  - scalapb-runtime 0.10.7 -> 0.10.8
- Build:
  - Gradle 6.5.1 -> 6.6
  - finagle-serversets 20.7.0 -> 20.8.0
  - gax-grpc 1.57.1 -> 1.58.2
  - JMH 1.23 -> 1.25
  - Mockito 3.4.6 -> 3.5.2
  - monix-reactive 3.2.2 -> 3.2.2+43
  - protobuf-gradle-plugin 0.8.12 -> 0.8.13
- Also updated frontend dependencies
  • Loading branch information
trustin committed Aug 21, 2020
1 parent a7604e7 commit 3262e1d
Show file tree
Hide file tree
Showing 14 changed files with 2,083 additions and 1,161 deletions.
32 changes: 16 additions & 16 deletions dependencies.yml
Expand Up @@ -4,9 +4,9 @@

boms:
- com.fasterxml.jackson:jackson-bom:2.11.2
- io.dropwizard.metrics:metrics-bom:4.1.11
- io.grpc:grpc-bom:1.31.0
- io.micrometer:micrometer-bom:1.5.3
- io.dropwizard.metrics:metrics-bom:4.1.12.1
- io.grpc:grpc-bom:1.31.1
- io.micrometer:micrometer-bom:1.5.4
# NOTE: When changing this, re-evaluate netty-tcnative-boringssl-static below
- io.netty:netty-bom:4.1.51.Final
- io.zipkin.brave:brave-bom:5.12.4
Expand Down Expand Up @@ -61,7 +61,7 @@ com.github.node-gradle:
gradle-node-plugin: { version: '2.2.4' }

com.google.api:
gax-grpc: { version: '1.57.1' }
gax-grpc: { version: '1.58.2' }

com.google.code.findbugs:
jsr305: { version: '3.0.2' }
Expand Down Expand Up @@ -116,7 +116,7 @@ com.google.protobuf:
version: *PROTOBUF_VERSION
exclusions:
- com.google.errorprone:error_prone_annotations
protobuf-gradle-plugin: { version: '0.8.12' }
protobuf-gradle-plugin: { version: '0.8.13' }
protoc: { version: *PROTOBUF_VERSION }

# Akka is used only for testing in it:grpcweb module.
Expand Down Expand Up @@ -151,7 +151,7 @@ com.squareup.retrofit2:
converter-jackson: { version: *RETROFIT2_VERSION }

com.thesamet.scalapb:
scalapb-runtime_2.13: { version: &SCALAPB_VERSION '0.10.7' }
scalapb-runtime_2.13: { version: &SCALAPB_VERSION '0.10.8' }
scalapb-runtime-grpc_2.13: { version: *SCALAPB_VERSION }
scalapb-json4s_2.13: { version: '0.10.1' }

Expand All @@ -164,7 +164,7 @@ com.typesafe.akka:
# Finagle is used only for testing in zookeeper module.
com.twitter:
finagle-serversets_2.13:
version: '20.7.0'
version: '20.8.0'

gradle.plugin.net.davidecavestro:
gradle-jxr-plugin: { version: '0.2.1' }
Expand Down Expand Up @@ -228,7 +228,7 @@ io.micrometer:

# This is only used for examples/grpc-scala
io.monix:
monix-reactive_2.13: { version: '3.2.2' }
monix-reactive_2.13: { version: '3.2.2+43-36c1ada8' }

io.netty:
netty-common:
Expand Down Expand Up @@ -261,7 +261,7 @@ io.reactivex.rxjava2:

io.reactivex.rxjava3:
rxjava:
version: '3.0.5'
version: '3.0.6'
javadocs:
- http://reactivex.io/RxJava/3.x/javadoc/

Expand All @@ -274,7 +274,7 @@ io.zipkin.brave:

it.unimi.dsi:
fastutil:
version: '8.4.0'
version: '8.4.1'
relocations:
- from: it.unimi.dsi.fastutil
to: com.linecorp.armeria.internal.shaded.fastutil
Expand Down Expand Up @@ -360,9 +360,9 @@ org.apache.httpcomponents:

org.apache.kafka:
kafka-clients:
version: '2.5.0'
version: '2.6.0'
javadocs:
- https://kafka.apache.org/25/javadoc/
- https://kafka.apache.org/26/javadoc/

org.apache.thrift:
libthrift:
Expand Down Expand Up @@ -438,7 +438,7 @@ org.hibernate.validator:

org.jctools:
jctools-core:
version: '3.0.0'
version: '3.1.0'
relocations:
- from: org.jctools
to: com.linecorp.armeria.internal.shaded.jctools
Expand All @@ -463,14 +463,14 @@ org.jsoup:
jsoup: { version: '1.13.1' }

org.mockito:
mockito-core: { version: &MOCKITO_VERSION '3.4.6' }
mockito-core: { version: &MOCKITO_VERSION '3.5.2' }
mockito-junit-jupiter: { version: *MOCKITO_VERSION }

org.mortbay.jetty.alpn:
jetty-alpn-agent: { version: '2.0.10' }

org.openjdk.jmh:
jmh-core: { version: &JMH_VERSION '1.23' }
jmh-core: { version: &JMH_VERSION '1.25' }
jmh-generator-annprocess: { version: *JMH_VERSION }

org.opensaml:
Expand Down Expand Up @@ -519,7 +519,7 @@ org.springframework:

org.springframework.boot:
spring-boot-starter:
version: &SPRING_BOOT_VERSION '2.3.2.RELEASE'
version: &SPRING_BOOT_VERSION '2.3.3.RELEASE'
javadocs:
- https://docs.spring.io/spring/docs/current/javadoc-api/
spring-boot-actuator-autoconfigure: { version: *SPRING_BOOT_VERSION }
Expand Down
69 changes: 43 additions & 26 deletions docs-client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions docs-client/package.json
Expand Up @@ -13,11 +13,11 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.56",
"core-js": "^3.6.5",
"dayjs": "^1.8.31",
"dayjs": "^1.8.34",
"jsonminify": "^0.4.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-dropdown": "^1.7.0",
"react-dropdown": "^1.8.0",
"react-helmet": "^6.1.0",
"react-hot-loader": "^4.12.21",
"react-router": "^5.2.0",
Expand All @@ -27,19 +27,19 @@
"regenerator-runtime": "^0.13.7"
},
"devDependencies": {
"@babel/core": "^7.11.0",
"@babel/core": "^7.11.4",
"@babel/preset-env": "^7.11.0",
"@babel/preset-react": "^7.10.4",
"@types/favicons-webpack-plugin": "^1.0.0",
"@types/html-webpack-plugin": "^3.2.3",
"@types/jsonminify": "^0.4.0",
"@types/material-ui": "^0.21.7",
"@types/node": "^14.0.27",
"@types/react": "^16.9.44",
"@types/material-ui": "^0.21.8",
"@types/node": "^14.6.0",
"@types/react": "^16.9.46",
"@types/react-dom": "^16.9.8",
"@types/react-helmet": "^6.0.0",
"@types/react-helmet": "^6.1.0",
"@types/react-router-dom": "^5.1.5",
"@types/react-select": "^3.0.15",
"@types/react-select": "^3.0.19",
"@types/react-syntax-highlighter": "^11.0.4",
"@types/webpack": "^4.41.21",
"@types/webpack-dev-server": "^3.11.0",
Expand Down
5 changes: 5 additions & 0 deletions docs-client/src/components/GotoSelect/index.tsx
Expand Up @@ -53,6 +53,7 @@ interface OptionType {

interface GroupType {
label: string;
value: string;
options: OptionType[];
}

Expand Down Expand Up @@ -288,6 +289,7 @@ function makeSuggestions(
if (specification.getServices().length > 0 && remain > 0) {
suggestions.push({
label: 'Services',
value: 'group:services',
options: specification.getServices().flatMap((service) => {
return service.methods
.map((method) => {
Expand All @@ -304,6 +306,7 @@ function makeSuggestions(
if (specification.getEnums().length > 0 && remain > 0) {
suggestions.push({
label: 'Enums',
value: 'group:enums',
options: specification
.getEnums()
.map((enm) => {
Expand All @@ -319,6 +322,7 @@ function makeSuggestions(
if (specification.getStructs().length > 0 && remain > 0) {
suggestions.push({
label: 'Structs',
value: 'group:structs',
options: specification
.getStructs()
.map((struct) => {
Expand All @@ -334,6 +338,7 @@ function makeSuggestions(
if (specification.getExceptions().length > 0 && remain > 0) {
suggestions.push({
label: 'Exceptions',
value: 'group:exceptions',
options: specification
.getExceptions()
.map((exception) => {
Expand Down
Expand Up @@ -18,7 +18,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.31.0)",
value = "by gRPC proto compiler (version 1.31.1)",
comments = "Source: hello.proto")
public final class HelloServiceGrpc {

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Expand Up @@ -130,7 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
Expand Down

0 comments on commit 3262e1d

Please sign in to comment.