You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/05/20 11:49:07 UTC
[pulsar] 12/12: Fix cherry-pick issue
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit c312bcac62fbc8db475e9276c3177765079bc04a
Author: penghui <pe...@apache.org>
AuthorDate: Fri May 20 19:48:34 2022 +0800
Fix cherry-pick issue
---
.../authorization/MultiRolesTokenAuthorizationProviderTest.java | 4 ++--
pulsar-sql/presto-distribution/LICENSE | 2 --
pulsar-sql/presto-distribution/pom.xml | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java
index 078e2aad07a..17528f36a2e 100644
--- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java
+++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authorization/MultiRolesTokenAuthorizationProviderTest.java
@@ -25,7 +25,7 @@ import java.util.Properties;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils;
-import org.apache.pulsar.broker.resources.PulsarResources;
+import org.apache.pulsar.broker.cache.ConfigurationCacheService;
import org.junit.Assert;
import org.testng.annotations.Test;
@@ -172,7 +172,7 @@ public class MultiRolesTokenAuthorizationProviderTest {
conf.setProperties(properties);
MultiRolesTokenAuthorizationProvider provider = new MultiRolesTokenAuthorizationProvider();
- provider.initialize(conf, mock(PulsarResources.class));
+ provider.initialize(conf, mock(ConfigurationCacheService.class));
AuthenticationDataSource ads = new AuthenticationDataSource() {
@Override
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 55f779fc5a3..b566bd0c241 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -237,8 +237,6 @@ The Apache Software License, Version 2.0
- netty-codec-dns-4.1.77.Final.jar
- netty-codec-http-4.1.77.Final.jar
- netty-codec-haproxy-4.1.77.Final.jar
- - netty-codec-socks-4.1.77.Final.jar
- - netty-handler-proxy-4.1.77.Final.jar
- netty-common-4.1.77.Final.jar
- netty-handler-4.1.77.Final.jar
- netty-reactive-streams-2.0.4.jar
diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml
index eba24504cf4..815cfd3525e 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -38,7 +38,6 @@
<airlift.version>0.170</airlift.version>
<objenesis.version>2.6</objenesis.version>
<objectsize.version>0.0.12</objectsize.version>
- <guice.version>4.2.0</guice.version>
<jackson.version>2.13.2</jackson.version>
<!--fix Security Vulnerabilities-->
<!--https://www.cvedetails.com/vulnerability-list/vendor_id-15866/product_id-42991/Fasterxml-Jackson-databind.html-->