Drop subpackages related to Java other than 21

Resolves: RHEL-51276

javapackages-tools.spec

@@ -25,9 +25,6 @@ BuildArch:      noarch
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
 Source3:        javapackages-config.json
 
-Source8:        toolchains-openjdk8.xml
-Source11:       toolchains-openjdk11.xml
-Source17:       toolchains-openjdk17.xml
 Source21:       toolchains-openjdk21.xml
 
 Patch0:         0001-coverage-use-usercustomize.patch
@@ -137,33 +134,6 @@ Requires:       javapackages-local = %{version}-%{release}
 This package provides previously deprecated macros and scripts to
 support Java packaging as well as some additions to them.
 
-%package -n maven-local-openjdk8
-Summary:        OpenJDK 8 toolchain for XMvn
-RemovePathPostfixes: -openjdk8
-Requires:       maven-local
-Requires:       java-1.8.0-openjdk-devel
-
-%description -n maven-local-openjdk8
-OpenJDK 8 toolchain for XMvn
-
-%package -n maven-local-openjdk11
-Summary:        OpenJDK 11 toolchain for XMvn
-RemovePathPostfixes: -openjdk11
-Requires:       maven-local
-Requires:       java-11-openjdk-devel
-
-%description -n maven-local-openjdk11
-OpenJDK 11 toolchain for XMvn
-
-%package -n maven-local-openjdk17
-Summary:        OpenJDK 17 toolchain for XMvn
-RemovePathPostfixes: -openjdk17
-Requires:       maven-local
-Requires:       java-17-openjdk-devel
-
-%description -n maven-local-openjdk17
-OpenJDK 17 toolchain for XMvn
-
 %package -n maven-local-openjdk21
 Summary:        OpenJDK 21 toolchain for XMvn
 RemovePathPostfixes: -openjdk21
@@ -197,9 +167,6 @@ rm -rf %{buildroot}%{_sysconfdir}/ant.d
 %endif
 
 mkdir -p %{buildroot}%{maven_home}/conf/
-cp -p %{SOURCE8} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk8
-cp -p %{SOURCE11} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk11
-cp -p %{SOURCE17} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk17
 cp -p %{SOURCE21} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk21
 
 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
@@ -237,18 +204,6 @@ ln -s %{_datadir}/java-utils %{buildroot}%{_usr}/share/java-utils
 %files -n ivy-local -f files-ivy
 %endif
 
-%files -n maven-local-openjdk8
-%dir %{maven_home}/conf
-%{maven_home}/conf/toolchains.xml-openjdk8
-
-%files -n maven-local-openjdk11
-%dir %{maven_home}/conf
-%{maven_home}/conf/toolchains.xml-openjdk11
-
-%files -n maven-local-openjdk17
-%dir %{maven_home}/conf
-%{maven_home}/conf/toolchains.xml-openjdk17
-
 %files -n maven-local-openjdk21
 %dir %{maven_home}/conf
 %{maven_home}/conf/toolchains.xml-openjdk21
@@ -260,7 +215,8 @@ ln -s %{_datadir}/java-utils %{buildroot}%{_usr}/share/java-utils
 * Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-10
 - Switch to OpenJDK 21 as default JDK/JRE
 - Drop generated Requires on JRE
-- Resolves: RHEL-49822, RHEL-51276
+- Drop subpackages related to Java other than 21
+- Resolves: RHEL-49822, RHEL-51276, RHEL-51276
 
 * Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 6.2.0-10
 - Bump release for Aug 2024 java mass rebuild

toolchains-openjdk11.xml

@@ -1,11 +0,0 @@
-<toolchains>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <xmvn>xmvn</xmvn>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-11-openjdk</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>

toolchains-openjdk17.xml

@@ -1,11 +0,0 @@
-<toolchains>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <xmvn>xmvn</xmvn>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-17-openjdk</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>

toolchains-openjdk8.xml

@@ -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>