Move to Java 17

Netflix · Oct 16, 2024 · 4da86f5 · 4da86f5
1 parent dc3bc13
commit 4da86f5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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/...ain/java/com/netflix/metacat/connector/hive/client/thrift/HiveMetastoreClientFactory.java b/...ain/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
@@ -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")