diff options
author | gjoranv <gv@verizonmedia.com> | 2019-03-04 15:19:21 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-03-04 15:21:23 +0100 |
commit | 89e0a748bd591a4279683fe28a05a49c1a3e53d1 (patch) | |
tree | a7d5627c4a5868fbcadb9de02f9ab38022461019 /controller-server | |
parent | 9f16e096695672c95f36bda6348d659b7fbab2eb (diff) |
JDK 11: Replace LogRecord.setMillis with setInstant.
- Suppress deprecation warnings locally instead of globally
in controller-server.
Diffstat (limited to 'controller-server')
3 files changed, 3 insertions, 10 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 034f96b9445..c4cb66de3ec 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -177,15 +177,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-Xlint:all</arg> - <arg>-Xlint:-serial</arg> - <arg>-Xlint:-deprecation</arg> - <arg>-Xlint:-try</arg> - <arg>-Werror</arg> - </compilerArgs> - </configuration> </plugin> </plugins> </build> diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java index 2f10dce0e0a..a75d0afbad0 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java @@ -260,6 +260,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor { return true; } + @SuppressWarnings("deprecation") private static CloseableHttpClient createHttpClient(RequestConfig config, ServiceIdentityProvider sslContextProvider, ZoneRegistry zoneRegistry, @@ -277,6 +278,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor { .build(); } + @SuppressWarnings("deprecation") private static class AthenzIdentityVerifierAdapter implements X509HostnameVerifier { private final AthenzIdentityVerifier verifier; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java index fe2394d872d..615fb017363 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java @@ -144,7 +144,7 @@ public final class ControllerTester { // Make root logger use time from manual clock configureDefaultLogHandler(handler -> handler.setFilter( record -> { - record.setMillis(clock.millis()); + record.setInstant(clock.instant()); return true; })); } |