From 1a60b0169dad39b089e10bbfaba48b20f103aea7 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Sat, 25 Mar 2023 11:37:24 +0530 Subject: [PATCH 01/13] Upgraded kotlin library to 1.8.10 --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3f33069b8c252..e5c9964207fb8 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,6 @@ flexible messaging model and an intuitive client API. false 1 true - false ${project.build.directory} @@ -229,7 +228,7 @@ flexible messaging model and an intuitive client API. 2.8.0 - 1.4.32 + 1.8.10 1.0 9.1.6 5.3.20 @@ -1966,8 +1965,6 @@ flexible messaging model and an intuitive client API. 8 8 - - From 517dd513937bdf60d19403569c63a825fc823c06 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Mon, 27 Mar 2023 11:50:59 +0530 Subject: [PATCH 02/13] Upgraded okhttp3 and okio dependencies Code review changes --- distribution/server/src/assemble/LICENSE.bin.txt | 14 +++++++------- pom.xml | 8 +++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 6b3455127b423..d8ff9fb8171ad 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -405,15 +405,15 @@ 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 + * Okio - com.squareup.okio-okio-3.0.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar * Kotlin Standard Lib - - org.jetbrains.kotlin-kotlin-stdlib-1.4.32.jar - - org.jetbrains.kotlin-kotlin-stdlib-common-1.4.32.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.4.32.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.4.32.jar + - org.jetbrains.kotlin-kotlin-stdlib-1.8.10.jar + - org.jetbrains.kotlin-kotlin-stdlib-common-1.8.10.jar + - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.10.jar + - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.10.jar - org.jetbrains-annotations-13.0.jar * gRPC - io.grpc-grpc-all-1.45.1.jar diff --git a/pom.xml b/pom.xml index e5c9964207fb8..a6af91bc64529 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,7 @@ flexible messaging model and an intuitive client API. false 1 true + false ${project.build.directory} @@ -224,10 +225,10 @@ flexible messaging model and an intuitive client API. 2.0.2 5.12.1 12.0.1 - 4.9.3 + 4.10.0 - 2.8.0 - + 3.0.0 + 1.8.10 1.0 9.1.6 @@ -1965,6 +1966,7 @@ flexible messaging model and an intuitive client API. 8 8 + From 104e44ee3b40a3875f1ee14234cbea39089349f7 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Mon, 27 Mar 2023 11:53:31 +0530 Subject: [PATCH 03/13] Code review change --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a6af91bc64529..a48c12f7f26e8 100644 --- a/pom.xml +++ b/pom.xml @@ -1967,6 +1967,7 @@ flexible messaging model and an intuitive client API. 8 8 + From ec93b1f25b4b4f6f44d16ba734a05843187e0a63 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Mon, 27 Mar 2023 17:50:12 +0530 Subject: [PATCH 04/13] Using the latest version of okio. Removed kotlin library as the latest version of okio brings non-vulnerable kotlin dependency --- pom.xml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index a48c12f7f26e8..f2b7538cab184 100644 --- a/pom.xml +++ b/pom.xml @@ -227,9 +227,7 @@ flexible messaging model and an intuitive client API. 12.0.1 4.10.0 - 3.0.0 - - 1.8.10 + 3.3.0 1.0 9.1.6 5.3.20 @@ -1337,23 +1335,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 From ce23027471210571807318d0a42d7c2ae88b3847 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Tue, 28 Mar 2023 14:05:40 +0530 Subject: [PATCH 05/13] Corrected kotlin version in license file --- distribution/server/src/assemble/LICENSE.bin.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index d8ff9fb8171ad..cee4104a1c09a 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -410,10 +410,10 @@ The Apache Software License, Version 2.0 * Okio - com.squareup.okio-okio-3.0.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar * Kotlin Standard Lib - - org.jetbrains.kotlin-kotlin-stdlib-1.8.10.jar - - org.jetbrains.kotlin-kotlin-stdlib-common-1.8.10.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.10.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.10.jar + - org.jetbrains.kotlin-kotlin-stdlib-1.8.0.jar + - org.jetbrains.kotlin-kotlin-stdlib-common-1.8.0.jar + - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.0.jar + - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.0.jar - org.jetbrains-annotations-13.0.jar * gRPC - io.grpc-grpc-all-1.45.1.jar From 1015db16690f16d77cf978ee13c65352a6c9702d Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Tue, 28 Mar 2023 14:06:16 +0530 Subject: [PATCH 06/13] Corrected okio version in the license file --- distribution/server/src/assemble/LICENSE.bin.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index cee4104a1c09a..06863e1347bc1 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -407,7 +407,7 @@ The Apache Software License, Version 2.0 * OkHttp3 - com.squareup.okhttp3-logging-interceptor-4.10.0.jar - com.squareup.okhttp3-okhttp-4.10.0.jar - * Okio - com.squareup.okio-okio-3.0.0.jar + * Okio - com.squareup.okio-okio-3.3.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar * Kotlin Standard Lib - org.jetbrains.kotlin-kotlin-stdlib-1.8.0.jar From 30cd5dac4289639f38421a06c7bbd50b7b2e94dc Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Tue, 28 Mar 2023 15:10:50 +0530 Subject: [PATCH 07/13] Removed un-packaged Kotlin libraries from LICENSE.bin.txt --- distribution/server/src/assemble/LICENSE.bin.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 06863e1347bc1..03ec1c03c84f4 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -410,10 +410,6 @@ The Apache Software License, Version 2.0 * Okio - com.squareup.okio-okio-3.3.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar * Kotlin Standard Lib - - org.jetbrains.kotlin-kotlin-stdlib-1.8.0.jar - - org.jetbrains.kotlin-kotlin-stdlib-common-1.8.0.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.0.jar - - org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.0.jar - org.jetbrains-annotations-13.0.jar * gRPC - io.grpc-grpc-all-1.45.1.jar From 6306caac32208bd478fd44d9b949e13cf09253c5 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Thu, 13 Apr 2023 14:36:16 +0530 Subject: [PATCH 08/13] Excluded transitive dependency due to older versions --- pom.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pom.xml b/pom.xml index f2b7538cab184..7555f41387464 100644 --- a/pom.xml +++ b/pom.xml @@ -1318,16 +1318,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 From 5920332e694ade6893a463c7e66320b4b0b8ff7e Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Thu, 13 Apr 2023 15:25:49 +0530 Subject: [PATCH 09/13] Trigger Build From 63da2b0ff14b95a55732941b207e627c9504bcd0 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Thu, 13 Apr 2023 16:19:35 +0530 Subject: [PATCH 10/13] Changed nullability annotation --- .../pulsar/functions/instance/JavaInstanceRunnableTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 a36a3ca62d178..c6c58e0424eb9 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 @@ -41,10 +41,11 @@ import org.apache.pulsar.functions.proto.Function.SinkSpecOrBuilder; import org.apache.pulsar.functions.proto.Function.SourceSpecOrBuilder; import org.apache.pulsar.functions.proto.InstanceCommunication; -import org.jetbrains.annotations.NotNull; import org.testng.Assert; import org.testng.annotations.Test; +import javax.annotation.Nonnull; + public class JavaInstanceRunnableTest { static class IntegerSerDe implements SerDe { @@ -157,7 +158,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() From 9802061120edf115e5f145681359eb1f67706867 Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Fri, 14 Apr 2023 11:45:42 +0530 Subject: [PATCH 11/13] Trigger Build From c46df39b849735f71bfa0bdf70c5534f9451180f Mon Sep 17 00:00:00 2001 From: Abhilash Mandaliya Date: Fri, 14 Apr 2023 14:04:49 +0530 Subject: [PATCH 12/13] Removed unused libraries from the licence file --- distribution/server/src/assemble/LICENSE.bin.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 03ec1c03c84f4..7c74df2b0d128 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -407,10 +407,7 @@ The Apache Software License, Version 2.0 * OkHttp3 - com.squareup.okhttp3-logging-interceptor-4.10.0.jar - com.squareup.okhttp3-okhttp-4.10.0.jar - * Okio - com.squareup.okio-okio-3.3.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar - * Kotlin Standard Lib - - org.jetbrains-annotations-13.0.jar * gRPC - io.grpc-grpc-all-1.45.1.jar - io.grpc-grpc-auth-1.45.1.jar From 588c0c0f82e2d52244da04f79c26a8ca510ca8f7 Mon Sep 17 00:00:00 2001 From: tison Date: Thu, 18 May 2023 10:23:41 +0800 Subject: [PATCH 13/13] fix binary license check Signed-off-by: tison --- distribution/server/src/assemble/LICENSE.bin.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 95f7c75ea3fdb..bf74f82d7c8a6 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -410,12 +410,6 @@ The Apache Software License, Version 2.0 - 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