Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dependencies #2205

Merged
merged 4 commits into from Oct 25, 2019
Merged

Update Dependencies #2205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b879503
Update Dependencies
minwoox Oct 23, 2019
e44bbc3
Increase timeout for heapdump test
minwoox Oct 23, 2019
6b5e715
Update more deps
minwoox Oct 25, 2019
594616a
Add static link
minwoox Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rp/armeria/client/endpoint/healthcheck/HttpHealthCheckedEndpointGroupLongPollingTest.java
View file
Open in desktop
Expand Up @@ -201,7 +201,7 @@ void keepEndpointHealthinessWhenLongPollingTimeout() throws Exception {
final Stopwatch stopwatch = Stopwatch.createStarted();
healthCheckRequestLogs.take();
assertThat(stopwatch.elapsed(TimeUnit.MILLISECONDS))
.isLessThanOrEqualTo(LONG_POLLING_TIMEOUT.toMillis());
.isLessThanOrEqualTo((long) (LONG_POLLING_TIMEOUT.toMillis() * 1.1)); // buffer 10 percent.
}
}

Expand Down
31 changes: 15 additions & 16 deletions dependencies.yml
View file
Open in desktop
Expand Up @@ -4,12 +4,13 @@

boms:
- com.fasterxml.jackson:jackson-bom:2.10.0
- io.dropwizard.metrics:metrics-bom:4.1.0
- io.grpc:grpc-bom:1.24.0
- io.dropwizard.metrics:metrics-bom:4.1.1
- io.grpc:grpc-bom:1.24.1
- io.micrometer:micrometer-bom:1.3.0
# NOTE: When changing this, re-evaluate netty-tcnative-boringssl-static below
- io.netty:netty-bom:4.1.42.Final
- io.zipkin.brave:brave-bom:5.7.0
- org.eclipse.jetty:jetty-bom:9.4.21.v20190926
- io.netty:netty-bom:4.1.43.Final
- io.zipkin.brave:brave-bom:5.8.0
- org.eclipse.jetty:jetty-bom:9.4.22.v20191022
- org.junit:junit-bom:5.5.2

cglib:
Expand Down Expand Up @@ -53,7 +54,7 @@ com.github.jengelman.gradle.plugins:
shadow: { version: '5.1.0' }

com.google.api:
gax-grpc: { version: '1.49.0' }
gax-grpc: { version: '1.49.1' }

com.google.code.findbugs:
jsr305: { version: '3.0.2' }
Expand Down Expand Up @@ -154,15 +155,12 @@ io.grpc:

io.micrometer:
micrometer-core:
version: &MICROMETER_VERSION '1.3.0'
javadocs:
- https://static.javadoc.io/io.micrometer/micrometer-core/1.3.0/
micrometer-registry-prometheus:
version: *MICROMETER_VERSION
javadocs:
- https://static.javadoc.io/io.micrometer/micrometer-registry-prometheus/1.3.0/
micrometer-spring-legacy:
version: *MICROMETER_VERSION
javadocs:
- https://static.javadoc.io/io.micrometer/micrometer-spring-legacy/1.3.0/
exclusions:
Expand All @@ -185,13 +183,13 @@ io.projectreactor:

io.prometheus:
simpleclient_common:
version: '0.7.0'
version: '0.8.0'
javadocs:
- https://prometheus.github.io/client_java/

io.reactivex.rxjava2:
rxjava:
version: '2.2.12'
version: '2.2.13'
javadocs:
- http://reactivex.io/RxJava/2.x/javadoc/

Expand All @@ -200,6 +198,7 @@ io.zipkin.brave:
# ':site:javadoc' fails when we use a newer version of Javadoc.
javadocs:
- https://static.javadoc.io/io.zipkin.brave/brave/5.6.3/
- https://static.javadoc.io/io.zipkin.brave/brave-instrumentation-http/5.6.3/

it.unimi.dsi:
fastutil:
Expand Down Expand Up @@ -250,7 +249,7 @@ net.javacrumbs.json-unit:
json-unit-fluent: { version: *JSON_UNIT_VERSION }

net.sf.proguard:
proguard-gradle: { version: '6.1.1' }
proguard-gradle: { version: '6.2.0' }

net.shibboleth.utilities:
java-support: { version: '7.5.0' }
Expand Down Expand Up @@ -295,15 +294,15 @@ org.apache.thrift:

org.apache.tomcat.embed:
tomcat-embed-core:
version: &TOMCAT_VERSION '9.0.26'
version: &TOMCAT_VERSION '9.0.27'
javadocs:
- https://tomcat.apache.org/tomcat-9.0-doc/api/
tomcat-embed-jasper: { version: *TOMCAT_VERSION }
tomcat-embed-el: { version: *TOMCAT_VERSION }

org.apache.zookeeper:
zookeeper:
version: '3.5.5'
version: '3.5.6'
exclusions:
- io.netty:netty-all
- log4j:log4j
Expand All @@ -317,7 +316,7 @@ org.awaitility:

org.bouncycastle:
bcprov-jdk15on:
version: '1.63'
version: '1.64'
relocations:
- from: org.bouncycastle
to: com.linecorp.armeria.internal.shaded.bouncycastle
Expand Down Expand Up @@ -408,7 +407,7 @@ org.slf4j:

org.springframework.boot:
spring-boot-starter:
version: &SPRING_BOOT_VERSION '2.1.8.RELEASE'
version: &SPRING_BOOT_VERSION '2.1.9.RELEASE'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have decided to update to 2.1.9 because 2.2.0 does not support Tomcat 8.5. So this release(Armeria 0.95.0) will be the last release which supports Tomcat 8.5.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @adriancole

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool.. thanks for update. also the things available for performance in boot 2.2 are actually spring related and may imply some refactoring as options were added to the @Configuration annotation. It may not actually require refactoring, but anyway.

javadocs:
- https://docs.spring.io/spring/docs/current/javadoc-api/
spring-boot-actuator-autoconfigure: { version: *SPRING_BOOT_VERSION }
Expand Down
5 changes: 0 additions & 5 deletions docs-client/build.gradle
View file
Open in desktop
@@ -1,8 +1,3 @@
import java.nio.file.FileVisitOption
import java.nio.file.FileVisitResult
import java.nio.file.Files
import java.nio.file.SimpleFileVisitor

buildscript {
repositories {
gradlePluginPortal()
Expand Down