From 8abedf135476c446f32945edde1314e6b224191a Mon Sep 17 00:00:00 2001 From: Dennis Li <23002167+dli357@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:49:53 -0800 Subject: [PATCH] [CDAP-20872] Remove Tink dependency from cdap-security --- cdap-hbase-compat-base/pom.xml | 8 ++++-- cdap-security/pom.xml | 48 ---------------------------------- pom.xml | 24 +++++++---------- 3 files changed, 16 insertions(+), 64 deletions(-) diff --git a/cdap-hbase-compat-base/pom.xml b/cdap-hbase-compat-base/pom.xml index 70a756f3d553..fea2ffb3b1a3 100644 --- a/cdap-hbase-compat-base/pom.xml +++ b/cdap-hbase-compat-base/pom.xml @@ -16,8 +16,8 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cdap io.cdap.cdap @@ -138,6 +138,10 @@ org.slf4j jcl-over-slf4j + + com.google.protobuf + protobuf-java + diff --git a/cdap-security/pom.xml b/cdap-security/pom.xml index f3a5b2958f1d..42298723843a 100644 --- a/cdap-security/pom.xml +++ b/cdap-security/pom.xml @@ -134,10 +134,6 @@ org.apache.hadoop hadoop-minikdc - - com.google.crypto.tink - tink - org.apache.hbase hbase-common @@ -197,50 +193,6 @@ - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - false - - - com.google.crypto.tink:tink - com.google.protobuf:protobuf-java - - - - - com.google.protobuf - io.cdap.cdap.shaded.com.google.protobuf - - - com.google.crypto.tink - io.cdap.cdap.shaded.com.google.crypto.tink - - - - - - shade - package - - shade - - - - dist-shade - package - - shade - - - ${stage.lib.dir} - ${project.groupId}.${project.build.finalName} - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/pom.xml b/pom.xml index 75bda49de465..8589c086cba9 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,6 @@ 1.7.0 0.15.0-incubating 0.8.4 - 1.6.0 0.9.3 1.3.1 2.3.6 @@ -182,6 +181,8 @@ 2.5.1 5.9.0.202009080501-r + + 3.14.0 http://cask.invalid.snapshot.repo.co http://cask.invalid.release.repo.co @@ -1598,17 +1599,6 @@ jackson-module-scala_2.12 ${jackson.version} - - com.google.crypto.tink - tink - ${tink.version} - - - com.google.code.gson - gson - - - commons-collections commons-collections @@ -1633,6 +1623,12 @@ test + + + com.google.protobuf + protobuf-java + ${protobuf.version} + @@ -2051,8 +2047,8 @@ all opt etc --config-files etc/cdap --config-files etc/logrotate.d --config-files etc/security - org.apache.hadoop,org.apache.hbase,com.google.protobuf,\ - org.datanucleus,asm,org.apache.spark,slf4j-log4j12,commons-logging,com.google.crypto.tink + org.apache.hadoop,org.apache.hbase,\ + org.datanucleus,asm,org.apache.spark,slf4j-log4j12,commons-logging