[bigtop] branch master updated: BIGTOP-3735: Fix sqoop cannot found StringUtils from common-lang (#944)

[iwasakims]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 18a5445a BIGTOP-3735: Fix sqoop cannot found StringUtils from 
common-lang (#944)
18a5445a is described below

commit 18a5445acf67ba6fbb02831a8428f2ab4569926b
Author: 吴治国 <chan...@startdt.com>
AuthorDate: Thu Jul 14 11:26:14 2022 +0800

    BIGTOP-3735: Fix sqoop cannot found StringUtils from common-lang (#944)
    
    (cherry picked from commit 2b13a53e64b79aaa113c5553577258dfb857c25e)
---
 .../common/sqoop/patch2-redist-commons-lang.diff    | 21 +++++++++++++++++++++
 bigtop.bom                                          |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bigtop-packages/src/common/sqoop/patch2-redist-commons-lang.diff 
b/bigtop-packages/src/common/sqoop/patch2-redist-commons-lang.diff
new file mode 100644
index 00000000..4eae41eb
--- /dev/null
+++ b/bigtop-packages/src/common/sqoop/patch2-redist-commons-lang.diff
@@ -0,0 +1,21 @@
+diff --git a/ivy.xml b/ivy.xml
+index e4b45bfd..63cdcce4 100644
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -103,6 +103,8 @@ under the License.
+       conf="common->default;redist->default"/>
+     <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
+       conf="common->default;redist->default"/>
++    <dependency org="commons-lang" name="commons-lang" 
rev="${commons-lang.version}"
++      conf="common->default;redist->default"/>
+     <dependency org="org.apache.commons" name="commons-lang3" 
rev="${commons-lang3.version}"
+       conf="common->default;redist->default"/>
+     <dependency org="org.kitesdk" name="kite-data-mapreduce" 
rev="${kite-data.version}"
+@@ -121,8 +123,6 @@ under the License.
+
+     <dependency org="com.google.code.p.arat" name="rat-lib"
+           rev="${rats-lib.version}" conf="releaseaudit->default" />
+-    <dependency org="commons-lang" name="commons-lang"
+-      rev="${commons-lang.version}" conf="releaseaudit->default"/>
+     <dependency org="commons-collections" name="commons-collections"
+       rev="${commons-collections.version}" conf="releaseaudit->default"/>
diff --git a/bigtop.bom b/bigtop.bom
index b5eae22c..bfa00edd 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -186,7 +186,7 @@ bigtop {
     'sqoop' {
       name    = 'sqoop'
       relNotes = 'Apache Sqoop v1'
-      version { base = '1.4.7'; pkg = base; release = 1 }
+      version { base = '1.4.7'; pkg = base; release = 2 }
       tarball { destination = "${name}-${version.base}.tar.gz"
                 source      = destination }
       url     { download_path = "/$name/${version.base}/"