hadoop 3.3.4-2

- Add to yarn conflict
- Set JAVA_HOME before building the package

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e0e64805bfc..cde2b991d4aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = hadoop
 	pkgdesc = An open-source software for reliable, scalable, distributed computing
 	pkgver = 3.3.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://hadoop.apache.org/
 	install = hadoop.install
 	arch = x86_64
@@ -15,6 +15,7 @@ pkgbase = hadoop
 	depends = java-runtime-headless-openjdk=11
 	depends = openssh
 	depends = protobuf
+	conflicts = yarn
 	source = https://github.com/apache/hadoop/archive/refs/tags/rel/release-3.3.4.tar.gz
 	source = hadoop
 	source = hadoop.sh
diff --git a/PKGBUILD b/PKGBUILD
index 7db4d2acd797..31f705caf241 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,12 @@
 
 pkgname=hadoop
 pkgver=3.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source software for reliable, scalable, distributed computing'
 arch=('x86_64')
 url='https://hadoop.apache.org/'
 license=('apache')
+conflicts=('yarn')
 makedepends=('cmake' 'gcc' 'java-environment<=11' 'make' 'maven')
 depends=('inetutils' 'java-runtime-headless-openjdk=11' 'openssh' 'protobuf')
 
@@ -27,6 +28,7 @@ sha256sums=('a10fb474084c5d38b93ae901b453794d668ca98aa419a0546807b10cdae17827'
 install=$pkgname.install
 
 build() {
+    export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
     cd hadoop-rel-release-${pkgver}
     mvn package -Pdist,native \
         -Drequire.openssl -Drequire.zstd \