From e0989c750c16a6f624170d5a98d6ef63b1470135 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 16 Dec 2020 12:18:39 +0100
Subject: [PATCH] Update to upstream version 1.2.0

---
 .gitignore                                |  1 +
 0002-Bind-to-OpenJDK-11-for-runtime.patch | 35 +++++++++++++++++++++++
 javapackages-bootstrap.spec               | 13 +++++++--
 sources                                   |  2 +-
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 0002-Bind-to-OpenJDK-11-for-runtime.patch

diff --git a/.gitignore b/.gitignore
index 6f74e56..c127809 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@
 /xmvn.tar.xz
 /xz-java.tar.xz
 /javapackages-bootstrap-1.1.0.tar.xz
+/javapackages-bootstrap-1.2.0.tar.xz
diff --git a/0002-Bind-to-OpenJDK-11-for-runtime.patch b/0002-Bind-to-OpenJDK-11-for-runtime.patch
new file mode 100644
index 0000000..11367d8
--- /dev/null
+++ b/0002-Bind-to-OpenJDK-11-for-runtime.patch
@@ -0,0 +1,35 @@
+From ad65f62443f23076dfc520d3f0589282da9530fa Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 8 Jul 2020 09:04:57 +0200
+Subject: [PATCH 2/2] Bind to OpenJDK 11 for runtime
+
+---
+ apache-maven/src/bin/mvn | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
+index a554c6617..23b9dd902 100755
+--- a/downstream/maven/apache-maven/src/bin/mvn
++++ b/downstream/maven/apache-maven/src/bin/mvn
+@@ -27,17 +27,7 @@
+ #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
+ # -----------------------------------------------------------------------------
+ 
+-if [ -z "$MAVEN_SKIP_RC" ] ; then
+-
+-  if [ -f /etc/mavenrc ] ; then
+-    . /etc/mavenrc
+-  fi
+-
+-  if [ -f "$HOME/.mavenrc" ] ; then
+-    . "$HOME/.mavenrc"
+-  fi
+-
+-fi
++export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+ 
+ # OS specific support. $var _must_ be set to either true or false.
+ cygwin=false;
+-- 
+2.25.4
+
diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec
index 60eaafa..9e9c161 100644
--- a/javapackages-bootstrap.spec
+++ b/javapackages-bootstrap.spec
@@ -19,7 +19,7 @@
 %endif
 
 Name:           javapackages-bootstrap
-Version:        1.1.0
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        A means of bootstrapping Java Packages Tools
 # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING
@@ -148,6 +148,8 @@ Source1106:     xmlunit.tar.xz
 Source1107:     xmvn.tar.xz
 Source1108:     xz-java.tar.xz
 
+Patch0:         0002-Bind-to-OpenJDK-11-for-runtime.patch
+
 Provides:       bundled(ant) = 1.10.9
 Provides:       bundled(apache-parent) = 23
 Provides:       bundled(apiguardian) = 1.1.0
@@ -302,6 +304,8 @@ do
   tar -xf "${source}"
 done
 
+%patch0 -p1
+
 for patch_path in patches/*/*
 do
   package_name="$(echo ${patch_path} | cut -f2 -d/)"
@@ -314,10 +318,10 @@ done
 
 %build
 export LC_ALL=C.utf8
-./mbi.j build -parallel
+JAVA_HOME=%{java_home} ./mbi.sh build -parallel
 
 %install
-./mbi.j dist \
+JAVA_HOME=%{java_home} ./mbi.sh dist \
   -basePackageName=%{name} \
   -installRoot=%{buildroot} \
   -mavenHomePath=%{mavenHomePath} \
@@ -351,6 +355,9 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
 %doc AUTHORS
 
 %changelog
+* Wed Dec 16 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-1
+- Update to upstream version 1.2.0
+
 * Thu Dec  3 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.0-1
 - Update to upstream version 1.1.0
 
diff --git a/sources b/sources
index ec60a87..4d0f60e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (javapackages-bootstrap-1.1.0.tar.xz) = ba317687ba0bbadcd170d58bc9db2ea4fb5dc99ac718db8188ea9656f0ce23ef3ece21e973fa500c339554bcfc250aed72f6ec527e533b84efed02715847c401
+SHA512 (javapackages-bootstrap-1.2.0.tar.xz) = e26a730552535ac823fcdbd93c100d44623057d1c9b700ec217903b08d3ad6541d2bc9e3c7bfcc8474117637e0c7de13f0c7200e75ca10c3c18fa340749f002c
 SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc
 SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004
 SHA512 (apiguardian.tar.xz) = c037c0afd3bb869585a99871c610bdc231ca66cf890199136bc822a67e0ddf252cf757d8ee04e56645117e75c816172e4e58efca39b3825c71e4b26a1d753fab