You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2022/10/31 03:33:07 UTC
[incubator-kyuubi] branch branch-1.6 updated: [KYUUBI #3714] Use ServicesResourceTransformer to concatenating service entries
This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/branch-1.6 by this push:
new 132b6229d [KYUUBI #3714] Use ServicesResourceTransformer to concatenating service entries
132b6229d is described below
commit 132b6229d0ef9428a118bf5cb70fdfd1aa025a97
Author: hongdongdong <ho...@apache.org>
AuthorDate: Mon Oct 31 11:32:42 2022 +0800
[KYUUBI #3714] Use ServicesResourceTransformer to concatenating service entries
### _Why are the changes needed?_
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [X] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #3714 from hddong/use-ServicesResourceTransformer.
Closes #3714
d4c0ed27 [hongdongdong] Use ServicesResourceTransformer to concatenating service entries
Authored-by: hongdongdong <ho...@apache.org>
Signed-off-by: Cheng Pan <ch...@apache.org>
(cherry picked from commit 555ccb5da01e05151cd300f7cd7903b1dea0dbdf)
Signed-off-by: Cheng Pan <ch...@apache.org>
---
externals/kyuubi-spark-sql-engine/pom.xml | 3 +++
.../META-INF/services/io.grpc.LoadBalancerProvider | 20 --------------------
.../META-INF/services/io.grpc.NameResolverProvider | 21 ---------------------
3 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/externals/kyuubi-spark-sql-engine/pom.xml b/externals/kyuubi-spark-sql-engine/pom.xml
index 4a0c88f69..3ec91c3a0 100644
--- a/externals/kyuubi-spark-sql-engine/pom.xml
+++ b/externals/kyuubi-spark-sql-engine/pom.xml
@@ -324,6 +324,9 @@
</includes>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
</configuration>
<executions>
<execution>
diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider
deleted file mode 100644
index 9d194dceb..000000000
--- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-io.grpc.internal.PickFirstLoadBalancerProvider
-io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider
-io.grpc.grpclb.GrpclbLoadBalancerProvider
diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.NameResolverProvider b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.NameResolverProvider
deleted file mode 100644
index 46b5718ff..000000000
--- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.NameResolverProvider
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-io.etcd.jetcd.resolver.DnsSrvResolverProvider
-io.etcd.jetcd.resolver.HttpResolverProvider
-io.etcd.jetcd.resolver.HttpsResolverProvider
-io.etcd.jetcd.resolver.IPResolverProvider