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 fb686178 BIGTOP-3737: Fix build failure of Sqoop due to unresolved
dependency on javax.activation-api (#957)
fb686178 is described below
commit fb68617817d945a5f42d05626e3e2141b58ea397
Author: 吴治国 <[email protected]>
AuthorDate: Thu Jul 21 12:38:55 2022 +0800
BIGTOP-3737: Fix build failure of Sqoop due to unresolved dependency on
javax.activation-api (#957)
---
.../patch3-hadoop333-denpendency-changes.diff | 37 ++++++++++++++++++++++
bigtop.bom | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git
a/bigtop-packages/src/common/sqoop/patch3-hadoop333-denpendency-changes.diff
b/bigtop-packages/src/common/sqoop/patch3-hadoop333-denpendency-changes.diff
new file mode 100644
index 00000000..b645d06f
--- /dev/null
+++ b/bigtop-packages/src/common/sqoop/patch3-hadoop333-denpendency-changes.diff
@@ -0,0 +1,37 @@
+diff --git a/ivy.xml b/ivy.xml
+index e4b45bfd..8425bcf5 100644
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -105,6 +105,8 @@ under the License.
+ conf="common->default;redist->default"/>
+ <dependency org="org.apache.commons" name="commons-lang3"
rev="${commons-lang3.version}"
+ conf="common->default;redist->default"/>
++ <dependency org="javax.activation" name="javax.activation-api"
rev="${javax-activation-api.version}"
++ conf="common->default;redist->default"/>
+ <dependency org="org.kitesdk" name="kite-data-mapreduce"
rev="${kite-data.version}"
+ conf="common->default;redist->default">
+ <exclude org="org.apache.avro" module="avro" />
+diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
+index f0383c32..b9994c18 100644
+--- a/ivy/ivysettings.xml
++++ b/ivy/ivysettings.xml
+@@ -47,6 +47,7 @@ under the License.
+ override="false"/>
+ <property name="maven2.pattern"
+
value="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier])"/>
++ <property name="packaging.type" value="jar"/>
+ <property name="repo.dir" value="${user.home}/.m2/repository"/>
+ <property name="ivy.cache.dir" value="${user.home}/.ivy2/cache"/>
+ <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
+diff --git a/ivy/libraries.properties b/ivy/libraries.properties
+index 2ef04f4f..6fc2e122 100644
+--- a/ivy/libraries.properties
++++ b/ivy/libraries.properties
+@@ -31,6 +31,7 @@ commons-lang.version=2.4
+ commons-lang3.version=3.4
+ commons-logging.version=1.0.4
+ commons-net.version=3.1
++javax-activation-api.version=1.2.0
+
+ hsqldb.version=1.8.0.10
+
diff --git a/bigtop.bom b/bigtop.bom
index c7cec178..c2da33c4 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 = 2 }
+ version { base = '1.4.7'; pkg = base; release = 3 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = destination }
url { download_path = "/$name/${version.base}/"
