This is an automated email from the ASF dual-hosted git repository.
oflebbe 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 93f79a1 BIGTOP-3291. Fix build failure of Sqoop.
new 81b0b13 Merge pull request #582 from iwasakims/BIGTOP-3291
93f79a1 is described below
commit 93f79a17fe65cccbcb53d4cc93dc519889825e55
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Fri Jan 24 06:21:18 2020 +0000
BIGTOP-3291. Fix build failure of Sqoop.
---
.../src/common/sqoop/patch0-SQOOP-3462.diff | 50 ++++++++++++++++++++++
bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec | 2 +
2 files changed, 52 insertions(+)
diff --git a/bigtop-packages/src/common/sqoop/patch0-SQOOP-3462.diff
b/bigtop-packages/src/common/sqoop/patch0-SQOOP-3462.diff
new file mode 100644
index 0000000..5daee69
--- /dev/null
+++ b/bigtop-packages/src/common/sqoop/patch0-SQOOP-3462.diff
@@ -0,0 +1,50 @@
+From d236894985b5fdf1423598da0139a5f82737c9e8 Mon Sep 17 00:00:00 2001
+From: Istvan Toth <[email protected]>
+Date: Thu, 16 Jan 2020 08:55:23 +0100
+Subject: [PATCH] SQOOP-3462 Sqoop ant build fails due to outdated maven repo
+ URLs
+
+use https://repo1.maven.org URL int ant build.
+---
+ build.xml | 4 ++--
+ ivy/ivysettings.xml | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 9245f3e42..84ab6dfb8 100644
+--- a/build.xml
++++ b/build.xml
+@@ -169,9 +169,9 @@
+ <property name="ivysettings.xml" location="${ivy.dir}/ivysettings.xml"/>
+ <property name="ivy.jar" location="${lib.dir}/ivy-${ivy.version}.jar"/>
+ <property name="ivy_repo_url"
+-
value="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar";
/>
++
value="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar";
/>
+ <property name="mvn_repo_url"
+-
value="http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks/${mvn.version}/maven-ant-tasks-${mvn.version}.jar"/>
++
value="https://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/${mvn.version}/maven-ant-tasks-${mvn.version}.jar"/>
+ <property name="mvn.jar"
+ location="${build.dir}/maven-ant-tasks-${mvn.version}.jar" />
+ <property name="build.ivy.dir" location="${build.dir}/ivy" />
+diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
+index f0383c320..62b034821 100644
+--- a/ivy/ivysettings.xml
++++ b/ivy/ivysettings.xml
+@@ -23,7 +23,7 @@ under the License.
+ see http://www.jayasoft.org/ivy/doc/configuration
+ -->
+ <!-- you can override this property to use mirrors
+- http://repo1.maven.org/maven2/
++ https://repo1.maven.org/maven2/
+ http://mirrors.dotsrc.org/maven2
+ http://ftp.ggi-project.org/pub/packages/maven2
+ http://mirrors.sunsite.dk/maven2
+@@ -31,7 +31,7 @@ under the License.
+ http://ibiblio.lsu.edu/main/pub/packages/maven2
+ http://www.ibiblio.net/pub/packages/maven2
+ -->
+- <property name="repo.maven.org" value="http://repo1.maven.org/maven2/";
++ <property name="repo.maven.org" value="https://repo1.maven.org/maven2/";
+ override="false"/>
+ <property name="snapshot.apache.org"
+ value="https://repository.apache.org/content/repositories/snapshots/";
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index 37ca5af..134ebd7 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -60,6 +60,7 @@ Source1: do-component-build
Source2: install_%{name}.sh
Source3: sqoop-metastore.sh
Source4: sqoop-metastore.sh.suse
+#BIGTOP_PATCH_FILES
Buildarch: noarch
BuildRequires: asciidoc, xmlto
Requires: hadoop-client, bigtop-utils >= 0.7
@@ -98,6 +99,7 @@ server for Sqoop clients across a network to use.
%prep
%setup -n %{name}-%{sqoop_base_version}
+#BIGTOP_PATCH_COMMANDS
%build
bash %{SOURCE1} -Dversion=%{sqoop_base_version}
