From 52982d806f0ce63be0c298efaba02390d9fb6c61 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Tue, 1 Sep 2020 18:32:31 +0200 Subject: [PATCH 1/7] Allow to build Pulsar on JDK14+ - update Apache Maven Assembly Plugin - use explicit import for Record class (prevent clash with java.lang.Record) --- pom.xml | 8 +++++++- .../functions/windowing/WindowFunctionExecutor.java | 6 +++++- .../api/examples/window/PublishWindowFunction.java | 6 +++--- .../api/examples/window/UserExceptionWindowFunction.java | 4 +++- .../api/examples/window/WordCountWindowFunction.java | 4 +++- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c80704f3ef730..755f29308c1e2 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache apache - 18 + 23 org.apache.pulsar @@ -203,6 +203,7 @@ flexible messaging model and an intuitive client API. 3.0 3.0.0-M2 3.0.0-M3 + 3.3.0 2.10 2.4.1 3.8.0 @@ -1394,6 +1395,11 @@ flexible messaging model and an intuitive client API. + + org.apache.maven.plugins + maven-assembly-plugin + ${maven-assembly-plugin.version} + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java index 83d5102042549..9d56a32cdf6ca 100644 --- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java +++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowFunctionExecutor.java @@ -30,7 +30,11 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.pulsar.functions.api.*; +import org.apache.pulsar.functions.api.Context; +import org.apache.pulsar.functions.api.Function; +import org.apache.pulsar.functions.api.Record; +import org.apache.pulsar.functions.api.WindowContext; +import org.apache.pulsar.functions.api.WindowFunction; import org.apache.pulsar.common.util.Reflections; import org.apache.pulsar.common.functions.WindowConfig; import org.apache.pulsar.functions.windowing.evictors.CountEvictionPolicy; diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java index e623a6b34d319..bf44b1aee28d6 100644 --- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java +++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/PublishWindowFunction.java @@ -19,9 +19,9 @@ package org.apache.pulsar.functions.api.examples.window; import java.util.Collection; -import org.apache.pulsar.client.api.PulsarClientException; -import org.apache.pulsar.client.api.Schema; -import org.apache.pulsar.functions.api.*; +import org.apache.pulsar.functions.api.Record; +import org.apache.pulsar.functions.api.WindowContext; +import org.apache.pulsar.functions.api.WindowFunction; /** * Example function that uses the built in publish function in the context diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java index 6f56209ed3f6e..d83320031d03d 100644 --- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java +++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/UserExceptionWindowFunction.java @@ -19,7 +19,9 @@ package org.apache.pulsar.functions.api.examples.window; import java.util.Collection; -import org.apache.pulsar.functions.api.*; +import org.apache.pulsar.functions.api.Record; +import org.apache.pulsar.functions.api.WindowContext; +import org.apache.pulsar.functions.api.WindowFunction; /** diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java index 39f838dca7c15..3e79c2457a61a 100644 --- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java +++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/window/WordCountWindowFunction.java @@ -20,7 +20,9 @@ import java.util.Arrays; import java.util.Collection; -import org.apache.pulsar.functions.api.*; +import org.apache.pulsar.functions.api.Record; +import org.apache.pulsar.functions.api.WindowContext; +import org.apache.pulsar.functions.api.WindowFunction; /** * The classic word count example done using pulsar functions From c3dde2728ae2da36f0bb94573dc8c0c18a3c9457 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 22 Oct 2020 09:41:16 +0200 Subject: [PATCH 2/7] revert Apache pom update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 755f29308c1e2..a353dfd9e0f87 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache apache - 23 + 18/version> org.apache.pulsar From 4822fddd6a1fcef6bd3453c8822f4191ca23863c Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Thu, 22 Oct 2020 09:42:55 +0200 Subject: [PATCH 3/7] fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a353dfd9e0f87..39a0edb6f0818 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache apache - 18/version> + 18 org.apache.pulsar From 5aacfff430f8f2f2343e1e4bab854b62fe87a06b Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Fri, 23 Oct 2020 10:10:17 +0200 Subject: [PATCH 4/7] Fix presto distribution - due to maven assembly plugin upgrade --- .../server/src/assemble/LICENSE.bin.txt | 5 ++- pom.xml | 29 ++--------------- pulsar-common/pom.xml | 24 ++++++++++++++ pulsar-sql/presto-distribution/LICENSE | 19 +++++++++--- pulsar-sql/presto-distribution/pom.xml | 31 +++++++++++++++++-- src/check-binary-license | 2 +- 6 files changed, 73 insertions(+), 37 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 0f0ace0b4fbb0..d286ded632740 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -371,7 +371,6 @@ The Apache Software License, Version 2.0 - io.netty-netty-transport-native-epoll-4.1.51.Final.jar - io.netty-netty-transport-native-unix-common-4.1.51.Final.jar - io.netty-netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar - - io.netty-netty-transport-native-kqueue-4.1.51.Final-osx-x86_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.30.Final.jar * Prometheus client - io.prometheus-simpleclient-0.5.0.jar @@ -563,8 +562,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 XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.2.jar + * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.2.jar + * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.3.jar Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt * AspectJ diff --git a/pom.xml b/pom.xml index 39a0edb6f0818..0f52127a78a15 100644 --- a/pom.xml +++ b/pom.xml @@ -206,14 +206,14 @@ flexible messaging model and an intuitive client API. 3.3.0 2.10 2.4.1 - 3.8.0 + 3.8.1 3.2.4 2.10.3 1.6.0 2.5 1.2.0 3.0.0 - 3.0.0 + 4.0.2 2.10 1.4.1.Final 0.8.3 @@ -1276,30 +1276,7 @@ flexible messaging model and an intuitive client API. **/_helpers.tpl - - - pl.project13.maven - git-commit-id-plugin - - - git-info - - revision - - - - - true - git - false - false - false - properties - - true - - - + org.apache.maven.plugins maven-enforcer-plugin diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml index 2237dfd681152..5932f9f993040 100644 --- a/pulsar-common/pom.xml +++ b/pulsar-common/pom.xml @@ -177,6 +177,30 @@ + + pl.project13.maven + git-commit-id-plugin + + + git-info + + revision + + + + + true + git + false + false + false + properties + + true + + + + org.codehaus.mojo templating-maven-plugin diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 54f00914dc106..1ef96d7c6fc23 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -235,10 +235,8 @@ The Apache Software License, Version 2.0 - netty-codec-4.1.51.Final.jar - netty-codec-dns-4.1.51.Final.jar - netty-codec-http-4.1.51.Final.jar - - netty-codec-socks-4.1.51.Final.jar - netty-common-4.1.51.Final.jar - netty-handler-4.1.51.Final.jar - - netty-handler-proxy-4.1.51.Final.jar - netty-reactive-streams-2.0.4.jar - netty-resolver-4.1.51.Final.jar - netty-resolver-dns-4.1.51.Final.jar @@ -246,7 +244,6 @@ The Apache Software License, Version 2.0 - netty-transport-4.1.51.Final.jar - netty-transport-native-epoll-4.1.51.Final.jar - netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar - - netty-transport-native-kqueue-4.1.51.Final-osx-x86_64.jar - netty-transport-native-unix-common-4.1.51.Final.jar - netty-transport-native-unix-common-4.1.51.Final-linux-x86_64.jar * Joda Time @@ -267,6 +264,7 @@ The Apache Software License, Version 2.0 - jetty-server-9.4.27.v20200227.jar - jetty-servlet-9.4.27.v20200227.jar - jetty-util-9.4.27.v20200227.jar + - jetty-alpn-java-client-9.4.27.v20200227.jar * Apache BVal - bval-jsr-2.0.0.jar * Bytecode @@ -363,9 +361,11 @@ The Apache Software License, Version 2.0 * Javax - javax.inject-1.jar - javax.inject-1.jar + - javax.inject-2.5.0-b42.jar - javax.servlet-api-3.1.0.jar - javax.servlet-api-4.0.1.jar - javax.ws.rs-api-2.1.jar + - javassist-3.22.0-CR2.jar * JCommander - jcommander-1.78.jar * FindBugs JSR305 @@ -391,6 +391,7 @@ The Apache Software License, Version 2.0 - snakeyaml-1.26.jar * Bean Validation API - validation-api-2.0.1.Final.jar + - validation-api-1.1.0.Final.jar * Objectsize - objectsize-0.0.12.jar * Dropwizard Metrics @@ -500,7 +501,7 @@ MIT License CDDL - 1.0 * OSGi Resource Locator - - osgi-resource-locator-1.0.1.jar + - osgi-resource-locator-1.0.3.jar CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt * Java Annotations API @@ -509,6 +510,7 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - javax.activation-1.2.0.jar - javax.activation-api-1.2.0.jar - jakarta.activation-api-1.2.1.jar + - jakarta.activation-1.2.2.jar * HK2 - Dependency Injection Kernel - hk2-api-2.5.0-b42.jar - hk2-locator-2.5.0-b42.jar @@ -522,6 +524,15 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - jersey-media-jaxb-2.26.jar - jersey-server-2.26.jar - jersey-common-2.26.jar + - jersey-client-2.31.jar + - jersey-common-2.31.jar + - jersey-entity-filtering-2.31.jar + - jersey-hk2-2.31.jar + - jersey-media-json-jackson-2.31.jar + - jersey-media-multipart-2.31.jar + - aopalliance-repackaged-2.5.0-b42.jar + - aopalliance-repackaged-2.6.1.jar + * JAXB - jaxb-api-2.3.1.jar diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml index 22b83e16f2e7a..02e9d006479ab 100644 --- a/pulsar-sql/presto-distribution/pom.xml +++ b/pulsar-sql/presto-distribution/pom.xml @@ -34,6 +34,7 @@ 2.7.0-SNAPSHOT + 2.31 332 0.170 2.6 @@ -52,7 +53,31 @@ - + + org.glassfish.jersey.core + jersey-common + ${jersey.version} + + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey.version} + + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + io.prestosql presto-main @@ -180,7 +205,7 @@ - + @@ -193,7 +218,7 @@ netty 3.10.6.Final - + org.apache.maven maven-core diff --git a/src/check-binary-license b/src/check-binary-license index dac370a958fc4..0d8779130577a 100755 --- a/src/check-binary-license +++ b/src/check-binary-license @@ -87,7 +87,7 @@ for J in $NOTICEJARS; do done # check pulsar sql jars -JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'lib/presto/' | grep -v 'managed-ledger' | grep -v 'pulsar-client-admin' | grep -v 'pulsar-client-api' | grep -v 'pulsar-functions-api' | grep -v 'pulsar-presto-connector-original' | grep -v 'pulsar-presto-distribution' | grep -v 'pulsar-common' | grep -v 'pulsar-functions-proto' | grep -v 'pulsar-functions-utils' | grep -v 'pulsar-io-core' | grep -v 'pulsar-transaction-common' | sed 's!.*/!!' | sort) +JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'lib/presto/' | grep -v pulsar-client | grep -v pulsar-metadata | grep -v 'managed-ledger' | grep -v 'pulsar-client-admin' | grep -v 'pulsar-client-api' | grep -v 'pulsar-functions-api' | grep -v 'pulsar-presto-connector-original' | grep -v 'pulsar-presto-distribution' | grep -v 'pulsar-common' | grep -v 'pulsar-functions-proto' | grep -v 'pulsar-functions-utils' | grep -v 'pulsar-io-core' | grep -v 'pulsar-transaction-common' | sed 's!.*/!!' | sort) LICENSEPATH=$(tar -tf $TARBALL | awk '/^[^\/]*\/lib\/presto\/LICENSE/') LICENSE=$(tar -O -xf $TARBALL "$LICENSEPATH") LICENSEJARS=$(echo "$LICENSE" | sed -nE 's!.* (.*\.jar).*!\1!gp') From fdc3cd2a38f8470bdd35047c842020bdeeca0b47 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Fri, 23 Oct 2020 11:57:37 +0200 Subject: [PATCH 5/7] fix licenses --- .../server/src/assemble/LICENSE.bin.txt | 1 + pulsar-sql/presto-distribution/LICENSE | 27 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index d286ded632740..fcb9b520e598c 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -563,6 +563,7 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt Eclipse Distribution License 1.0 -- licenses/LICENSE-EDL-1.0.txt * Jakarta Activation -- jakarta.activation-jakarta.activation-api-1.2.2.jar + * Jakarta Activation -- - com.sun.activation-jakarta.activation-1.2.2.jar * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.3.jar Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 1ef96d7c6fc23..9e4b767a9c294 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -361,11 +361,9 @@ The Apache Software License, Version 2.0 * Javax - javax.inject-1.jar - javax.inject-1.jar - - javax.inject-2.5.0-b42.jar - javax.servlet-api-3.1.0.jar - javax.servlet-api-4.0.1.jar - javax.ws.rs-api-2.1.jar - - javassist-3.22.0-CR2.jar * JCommander - jcommander-1.78.jar * FindBugs JSR305 @@ -391,7 +389,6 @@ The Apache Software License, Version 2.0 - snakeyaml-1.26.jar * Bean Validation API - validation-api-2.0.1.Final.jar - - validation-api-1.1.0.Final.jar * Objectsize - objectsize-0.0.12.jar * Dropwizard Metrics @@ -510,27 +507,28 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - javax.activation-1.2.0.jar - javax.activation-api-1.2.0.jar - jakarta.activation-api-1.2.1.jar + - jakarta.activation-api-1.2.2.jar - jakarta.activation-1.2.2.jar + - jakarta.validation-api-2.0.2.jar + - jakarta.ws.rs-api-2.1.6.jar * HK2 - Dependency Injection Kernel - - hk2-api-2.5.0-b42.jar - - hk2-locator-2.5.0-b42.jar - - hk2-utils-2.5.0-b42.jar + - hk2-api-2.6.1.jar + - hk2-locator-2.6.1.jar + - hk2-utils-2.6.1.jar + - jakarta.inject-2.6.1.jar * Jersey - jaxrs-0.195.jar - - jersey-client-2.26.jar - - jersey-container-servlet-2.26.jar - - jersey-container-servlet-core-2.26.jar - - jersey-hk2-2.26.jar - - jersey-media-jaxb-2.26.jar - - jersey-server-2.26.jar - - jersey-common-2.26.jar - jersey-client-2.31.jar + - jersey-container-servlet-2.31.jar + - jersey-container-servlet-core-2.31.jar + - jersey-hk2-2.31.jar + - jersey-media-jaxb-2.31.jar + - jersey-server-2.31.jar - jersey-common-2.31.jar - jersey-entity-filtering-2.31.jar - jersey-hk2-2.31.jar - jersey-media-json-jackson-2.31.jar - jersey-media-multipart-2.31.jar - - aopalliance-repackaged-2.5.0-b42.jar - aopalliance-repackaged-2.6.1.jar * JAXB @@ -554,6 +552,7 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - mimepull-1.9.13.jar * XML Bind API - jakarta.xml.bind-api-2.3.2.jar + - jakarta.xml.bind-api-2.3.3.jar Eclipse Public License - v2.0 -- licenses/LICENSE-EPL-2.0.txt * jakarta.annotation-api-1.3.5.jar From e1a29bc04a45991149929dcc2b62399a7ed1037f Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Tue, 27 Oct 2020 16:59:48 +0100 Subject: [PATCH 6/7] Fix kafka clients --- pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml | 2 +- .../compat/kafka/PulsarKafkaProducerThreadSafeTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml index 1db41911486cc..c66616969ca3f 100644 --- a/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml +++ b/pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml @@ -39,7 +39,7 @@ ${project.groupId} - pulsar-client + pulsar-client-original ${project.version} diff --git a/tests/pulsar-kafka-compat-client-test/src/test/java/org/apache/pulsar/tests/integration/compat/kafka/PulsarKafkaProducerThreadSafeTest.java b/tests/pulsar-kafka-compat-client-test/src/test/java/org/apache/pulsar/tests/integration/compat/kafka/PulsarKafkaProducerThreadSafeTest.java index 1246b1d5fe4e6..e6e183ae7b56b 100644 --- a/tests/pulsar-kafka-compat-client-test/src/test/java/org/apache/pulsar/tests/integration/compat/kafka/PulsarKafkaProducerThreadSafeTest.java +++ b/tests/pulsar-kafka-compat-client-test/src/test/java/org/apache/pulsar/tests/integration/compat/kafka/PulsarKafkaProducerThreadSafeTest.java @@ -21,7 +21,6 @@ import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.clients.producer.PulsarKafkaProducer; import org.apache.kafka.common.serialization.IntegerSerializer; import org.apache.kafka.common.serialization.StringSerializer; import org.apache.pulsar.tests.integration.suites.PulsarStandaloneTestSuite; From 861a5302039a3c1b1a886ad89ded39cf796b0727 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Wed, 28 Oct 2020 12:25:15 +0100 Subject: [PATCH 7/7] fix LICENSE --- distribution/server/src/assemble/LICENSE.bin.txt | 5 ++--- pulsar-sql/presto-distribution/LICENSE | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index fcb9b520e598c..fa6946e512259 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -562,9 +562,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.2.jar - * Jakarta Activation -- - com.sun.activation-jakarta.activation-1.2.2.jar - * Jakarta XML Binding -- jakarta.xml.bind-jakarta.xml.bind-api-2.3.3.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 * AspectJ diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 9e4b767a9c294..4ce6e3b9b277e 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -264,7 +264,6 @@ The Apache Software License, Version 2.0 - jetty-server-9.4.27.v20200227.jar - jetty-servlet-9.4.27.v20200227.jar - jetty-util-9.4.27.v20200227.jar - - jetty-alpn-java-client-9.4.27.v20200227.jar * Apache BVal - bval-jsr-2.0.0.jar * Bytecode @@ -507,8 +506,6 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - javax.activation-1.2.0.jar - javax.activation-api-1.2.0.jar - jakarta.activation-api-1.2.1.jar - - jakarta.activation-api-1.2.2.jar - - jakarta.activation-1.2.2.jar - jakarta.validation-api-2.0.2.jar - jakarta.ws.rs-api-2.1.6.jar * HK2 - Dependency Injection Kernel @@ -552,7 +549,6 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt - mimepull-1.9.13.jar * XML Bind API - jakarta.xml.bind-api-2.3.2.jar - - jakarta.xml.bind-api-2.3.3.jar Eclipse Public License - v2.0 -- licenses/LICENSE-EPL-2.0.txt * jakarta.annotation-api-1.3.5.jar