8 changed files with 186 additions and 153 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/6.0.0.tar.gz
+SOURCES/6.2.0.tar.gz
--- a/.javapackages-tools.metadata
+++ b/.javapackages-tools.metadata
@ -1 +1 @@
-0c2f59a61e8e8eb664f679efab383deadaed2cc6 SOURCES/6.0.0.tar.gz
+eacadc672ad89d94e1e699f96fd5ea006dc18a07 SOURCES/6.2.0.tar.gz
--- a/SOURCES/0001-Do-not-set-JAVA_HOME-for-ant.patch
+++ b/SOURCES/0001-Do-not-set-JAVA_HOME-for-ant.patch
@ -1,25 +0,0 @@
-From 849e007338475a125cc791a91902b010ff3b5337 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Tue, 22 Oct 2024 00:09:51 +0200
-Subject: [PATCH] Do not set JAVA_HOME for ant
-
---
- macros.d/macros.jpackage | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
-index 13595e9..6c70788 100644
--- a/macros.d/macros.jpackage
-+++ b/macros.d/macros.jpackage
-@@ -15,7 +15,7 @@
- #==============================================================================
- # ---- default Java commands
- 
-%ant            %{?jpb_env} JAVA_HOME=%{java_home} ant
-+%ant            %{?jpb_env} ant
- %jar            %{java_home}/bin/jar
- %java           %(. @{javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)
- %javac          %{java_home}/bin/javac
-- 
-2.47.0
-
--- a/SOURCES/0001-coverage-use-usercustomize.patch
+++ b/SOURCES/0001-coverage-use-usercustomize.patch
@ -0,0 +1,19 @@
+From cd87af9da739da12b0dd4bf104ce4139388c722b Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Mon, 16 Oct 2023 17:56:46 -0400
+Subject: [PATCH] coverage: use usercustomize
+
+Providing sitecustomize clobbers any system-installed module, such as
+that in Fedora's flatpak-runtime-config (which adds the /app prefix).
+---
+ test/coverage/{sitecustomize.py => usercustomize.py} | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename test/coverage/{sitecustomize.py => usercustomize.py} (100%)
+
+diff --git a/test/coverage/sitecustomize.py b/test/coverage/usercustomize.py
+similarity index 100%
+rename from test/coverage/sitecustomize.py
+rename to test/coverage/usercustomize.py
+-- 
+2.41.0
+
--- a/SOURCES/toolchains-openjdk17.xml
+++ b/SOURCES/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>
--- a/SOURCES/toolchains-openjdk21.xml
+++ b/SOURCES/toolchains-openjdk21.xml
@ -5,7 +5,7 @@
      <xmvn>xmvn</xmvn>
    </provides>
    <configuration>
-      <jdkHome>/usr/lib/jvm/java-11-openjdk</jdkHome>
+      <jdkHome>/usr/lib/jvm/java-21-openjdk</jdkHome>
    </configuration>
  </toolchain>
 </toolchains>
--- a/SOURCES/toolchains-openjdk8.xml
+++ b/SOURCES/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>
--- a/SPECS/javapackages-tools.spec
+++ b/SPECS/javapackages-tools.spec
@ -1,57 +1,52 @@
-%bcond_with bootstrap
-
+%if 0%{?fedora}
+%bcond_with xmvn_generator
+%bcond_without ivy
+%else
+%bcond_without xmvn_generator
 %bcond_with ivy
-
-# Don't generate requires on jpackage-utils and java-headless for
-# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
-%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$
+%endif

 %global python_prefix python3
 %global python_interpreter %{?__python3}%{!?__python3:dummy}

-%global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
-%global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
+%global default_jdk %{_prefix}/lib/jvm/java-21-openjdk
+%global default_jre %{_prefix}/lib/jvm/jre-21-openjdk
+
+%global maven_home %{_usr}/share/xmvn

 Name:           javapackages-tools
-Version:        6.0.0
-Release:        7%{?dist}
+Version:        6.2.0
+Release:        12%{?dist}
 Summary:        Macros and scripts for Java packaging support
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/fedora-java/javapackages
 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

-Patch1:         0001-Do-not-set-JAVA_HOME-for-ant.patch
+Patch0:         0001-coverage-use-usercustomize.patch

 BuildRequires:  coreutils
 BuildRequires:  which
 BuildRequires:  make
+BuildRequires:  asciidoc
+BuildRequires:  xmlto
 BuildRequires:  %{python_prefix}-devel
 BuildRequires:  %{python_prefix}-lxml
 BuildRequires:  %{python_prefix}-setuptools
-%if !0%{?rhel}
 BuildRequires:  %{python_prefix}-pytest
-BuildRequires:  %{python_prefix}-pytest-cov
-%endif

 Requires:       javapackages-filesystem = %{version}-%{release}
 Requires:       coreutils
 Requires:       findutils
 Requires:       which
 # default JRE
-Requires:       java-17-openjdk-headless
+Requires:       java-21-openjdk-headless

 Provides:       jpackage-utils = %{version}-%{release}
-# These could be generated automatically, but then we would need to
-# depend on javapackages-local for dependency generator.
-Provides:       mvn(com.sun:tools) = SYSTEM
-Provides:       mvn(sun.jdk:jconsole) = SYSTEM

 %description
 This package provides macros and scripts to support Java packaging.
@ -68,10 +63,7 @@ install their content.
 Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       javapackages-local = %{version}-%{release}
-%if %{without bootstrap}
-Requires:       %{_bindir}/xmvn
-# NOTE keep using Java 11 for the whole lifecycle
-Requires:       maven-openjdk11
+Requires:       xmvn-minimal
 Requires:       mvn(org.fedoraproject.xmvn:xmvn-mojo)
 # Common Maven plugins required by almost every build. It wouldn't make
 # sense to explicitly require them in every package built with Maven.
@ -79,7 +71,6 @@ Requires:       mvn(org.apache.maven.plugins:maven-compiler-plugin)
 Requires:       mvn(org.apache.maven.plugins:maven-jar-plugin)
 Requires:       mvn(org.apache.maven.plugins:maven-resources-plugin)
 Requires:       mvn(org.apache.maven.plugins:maven-surefire-plugin)
-%endif

 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
@ -107,17 +98,12 @@ packaging in Linux distributions

 %package -n javapackages-local
 Summary:        Non-essential macros and scripts for Java packaging support
-Requires:       javapackages-generators = %{version}-%{release}
-%if %{with bootstrap}
-Requires:       javapackages-bootstrap
-%else
-Requires:       %{_bindir}/xmvn-install
-Requires:       %{_bindir}/xmvn-subst
-Requires:       %{_bindir}/xmvn-resolve
+Requires:       javapackages-common = %{version}-%{release}
 # Java build systems don't have hard requirement on java-devel, so it should be there
-# NOTE keep using Java 11 for the whole lifecycle
-Requires:       java-11-openjdk-devel
-Requires:       (ant-openjdk11 if ant)
+Requires:       java-21-openjdk-devel
+Requires:       xmvn-tools
+%if %{with xmvn_generator}
+Requires:       xmvn-generator
 %endif

 %description -n javapackages-local
@ -132,38 +118,34 @@ Requires:       %{python_interpreter}
 %description -n javapackages-generators
 RPM dependency generators to support Java packaging.

-%package -n maven-local-openjdk8
-Summary:        OpenJDK 8 toolchain for XMvn
-RemovePathPostfixes: -openjdk8
-Requires:       maven-local
-Requires:       java-1.8.0-openjdk-devel
+%package -n javapackages-common
+Summary:        Non-essential macros and scripts for Java packaging support
+Requires:       javapackages-generators = %{version}-%{release}

-%description -n maven-local-openjdk8
-OpenJDK 8 toolchain for XMvn
+%description -n javapackages-common
+This package provides non-essential, but commonly used macros and
+scripts to support Java packaging.

-%package -n maven-local-openjdk11
-Summary:        OpenJDK 11 toolchain for XMvn
-RemovePathPostfixes: -openjdk11
-Requires:       maven-local
-Requires:       java-11-openjdk-devel
+%package -n javapackages-compat
+Summary:        Previously deprecated macros and scripts for Java packaging support
+Requires:       javapackages-local = %{version}-%{release}

-%description -n maven-local-openjdk11
-OpenJDK 11 toolchain for XMvn
+%description -n javapackages-compat
+This package provides previously deprecated macros and scripts to
+support Java packaging as well as some additions to them.

-%package -n maven-local-openjdk17
-Summary:        OpenJDK 17 toolchain for XMvn
-RemovePathPostfixes: -openjdk17
+%package -n maven-local-openjdk21
+Summary:        OpenJDK 21 toolchain for XMvn
+RemovePathPostfixes: -openjdk21
 Requires:       maven-local
-Requires:       java-17-openjdk-devel
+Requires:       java-21-openjdk-devel

-%description -n maven-local-openjdk17
-OpenJDK 17 toolchain for XMvn
+%description -n maven-local-openjdk21
+OpenJDK 21 toolchain for XMvn

 %prep
-%autosetup -p1 -n javapackages-%{version}
-
-sed -i '/^manpage /d' build
-sed -i '/${mandir}/d' install
+%setup -q -n javapackages-%{version}
+%patch0 -p1

 %build
 %configure --pyinterpreter=%{python_interpreter} \
@ -184,25 +166,37 @@ rm -rf %{buildroot}%{_sysconfdir}/ivy
 rm -rf %{buildroot}%{_sysconfdir}/ant.d
 %endif

-mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
-cp -p %{SOURCE8} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
-cp -p %{SOURCE11} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
-cp -p %{SOURCE17} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
+mkdir -p %{buildroot}%{maven_home}/conf/
+cp -p %{SOURCE21} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk21

 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json

-%if !0%{?rhel}
-%check
-#./check
+%if 0%{?flatpak}
+# make both /app (runtime deps) and /usr (build-only deps) builds discoverable
+sed -e '/^JAVA_LIBDIR=/s|$|:/usr/share/java|' \
+    -e '/^JNI_LIBDIR=/s|$|:/usr/lib/java|' \
+    -i %{buildroot}%{_sysconfdir}/java/java.conf
+# /usr path is hard-coded in xmvn
+ln -s %{_datadir}/java-utils %{buildroot}%{_usr}/share/java-utils
 %endif

+%check
+./check
+
 %files -f files-tools
+%if 0%{?flatpak}
+%{_usr}/share/java-utils
+%endif

 %files -n javapackages-filesystem -f files-filesystem

 %files -n javapackages-generators -f files-generators

-%files -n javapackages-local -f files-local
+%files -n javapackages-common -f files-common
+
+%files -n javapackages-compat -f files-compat
+
+%files -n javapackages-local

 %files -n maven-local

@ -210,56 +204,123 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %files -n ivy-local -f files-ivy
 %endif

-%files -n maven-local-openjdk8
-%dir %{_datadir}/xmvn/conf
-%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
-
-%files -n maven-local-openjdk11
-%dir %{_datadir}/xmvn/conf
-%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
-
-%files -n maven-local-openjdk17
-%dir %{_datadir}/xmvn/conf
-%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
+%files -n maven-local-openjdk21
+%dir %{maven_home}/conf
+%{maven_home}/conf/toolchains.xml-openjdk21

 %files -n %{python_prefix}-javapackages -f files-python
 %license LICENSE

 %changelog
-* Mon Nov 18 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-7
- Use Java 11 build tool bindings for package builds
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.2.0-12
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* 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
+- 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

-* Mon Nov 04 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-6
- Drop generated Requires on various Java versions
- Related: RHEL-62409
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.2.0-9
+- Bump release for June 2024 mass rebuild

-* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
- Include java-21-headless in generated auto-requires
- Related: RHEL-62409
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

-* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
- Make OpenJDK 17 the default JRE/JDK
- Related: RHEL-62403
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

-* Wed Jan 25 2023 Marián Konček <mkoncek@redhat.com> - 6.0.0-4
+* Mon Nov 20 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 6.2.0-6
+- Fix flatpak builds of Java packages
+
+* Thu Oct 19 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-5
+- Backport upstream patch to fix Flatpak builds
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-4
+- Add support for OpenJDK 21
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-3
+- Convert License tag to SPDX format
+
+* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-2
+- Enable XMvn dependency generator in ELN
+
+* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-1
+- Update to upstream version 6.2.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 6.1.0-9
+- Rebuilt for Python 3.12
+
+* Wed Mar 08 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-8
+- Make javapackages-extra depend on jurand
+
+* Wed Jan 25 2023 Marian Koncek <mkoncek@redhat.com> - 6.1.0-7
 - Add generated Requires on multiple versions of java-headless
- Related: rhbz#2164437

-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-3
- Implement OpenJDK 11 and 17 toolchains
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Aug 19 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-5
+- Fix generated auto-requires on java-headless
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.0.0-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jul 18 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-3
+- Drop ExclusiveArch
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 6.1.0-2
+- Rebuilt for Drop i686 JDKs
+
+* Thu Jun 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-1
+- Update to upstream version 6.1.0
+
+* Tue Jun 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-10
+- Introduce javapackages-extra and javapackages-common subpackages
+- Drop metadata for com.sun:tools and sun.jdk:jconsole
+- Re-enable tests
+- Re-add manpages
+- Drop bootstrap mode
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 6.0.0-9
+- Rebuilt for Python 3.11
+
+* Thu May 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-8
+- Install toolchains.xml in correct location in bootstrap mode
+
+* Thu Jan 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-7
+- Switch to OpenJDK 17 as default JDK/JRE
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-5
+- Bootstrap build for Maven 3.8.4
+
+* Sun Nov 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-4
+- Uptate ivy-local classpath
+
+* Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 6.0.0-3
+- Re-add ivy-local subpackage
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-2
+- Implement OpenJDK 11 and 17 toolchains

 * Mon Jul 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-1
 - Update to upstream version 6.0.0

-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-9
- Rebuild to workaround DistroBaker issue
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0~alpha-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-8
- Bootstrap Maven for CentOS Stream 9
+* Wed Jul 14 2021 Sérgio Basto <sergio@serjux.com> - 6.0.0~alpha-8
+- Drop apache-ivy is orphan now

 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.0.0~alpha-7
 - Rebuilt for Python 3.10