diff options
author | gjoranv <gv@verizonmedia.com> | 2022-05-12 15:25:47 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:21 +0200 |
commit | 5da809318217b36a990ec030145a547e9eebaef8 (patch) | |
tree | d73a72a18b18bb007b93738133e44ff3e75ba5f5 | |
parent | 84e869333e0ab433d3fcfc91c2f0124991f1e586 (diff) |
Upgrade to guice 4.2.3 and guava 27.1
7 files changed, 36 insertions, 6 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 400c01abb78..87ea36f06fc 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -36,8 +36,8 @@ <felix.version>7.0.1</felix.version> <felix.log.version>1.0.1</felix.log.version> <findbugs.version>1.3.9</findbugs.version> - <guava.version>20.0</guava.version> - <guice.version>3.0</guice.version> + <guava.version>27.1-jre</guava.version> + <guice.version>4.2.3</guice.version> <javax.inject.version>1</javax.inject.version> <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jaxb.version>2.3.0</jaxb.version> @@ -96,6 +96,9 @@ <!-- guava with dependencies --> <include>com.google.code.findbugs:jsr305:[${findbugs.version}]:jar:provided</include> <include>com.google.guava:guava:[${guava.version}]:jar:provided</include> + <include>com.google.errorprone:error_prone_annotations:[2.2.0]:jar:provided</include> + <include>com.google.guava:failureaccess:[1.0.1]:jar:provided</include> + <include>com.google.j2objc:j2objc-annotations:[1.1]:jar:provided</include> <include>com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided</include> <include>com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 211d0019774..8f4c59eed5a 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -71,8 +71,13 @@ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:[2.5.4, ${jackson2.version}]:jar:provided</include> <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:[2.5.4, ${jackson2.version}]:jar:provided</include> + <!-- guava with dependencies --> <include>com.google.code.findbugs:jsr305:[${findbugs.version}]:jar:provided</include> <include>com.google.guava:guava:[${guava.version}]:jar:provided</include> + <include>com.google.errorprone:error_prone_annotations:[2.2.0]:jar:provided</include> + <include>com.google.guava:failureaccess:[1.0.1]:jar:provided</include> + <include>com.google.j2objc:j2objc-annotations:[1.1]:jar:provided</include> + <include>com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided</include> <include>com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided</include> <include>com.google.inject:guice:[${guice.version}]:jar:provided:no_aop</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 6b8fa8ffeb9..3f9b9a0c81b 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -88,6 +88,23 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> + <exclusions> + <exclusion> + <!-- Empty artifact for gradle projects, see the artifact's pom.xml --> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + <exclusion> + <!-- Annotations with retention Runtime. Remove exclusion if needed. --> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + <exclusion> + <!-- Annotation with retention class only --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.google.inject.extensions</groupId> @@ -389,8 +406,8 @@ <felix.version>7.0.1</felix.version> <felix.log.version>1.0.1</felix.log.version> <findbugs.version>1.3.9</findbugs.version> - <guava.version>20.0</guava.version> - <guice.version>3.0</guice.version> + <guava.version>27.1-jre</guava.version> + <guice.version>4.2.3</guice.version> <javax.inject.version>1</javax.inject.version> <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jaxb.version>2.3.0</jaxb.version> diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index c0829adc7ae..5ff15307ac3 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -413,6 +413,7 @@ public class RoutingController { /** Create a common name based on a hash of given application. This must be less than 64 characters long. */ private static String commonNameHashOf(ApplicationId application, SystemName system) { + @SuppressWarnings("deprecation") // for Hashing.sha1() HashCode sha1 = Hashing.sha1().hashString(application.serializedForm(), StandardCharsets.UTF_8); String base32 = BaseEncoding.base32().omitPadding().lowerCase().encode(sha1.asBytes()); return 'v' + base32 + Endpoint.internalDnsSuffix(system); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java index 7b3b90d1458..91f141f880b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java @@ -98,6 +98,7 @@ public class ApplicationPackage { * it must not be further changed by the caller. * If 'requireFiles' is true, files needed by deployment orchestration must be present. */ + @SuppressWarnings("deprecation") // for Hashing.sha1() public ApplicationPackage(byte[] zippedContent, boolean requireFiles) { this.zippedContent = Objects.requireNonNull(zippedContent, "The application package content cannot be null"); this.contentHash = Hashing.sha1().hashBytes(zippedContent).toString(); @@ -240,6 +241,7 @@ public class ApplicationPackage { } // Hashes all files and settings that require a deployment to be forwarded to configservers + @SuppressWarnings("deprecation") // for Hashing.sha1() private String calculateBundleHash(byte[] zippedContent) { Predicate<String> entryMatcher = name -> ! name.endsWith(deploymentFile) && ! name.endsWith(buildMetaFile); SortedMap<String, Long> crcByEntry = new TreeMap<>(); @@ -261,6 +263,7 @@ public class ApplicationPackage { .hash().toString(); } + @SuppressWarnings("deprecation") // for Hashing.sha1() public static String calculateHash(byte[] bytes) { return Hashing.sha1().newHasher() .putBytes(bytes) diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java b/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java index 38d4c70646c..1cf4e3dd858 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/test/ServerProviderConformanceTest.java @@ -153,7 +153,7 @@ public abstract class ServerProviderConformanceTest { final Module... config) throws Throwable { runTest(adapter, - Modules.override(Modules.combine()).with(newBindingSetSelector("unknown")), + Modules.override(Modules.EMPTY_MODULE).with(newBindingSetSelector("unknown")), RequestType.WITHOUT_CONTENT, new TestRequestHandler() { @@ -170,7 +170,7 @@ public abstract class ServerProviderConformanceTest { final Module... config) throws Throwable { runTest(adapter, - Modules.override(Modules.combine()).with(newBindingSetSelector(null)), + Modules.override(Modules.EMPTY_MODULE).with(newBindingSetSelector(null)), RequestType.WITHOUT_CONTENT, new TestRequestHandler() { diff --git a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java index 90a246ad424..8db2387bf66 100644 --- a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java +++ b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java @@ -255,6 +255,7 @@ public class RoutingTable { Optional<InstanceName> instance, ClusterSpec.Id cluster, ZoneId zone) { if (instance.isEmpty()) { // Application-scoped endpoint if (dnsName.isEmpty()) throw new IllegalArgumentException("dnsName must given for application-scoped endpoint"); + @SuppressWarnings("deprecation") String endpointHash = Hashing.sha1().hashString(dnsName, StandardCharsets.UTF_8).toString(); return "application-" + endpointHash + "." +application.value() + "." + tenant.value(); } else { |