diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml index fa7ab17dd216b..bc19c3cca2740 100644 --- a/distribution/server/pom.xml +++ b/distribution/server/pom.xml @@ -214,6 +214,12 @@ grpc-all + + io.perfmark + perfmark-api + compile + + org.apache.bookkeeper.http diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index d83c427f41dde..eef4b43f62696 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -320,8 +320,11 @@ The Apache Software License, Version 2.0 - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.11.1.jar - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.11.1.jar - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.11.1.jar + - org.codehaus.jackson-jackson-core-asl-1.9.11.jar + - org.codehaus.jackson-jackson-mapper-asl-1.9.11.jar * Caffeine -- com.github.ben-manes.caffeine-caffeine-2.6.2.jar - * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-1.12.0.jar + * Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.1.jar + * Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-1.17.0.jar * Joda -- org.joda-joda-convert-2.2.1.jar * Bitbucket -- org.bitbucket.b_c-jose4j-0.7.2.jar * Gson @@ -395,32 +398,32 @@ The Apache Software License, Version 2.0 - org.apache.logging.log4j-log4j-1.2-api-2.14.0.jar * Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar * BookKeeper - - org.apache.bookkeeper-bookkeeper-common-4.12.1.jar - - org.apache.bookkeeper-bookkeeper-common-allocator-4.12.1.jar - - org.apache.bookkeeper-bookkeeper-proto-4.12.1.jar - - org.apache.bookkeeper-bookkeeper-server-4.12.1.jar - - org.apache.bookkeeper-bookkeeper-tools-framework-4.12.1.jar - - org.apache.bookkeeper-circe-checksum-4.12.1.jar - - org.apache.bookkeeper-cpu-affinity-4.12.1.jar - - org.apache.bookkeeper-statelib-4.12.1.jar - - org.apache.bookkeeper-stream-storage-api-4.12.1.jar - - org.apache.bookkeeper-stream-storage-common-4.12.1.jar - - org.apache.bookkeeper-stream-storage-java-client-4.12.1.jar - - org.apache.bookkeeper-stream-storage-java-client-base-4.12.1.jar - - org.apache.bookkeeper-stream-storage-proto-4.12.1.jar - - org.apache.bookkeeper-stream-storage-server-4.12.1.jar - - org.apache.bookkeeper-stream-storage-service-api-4.12.1.jar - - org.apache.bookkeeper-stream-storage-service-impl-4.12.1.jar - - org.apache.bookkeeper.http-http-server-4.12.1.jar - - org.apache.bookkeeper.http-vertx-http-server-4.12.1.jar - - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.12.1.jar - - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.12.1.jar - - org.apache.bookkeeper.tests-stream-storage-tests-common-4.12.1.jar - - org.apache.distributedlog-distributedlog-common-4.12.1.jar - - org.apache.distributedlog-distributedlog-core-4.12.1-tests.jar - - org.apache.distributedlog-distributedlog-core-4.12.1.jar - - org.apache.distributedlog-distributedlog-protocol-4.12.1.jar - - org.apache.bookkeeper.stats-codahale-metrics-provider-4.12.1.jar + - org.apache.bookkeeper-bookkeeper-common-4.13.0.jar + - org.apache.bookkeeper-bookkeeper-common-allocator-4.13.0.jar + - org.apache.bookkeeper-bookkeeper-proto-4.13.0.jar + - org.apache.bookkeeper-bookkeeper-server-4.13.0.jar + - org.apache.bookkeeper-bookkeeper-tools-framework-4.13.0.jar + - org.apache.bookkeeper-circe-checksum-4.13.0.jar + - org.apache.bookkeeper-cpu-affinity-4.13.0.jar + - org.apache.bookkeeper-statelib-4.13.0.jar + - org.apache.bookkeeper-stream-storage-api-4.13.0.jar + - org.apache.bookkeeper-stream-storage-common-4.13.0.jar + - org.apache.bookkeeper-stream-storage-java-client-4.13.0.jar + - org.apache.bookkeeper-stream-storage-java-client-base-4.13.0.jar + - org.apache.bookkeeper-stream-storage-proto-4.13.0.jar + - org.apache.bookkeeper-stream-storage-server-4.13.0.jar + - org.apache.bookkeeper-stream-storage-service-api-4.13.0.jar + - org.apache.bookkeeper-stream-storage-service-impl-4.13.0.jar + - org.apache.bookkeeper.http-http-server-4.13.0.jar + - org.apache.bookkeeper.http-vertx-http-server-4.13.0.jar + - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.13.0.jar + - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.13.0.jar + - org.apache.bookkeeper.tests-stream-storage-tests-common-4.13.0.jar + - org.apache.distributedlog-distributedlog-common-4.13.0.jar + - org.apache.distributedlog-distributedlog-core-4.13.0-tests.jar + - org.apache.distributedlog-distributedlog-core-4.13.0.jar + - org.apache.distributedlog-distributedlog-protocol-4.13.0.jar + - org.apache.bookkeeper.stats-codahale-metrics-provider-4.13.0.jar * Apache HTTP Client - org.apache.httpcomponents-httpclient-4.5.5.jar - org.apache.httpcomponents-httpcore-4.4.9.jar @@ -452,24 +455,32 @@ The Apache Software License, Version 2.0 * Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.3.4.jar * Apache Thrifth - org.apache.thrift-libthrift-0.12.0.jar * OkHttp - - com.squareup.okhttp-okhttp-2.5.0.jar + - com.squareup.okhttp-okhttp-2.7.4.jar * Okio - com.squareup.okio-okio-1.13.0.jar * Javassist -- org.javassist-javassist-3.25.0-GA.jar - * gRPC - - io.grpc-grpc-all-1.18.0.jar - - io.grpc-grpc-auth-1.18.0.jar - - io.grpc-grpc-context-1.18.0.jar - - io.grpc-grpc-core-1.18.0.jar - - io.grpc-grpc-netty-1.18.0.jar - - io.grpc-grpc-okhttp-1.18.0.jar - - io.grpc-grpc-protobuf-1.18.0.jar - - io.grpc-grpc-protobuf-lite-1.18.0.jar - - io.grpc-grpc-stub-1.18.0.jar - - io.grpc-grpc-protobuf-nano-1.18.0.jar - - io.grpc-grpc-testing-1.18.0.jar + * gRPC + - io.grpc-grpc-all-1.33.0.jar + - io.grpc-grpc-auth-1.33.0.jar + - io.grpc-grpc-context-1.33.0.jar + - io.grpc-grpc-core-1.33.0.jar + - io.grpc-grpc-netty-1.33.0.jar + - io.grpc-grpc-okhttp-1.33.0.jar + - io.grpc-grpc-protobuf-1.33.0.jar + - io.grpc-grpc-protobuf-lite-1.33.0.jar + - io.grpc-grpc-stub-1.33.0.jar + - io.grpc-grpc-testing-1.33.0.jar + - io.grpc-grpc-alts-1.33.0.jar + - io.grpc-grpc-api-1.33.0.jar + - io.grpc-grpc-grpclb-1.33.0.jar + - io.grpc-grpc-netty-shaded-1.33.0.jar + - io.grpc-grpc-services-1.33.0.jar + - io.grpc-grpc-xds-1.33.0.jar + * Perfmark + - io.perfmark-perfmark-api-0.19.0.jar * OpenCensus - io.opencensus-opencensus-api-0.18.0.jar - - io.opencensus-opencensus-contrib-grpc-metrics-0.18.0.jar + - io.opencensus-opencensus-contrib-http-util-0.24.0.jar + - io.opencensus-opencensus-proto-0.2.0.jar * Jodah - net.jodah-typetools-0.5.0.jar * Apache Avro @@ -514,10 +525,16 @@ The Apache Software License, Version 2.0 - org.apache.zookeeper-zookeeper-jute-3.6.2.jar * Snappy Java - org.xerial.snappy-snappy-java-1.1.7.jar + * Google HTTP Client + - com.google.http-client-google-http-client-jackson2-1.34.0.jar + - com.google.http-client-google-http-client-1.34.0.jar + - com.google.auto.value-auto-value-annotations-1.7.jar + - com.google.re2j-re2j-1.2.jar BSD 3-clause "New" or "Revised" License * Google auth library - - com.google.auth-google-auth-library-credentials-0.9.0.jar -- licenses/LICENSE-google-auth-library.txt + - com.google.auth-google-auth-library-credentials-0.20.0.jar -- licenses/LICENSE-google-auth-library.txt + - com.google.auth-google-auth-library-oauth2-http-0.20.0.jar -- licenses/LICENSE-google-auth-library.txt * LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt * JSR305 -- com.google.code.findbugs-jsr305-3.0.2.jar -- licenses/LICENSE-JSR305.txt * JavaHamcrest -- org.hamcrest-hamcrest-core-1.3.jar -- licenses/LICENSE-Hamcrest.txt @@ -531,17 +548,13 @@ MIT License - org.slf4j-jul-to-slf4j-1.7.25.jar - org.slf4j-slf4j-api-1.7.25.jar - org.slf4j-jcl-over-slf4j-1.7.25.jar - * Animal Sniffer Annotations - - org.codehaus.mojo-animal-sniffer-annotations-1.17.jar * The Checker Framework - - org.checkerframework-checker-compat-qual-2.5.2.jar - org.checkerframework-checker-qual-3.5.0.jar Protocol Buffers License * Protocol Buffers - com.google.protobuf-protobuf-java-3.11.4.jar -- licenses/LICENSE-protobuf.txt - com.google.protobuf-protobuf-java-util-3.11.4.jar -- licenses/LICENSE-protobuf.txt - - com.google.protobuf.nano-protobuf-javanano-3.0.0-alpha-5.jar -- licenses/LICENSE-protobuf.txt CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Java Annotations API @@ -571,7 +584,8 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Mimepull -- org.jvnet.mimepull-mimepull-1.9.13.jar Eclipse Distribution License 1.0 -- licenses/LICENSE-EDL-1.0.txt - * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.1.jar + * Jakarta Activation + - jakarta.activation-jakarta.activation-api-1.2.1.jar * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.2.jar Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt diff --git a/distribution/server/src/assemble/NOTICE.bin.txt b/distribution/server/src/assemble/NOTICE.bin.txt index d272c9978023e..a4b842a2a4294 100644 --- a/distribution/server/src/assemble/NOTICE.bin.txt +++ b/distribution/server/src/assemble/NOTICE.bin.txt @@ -201,7 +201,6 @@ http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html * Performance and memory usage improvement ------------------------------------------------------------------------------------ -- org.checkerframework-checker-compat-qual-2.5.2.jar A few parts of the Checker Framework have more permissive licenses. diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml index a9ea9bc90d04b..ebd8cca0186a4 100644 --- a/docker/pulsar-all/pom.xml +++ b/docker/pulsar-all/pom.xml @@ -38,6 +38,11 @@ pom provided + + io.perfmark + perfmark-api + runtime + ${project.groupId} pulsar-offloader-distribution diff --git a/pom.xml b/pom.xml index a1acb2975a44d..2e3467a3793a2 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ flexible messaging model and an intuitive client API. 1.19 - 4.12.1 + 4.13.0 3.6.2 1.1.7 3.2.5 @@ -124,7 +124,8 @@ flexible messaging model and an intuitive client API. 0.5.0 3.11.4 ${protobuf3.version} - 1.18.0 + 1.33.0 + 0.19.0 ${grpc.version} 2.8.6 0.8.3 @@ -838,6 +839,19 @@ flexible messaging model and an intuitive client API. ${grpc.version} + + io.perfmark + perfmark-api + ${perfmark.version} + runtime + + + error_prone_annotations + com.google.errorprone + + + + io.grpc grpc-stub diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml index 462a5a8a481a1..753dea3873e41 100644 --- a/pulsar-broker-shaded/pom.xml +++ b/pulsar-broker-shaded/pom.xml @@ -82,6 +82,7 @@ net.java.dev.jna:* com.carrotsearch:* io.prometheus:* + io.perfmark:* com.github.ben-manes.caffeine:* org.glassfish.jersey.*:* org.rocksdb:* diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 213f3cf54bdd6..dbaadab9e7c28 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -88,6 +88,7 @@ org.glassfish.hk2*:* com.fasterxml.jackson.*:* io.grpc:* + io.perfmark:* com.yahoo.datasketches:* com.squareup.*:* com.google.*:* diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index 78ce3f9eb3e4a..c2e1f333ce563 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -133,6 +133,7 @@ org.glassfish.hk2*:* com.fasterxml.jackson.*:* io.grpc:* + io.perfmark:* com.yahoo.datasketches:* io.netty:* com.squareup.*:* diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 8e5b3a0f549f3..5035c608bce5c 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -122,6 +122,7 @@ com.fasterxml.jackson.core:jackson-core com.fasterxml.jackson.dataformat io.netty:* + io.perfmark:* org.eclipse.jetty:* com.yahoo.datasketches:* commons-*:* diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml index 1eaef7f147ca8..1dac8b41370e7 100644 --- a/pulsar-functions/instance/pom.xml +++ b/pulsar-functions/instance/pom.xml @@ -115,6 +115,12 @@ grpc-all + + io.perfmark + perfmark-api + runtime + + org.apache.bookkeeper bookkeeper-common diff --git a/pulsar-functions/localrun-shaded/pom.xml b/pulsar-functions/localrun-shaded/pom.xml index 2538c55911fd0..6a15433898ef4 100644 --- a/pulsar-functions/localrun-shaded/pom.xml +++ b/pulsar-functions/localrun-shaded/pom.xml @@ -132,6 +132,10 @@ io.grpc org.apache.pulsar.functions.runtime.shaded.io.grpc + + io.perfmark + org.apache.pulsar.functions.runtime.shaded.io.perfmark + org.joda org.apache.pulsar.functions.runtime.shaded.org.joda diff --git a/pulsar-functions/localrun/pom.xml b/pulsar-functions/localrun/pom.xml index 44bdfa322a461..3d99aa2be7e1a 100644 --- a/pulsar-functions/localrun/pom.xml +++ b/pulsar-functions/localrun/pom.xml @@ -58,6 +58,13 @@ io.grpc grpc-all + + + io.perfmark + perfmark-api + runtime + + diff --git a/pulsar-functions/proto/pom.xml b/pulsar-functions/proto/pom.xml index 2ebe4953dce0c..f0d4d4ea62bc7 100644 --- a/pulsar-functions/proto/pom.xml +++ b/pulsar-functions/proto/pom.xml @@ -61,6 +61,12 @@ + + io.perfmark + perfmark-api + runtime + + diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 4b29804ef0ac6..c4d8b7c935ca5 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -412,18 +412,18 @@ The Apache Software License, Version 2.0 - async-http-client-2.12.1.jar - async-http-client-netty-utils-2.12.1.jar * Apache Bookkeeper - - bookkeeper-common-4.12.1.jar - - bookkeeper-common-allocator-4.12.1.jar - - bookkeeper-proto-4.12.1.jar - - bookkeeper-server-4.12.1.jar - - bookkeeper-stats-api-4.12.1.jar - - bookkeeper-tools-framework-4.12.1.jar - - circe-checksum-4.12.1.jar - - codahale-metrics-provider-4.12.1jar - - cpu-affinity-4.12.1.jar - - http-server-4.12.1.jar - - prometheus-metrics-provider-4.12.1.jar - - codahale-metrics-provider-4.12.1.jar + - bookkeeper-common-4.13.0.jar + - bookkeeper-common-allocator-4.13.0.jar + - bookkeeper-proto-4.13.0.jar + - bookkeeper-server-4.13.0.jar + - bookkeeper-stats-api-4.13.0.jar + - bookkeeper-tools-framework-4.13.0.jar + - circe-checksum-4.13.0.jar + - codahale-metrics-provider-4.13.0.jar + - cpu-affinity-4.13.0.jar + - http-server-4.13.0.jar + - prometheus-metrics-provider-4.13.0.jar + - codahale-metrics-provider-4.13.0.jar * Apache Commons - commons-cli-1.2.jar - commons-codec-1.10.jar diff --git a/pulsar-zookeeper-utils/pom.xml b/pulsar-zookeeper-utils/pom.xml index 3172fd9b2074b..93866506b32dc 100644 --- a/pulsar-zookeeper-utils/pom.xml +++ b/pulsar-zookeeper-utils/pom.xml @@ -70,6 +70,12 @@ grpc-all + + io.perfmark + perfmark-api + runtime + + org.apache.bookkeeper.stats prometheus-metrics-provider