Update flight to work on 4.5.0

pom.xml

@@ -22,7 +22,7 @@
 
   <groupId>com.dremio.flight</groupId>
   <artifactId>dremio-flight-connector</artifactId>
-  <version>0.22.0-SNAPSHOT</version>
+  <version>0.23.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <!--
     Weirdly putting 1.0.0 here doesn't resolve the correct dependencies for dremio jars
@@ -39,17 +39,17 @@
 
     <!--
         Dependencies version for this module
-        Submodules should rely on dependencixesManagement as much as possible
+        Submodules should rely on dependenciesManagement as much as possible
     -->
-    <arrow.flight.version>1.0.0-20200327115344-e8784bde9c-dremio</arrow.flight.version>
-    <version.dremio>4.3.1-202005202256080999-5dcfb82a</version.dremio>
+    <arrow.flight.version>0.18.0-20200611130341-f4a85bd19b-dremio</arrow.flight.version>
+    <version.dremio>4.5.0-202006180205030236-1a5d28da</version.dremio>
     <junit.version>4.12</junit.version>
     <lilith.version>8.2.0</lilith.version>
     <slf4j.version>1.7.28</slf4j.version>
     <logback.version>1.2.3</logback.version>
     <protobuf.version>3.9.1</protobuf.version>
     <guava.version>28.1-jre</guava.version>
-    <netty.version>4.1.45.Final</netty.version>
+    <netty.version>4.1.48.Final</netty.version>
     <netty.boringssl.version>2.0.28.Final</netty.boringssl.version>
     <surefire.extra.argLine>-Ddremio.flight.ssl=true</surefire.extra.argLine>
 

src/main/java/com/dremio/flight/AuthValidator.java

@@ -99,10 +99,10 @@ public Optional<String> isValid(byte[] bytes) {
 
   private UserSession build(String user, String password) {
     SessionOptionManager optionsManager =
-      new SessionOptionManagerFactoryImpl().getOrCreate("flight-session-" + user, context.getOptionManager());
+      new SessionOptionManagerFactoryImpl(context.getOptionValidatorListing()).getOrCreate("flight-session-" + user);
     return UserSession.Builder.newBuilder()
       .withCredentials(UserBitShared.UserCredentials.newBuilder().setUserName(user).build())
-      .withSessionOptionManager(optionsManager)
+      .withSessionOptionManager(optionsManager, context.getOptionManager())
       .withUserProperties(
         UserProtos.UserProperties.newBuilder().addProperties(
           UserProtos.Property.newBuilder().setKey("password").setValue(password).build()

src/main/java/com/dremio/flight/Producer.java

@@ -37,6 +37,7 @@
 import org.apache.arrow.flight.Result;
 import org.apache.arrow.flight.SchemaResult;
 import org.apache.arrow.flight.Ticket;
+import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -88,7 +89,6 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 
 import io.grpc.Status;
-import io.netty.buffer.ArrowBuf;
 import io.netty.buffer.ByteBufUtil;
 
 class Producer implements FlightProducer, AutoCloseable {

src/main/java/com/dremio/flight/SslHelper.java

@@ -34,9 +34,8 @@
 import org.bouncycastle.util.io.pem.PemObject;
 
 import com.dremio.config.DremioConfig;
-import com.dremio.exec.rpc.ssl.SSLConfig;
 import com.dremio.exec.rpc.ssl.SSLConfigurator;
-import com.dremio.exec.server.SabotContext;
+import com.dremio.ssl.SSLConfig;
 import com.google.common.base.Preconditions;
 
 public final class SslHelper {

src/test/java/com/dremio/flight/TestSslFlightEndpoint.java

@@ -57,9 +57,9 @@
 
 import com.dremio.BaseTestQuery;
 import com.dremio.config.DremioConfig;
-import com.dremio.exec.rpc.ssl.SSLConfig;
 import com.dremio.exec.rpc.ssl.SSLConfigurator;
 import com.dremio.service.users.SystemUser;
+import com.dremio.ssl.SSLConfig;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;