diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 220f0ac0758b8..bf74f82d7c8a6 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -407,16 +407,9 @@ The Apache Software License, Version 2.0 * Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.5.1.jar * Apache Thrift - org.apache.thrift-libthrift-0.14.2.jar * OkHttp3 - - com.squareup.okhttp3-logging-interceptor-4.9.3.jar - - com.squareup.okhttp3-okhttp-4.9.3.jar - * Okio - com.squareup.okio-okio-2.8.0.jar + - com.squareup.okhttp3-logging-interceptor-4.10.0.jar + - com.squareup.okhttp3-okhttp-4.10.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar - * Kotlin Standard Lib - - org.jetbrains.kotlin-kotlin-stdlib-1.8.20.jar - - org.jetbrains.kotlin-kotlin-stdlib-common-1.8.20.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.20.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.20.jar - - org.jetbrains-annotations-13.0.jar * gRPC - io.grpc-grpc-all-1.45.1.jar - io.grpc-grpc-auth-1.45.1.jar diff --git a/pom.xml b/pom.xml index 75c25e5478893..73f1668351082 100644 --- a/pom.xml +++ b/pom.xml @@ -231,12 +231,10 @@ flexible messaging model and an intuitive client API. 2.3.3 2.0.2 5.12.1 + 4.10.0 18.0.0 - 4.9.3 - 2.8.0 - - 1.8.20 + 3.3.0 1.0 9.1.6 5.3.27 @@ -1326,16 +1324,46 @@ flexible messaging model and an intuitive client API. com.squareup.okhttp3 okhttp ${okhttp3.version} + + + org.jetbrains.kotlin + * + + + com.squareup.okio + * + + com.squareup.okhttp3 okhttp-urlconnection ${okhttp3.version} + + + org.jetbrains.kotlin + * + + + com.squareup.okio + * + + com.squareup.okhttp3 logging-interceptor ${okhttp3.version} + + + org.jetbrains.kotlin + * + + + com.squareup.okio + * + + com.squareup.okio @@ -1343,23 +1371,6 @@ flexible messaging model and an intuitive client API. ${okio.version} - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin-stdlib.version} - - - org.jetbrains.kotlin - kotlin-stdlib-common - ${kotlin-stdlib.version} - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin-stdlib.version} - - com.github.luben zstd-jni diff --git a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java index 5fea8bcc9fde9..408e2b70d10a7 100644 --- a/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java +++ b/pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceRunnableTest.java @@ -47,11 +47,12 @@ import org.apache.pulsar.functions.proto.Function.FunctionDetails; import org.apache.pulsar.functions.proto.Function.SinkSpec; import org.apache.pulsar.functions.proto.InstanceCommunication; -import org.jetbrains.annotations.NotNull; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import javax.annotation.Nonnull; + public class JavaInstanceRunnableTest { static class IntegerSerDe implements SerDe { @@ -164,7 +165,7 @@ public void testFunctionResultNull() throws Exception { verify(record, times(1)).ack(); } - @NotNull + @Nonnull private JavaInstanceRunnable getJavaInstanceRunnable(boolean autoAck, org.apache.pulsar.functions.proto.Function.ProcessingGuarantees processingGuarantees) throws Exception { FunctionDetails functionDetails = FunctionDetails.newBuilder()