From 2b152fb8d089a0d11aa771b67cb9e13cf9636ee5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 17 Aug 2023 14:04:45 +0200
Subject: [PATCH] Drop legacy OpenJDK 8 toolchain package

---
 javapackages-bootstrap.spec | 19 +------------------
 toolchains-openjdk8.xml     | 11 -----------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 toolchains-openjdk8.xml

diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec
index 734f72f..b140161 100644
--- a/javapackages-bootstrap.spec
+++ b/javapackages-bootstrap.spec
@@ -32,8 +32,6 @@ Source0:        https://github.com/fedora-java/javapackages-bootstrap/releases/d
 # License breakdown
 Source1:        javapackages-bootstrap-PACKAGE-LICENSING
 
-Source101:      toolchains-openjdk8.xml
-
 # To obtain the following sources:
 # tar -xf ${name}-${version}.tar.xz
 # pushd ${name}-${version}
@@ -306,20 +304,12 @@ depend on JPB for everything, without depending on any other Java packages. For
 example, JPB contains embedded version of XMvn, removing dependency of JPT on
 XMvn, allowing JPT to be used before one builds XMvn package.
 
-%package openjdk8
-Summary:        OpenJDK 8 toolchain for Java Packages Bootstrap
-Requires:       %{name}
-Requires:       java-1.8.0-openjdk-devel
-
-%description openjdk8
-OpenJDK 8 toolchain for Java Packages Bootstrap.
-
 %prep
 %setup -q
 
 # leave out the first source as it has already been extracted
 # leave out licensing breakdown file
-other_sources=$(echo %{sources} | cut -d' ' -f4-)
+other_sources=$(echo %{sources} | cut -d' ' -f3-)
 
 for source in ${other_sources}; do
   tar -xf "${source}"
@@ -351,9 +341,6 @@ JAVA_HOME=%{javaHomePath} ./mbi.sh dist \
   -launchersPath=%{launchersPath} \
   -licensesPath=%{_licensedir}/%{name} \
 
-# Use custom toolchains.xml
-cp -p %{SOURCE101} %{buildroot}%{mavenHomePath}/conf/toolchains.xml
-
 install -D -p -m 644 downstream/xmvn-generator/src/main/lua/xmvn-generator.lua %{buildroot}%{_rpmluadir}/%{name}-generator.lua
 install -D -p -m 644 downstream/xmvn-generator/src/main/rpm/macros.xmvngen %{buildroot}%{_rpmmacrodir}/macros.jpbgen
 install -D -p -m 644 downstream/xmvn-generator/src/main/rpm/macros.xmvngenhook %{buildroot}%{_sysconfdir}/rpm/macros.jpbgenhook
@@ -378,7 +365,6 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr
 
 %files
 %{mavenHomePath}
-%exclude %{mavenHomePath}/conf/toolchains.xml
 %{metadataPath}/*
 %{artifactsPath}/*
 %{launchersPath}/*
@@ -387,9 +373,6 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr
 %{_fileattrsdir}/*
 %{_sysconfdir}/rpm/*
 
-%files openjdk8
-%{mavenHomePath}/conf/toolchains.xml
-
 %license %{_licensedir}/%{name}
 %doc README.md
 %doc AUTHORS
diff --git a/toolchains-openjdk8.xml b/toolchains-openjdk8.xml
deleted file mode 100644
index 25d130f..0000000
--- a/toolchains-openjdk8.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<toolchains>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <xmvn>xmvn</xmvn>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-1.8.0-openjdk</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>