diff --git a/build.gradle b/build.gradle index a8bb39827..5512e5350 100755 --- a/build.gradle +++ b/build.gradle @@ -81,8 +81,8 @@ allprojects { idea { project { - jdkName = "8" - languageLevel = "8" + jdkName = "17" + languageLevel = "17" vcs = "Git" } } @@ -98,8 +98,8 @@ configure(javaProjects) { group = "com.netflix.${githubProjectName}" - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 dependencyManagement { imports { diff --git a/gradle.properties b/gradle.properties index 75fe3dfd0..8618c52dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ # Used in documentation and for including the Gradle plugin spring_boot_version=2.7.11 spring_cloud_version=Hoxton.SR8 -google_guice_version=4.1.0 +google_guice_version=5.1.0 spock_version=2.1-groovy-3.0 ## Override Spring Boot versions diff --git a/metacat-common/src/main/java/com/netflix/metacat/common/type/RowType.java b/metacat-common/src/main/java/com/netflix/metacat/common/type/RowType.java index 63569c61b..93505d845 100644 --- a/metacat-common/src/main/java/com/netflix/metacat/common/type/RowType.java +++ b/metacat-common/src/main/java/com/netflix/metacat/common/type/RowType.java @@ -24,9 +24,9 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Collections; import java.util.List; diff --git a/metacat-connector-hive/src/main/java/com/netflix/metacat/connector/hive/client/thrift/HiveMetastoreClientFactory.java b/metacat-connector-hive/src/main/java/com/netflix/metacat/connector/hive/client/thrift/HiveMetastoreClientFactory.java index 0e71cac8c..411bfb310 100644 --- a/metacat-connector-hive/src/main/java/com/netflix/metacat/connector/hive/client/thrift/HiveMetastoreClientFactory.java +++ b/metacat-connector-hive/src/main/java/com/netflix/metacat/connector/hive/client/thrift/HiveMetastoreClientFactory.java @@ -52,7 +52,7 @@ public HiveMetastoreClientFactory(@Nullable final HostAndPort socksProxy, } private static Socket createSocksSocket(final HostAndPort proxy) { - final SocketAddress address = InetSocketAddress.createUnresolved(proxy.getHostText(), proxy.getPort()); + final SocketAddress address = InetSocketAddress.createUnresolved(proxy.getHost(), proxy.getPort()); return new Socket(new Proxy(Proxy.Type.SOCKS, address)); } diff --git a/metacat-connector-s3/build.gradle b/metacat-connector-s3/build.gradle index f0a507d0d..efd639db7 100644 --- a/metacat-connector-s3/build.gradle +++ b/metacat-connector-s3/build.gradle @@ -27,7 +27,6 @@ dependencies { api("com.google.guava:guava") api("com.google.inject:guice") api("com.google.inject.extensions:guice-persist") - api("com.google.inject.extensions:guice-multibindings") api("com.google.inject.extensions:guice-servlet") api("joda-time:joda-time:2.10.10") api("org.hibernate:hibernate-entitymanager")