.gitignore

@@ -1,79 +1 @@
-/javapackages-0.3.0.tar.xz
+SOURCES/6.0.0.tar.gz
-/javapackages-0.3.1.tar.xz
-/javapackages-0.4.0.tar.xz
-/javapackages-0.4.1.tar.xz
-/javapackages-0.5.0.tar.xz
-/javapackages-0.6.0.tar.xz
-/javapackages-0.7.0.tar.xz
-/javapackages-0.7.2.tar.xz
-/javapackages-0.7.4.tar.xz
-/javapackages-0.7.5.tar.xz
-/javapackages-0.8.0.tar.xz
-/javapackages-0.8.1.tar.xz
-/javapackages-0.8.2.tar.xz
-/javapackages-0.8.3.tar.xz
-/javapackages-0.9.0.tar.xz
-/javapackages-0.9.1.tar.xz
-/javapackages-0.10.0.tar.xz
-/javapackages-0.10.1.tar.xz
-/javapackages-0.11.0.tar.xz
-/javapackages-0.11.1.tar.xz
-/javapackages-0.11.2.tar.xz
-/javapackages-0.12.0.tar.xz
-/javapackages-0.12.1.tar.xz
-/javapackages-0.12.2.tar.xz
-/javapackages-0.12.3.tar.xz
-/javapackages-0.12.4.tar.xz
-/javapackages-0.12.5.tar.xz
-/javapackages-0.12.6.tar.xz
-/javapackages-2f13366e47a0a687160fe3c555e5588af49a7566.tar.bz2
-/javapackages-0.13.0.tar.xz
-/javapackages-0.13.1.tar.xz
-/javapackages-0.13.2.tar.xz
-/javapackages-0.13.3.tar.xz
-/javapackages-0.13.4.tar.xz
-/javapackages-0.13.5.tar.xz
-/javapackages-0.13.6.tar.xz
-/javapackages-0.13.7.tar.xz
-/javapackages-0.14.0.tar.xz
-/javapackages-0.14.1.tar.xz
-/javapackages-0.15.0.tar.xz
-/javapackages-2.0.0.tar.xz
-/javapackages-2.0.1.tar.xz
-/javapackages-3.0.0.tar.xz
-/javapackages-3.0.1.tar.xz
-/javapackages-3.0.2.tar.xz
-/javapackages-3.0.3.tar.xz
-/javapackages-3.0.4.tar.xz
-/javapackages-3.1.0.tar.xz
-/javapackages-3.1.1.tar.xz
-/javapackages-3.1.2.tar.xz
-/javapackages-3.2.0.tar.xz
-/javapackages-3.2.1.tar.xz
-/javapackages-3.2.2.tar.xz
-/javapackages-3.2.3.tar.xz
-/javapackages-3.2.4.tar.xz
-/javapackages-3.3.0.tar.xz
-/javapackages-3.3.1.tar.xz
-/javapackages-3.4.0.tar.xz
-/javapackages-3.4.1.tar.xz
-/javapackages-3.4.2.tar.xz
-/javapackages-3.5.0.tar.xz
-/javapackages-4.0.0.tar.xz
-/javapackages-4.1.0.tar.xz
-/javapackages-4.2.0.tar.xz
-/javapackages-4.3.0.tar.xz
-/javapackages-4.3.1.tar.xz
-/javapackages-4.3.2.tar.xz
-/javapackages-4.4.0.tar.xz
-/javapackages-4.5.0.tar.xz
-/javapackages-4.6.0.tar.xz
-/javapackages-4.7.0.tar.xz
-/5.0.0.tar.gz
-/5.1.0.tar.gz
-/5.2.0.tar.gz
-/5.3.0.tar.gz
-/5.3.1.tar.gz
-/6.0.0~alpha.tar.gz
-/6.0.0.tar.gz
-/6.1.0.tar.gz

.javapackages-tools.metadata

@@ -0,0 +1 @@
+0c2f59a61e8e8eb664f679efab383deadaed2cc6 SOURCES/6.0.0.tar.gz

SOURCES/0001-Do-not-set-JAVA_HOME-for-ant.patch

@@ -0,0 +1,25 @@
+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
+

SOURCES/javapackages-config.json

@@ -1,8 +1,7 @@
 {
     "maven.req": {
         "always_generate": [
-            "javapackages-filesystem",
+            "javapackages-filesystem"
-            "(java-headless or java-17-headless)"
         ],
         "java_requires": {
             "skip": true

SPECS/javapackages-tools.spec

@@ -1,8 +1,10 @@
-%if 0%{?fedora}
+%bcond_with bootstrap
-%bcond_without ivy
+
-%else
 %bcond_with ivy
-%endif
+
+# 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$
 
 %global python_prefix python3
 %global python_interpreter %{?__python3}%{!?__python3:dummy}
@@ -10,11 +12,9 @@
 %global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
 %global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
 
-%global maven_home %{_datadir}/xmvn
-
 Name:           javapackages-tools
-Version:        6.1.0
+Version:        6.0.0
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -27,16 +27,18 @@ Source8:        toolchains-openjdk8.xml
 Source11:       toolchains-openjdk11.xml
 Source17:       toolchains-openjdk17.xml
 
+Patch1:         0001-Do-not-set-JAVA_HOME-for-ant.patch
+
 BuildRequires:  coreutils
 BuildRequires:  which
 BuildRequires:  make
-BuildRequires:  asciidoc
-BuildRequires:  xmlto
-BuildRequires:  lua
 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
@@ -46,6 +48,10 @@ Requires:       which
 Requires:       java-17-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.
@@ -62,7 +68,10 @@ install their content.
 Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       javapackages-local = %{version}-%{release}
-Requires:       xmvn-minimal
+%if %{without bootstrap}
+Requires:       %{_bindir}/xmvn
+# NOTE keep using Java 11 for the whole lifecycle
+Requires:       maven-openjdk11
 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.
@@ -70,6 +79,7 @@ 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.
@@ -97,10 +107,18 @@ packaging in Linux distributions
 
 %package -n javapackages-local
 Summary:        Non-essential macros and scripts for Java packaging support
-Requires:       javapackages-common = %{version}-%{release}
+Requires:       javapackages-generators = %{version}-%{release}
+%if %{with bootstrap}
+Requires:       javapackages-bootstrap
+%else
+Requires:       %{_bindir}/xmvn-install
+Requires:       %{_bindir}/xmvn-subst
+Requires:       %{_bindir}/xmvn-resolve
 # Java build systems don't have hard requirement on java-devel, so it should be there
-Requires:       java-17-openjdk-devel
+# NOTE keep using Java 11 for the whole lifecycle
-Requires:       xmvn-tools
+Requires:       java-11-openjdk-devel
+Requires:       (ant-openjdk11 if ant)
+%endif
 
 %description -n javapackages-local
 This package provides non-essential macros and scripts to support Java packaging.
@@ -114,23 +132,6 @@ Requires:       %{python_interpreter}
 %description -n javapackages-generators
 RPM dependency generators to support Java packaging.
 
-%package -n javapackages-common
-Summary:        Non-essential macros and scripts for Java packaging support
-Requires:       javapackages-generators = %{version}-%{release}
-
-%description -n javapackages-common
-This package provides non-essential, but commonly used macros and
-scripts to support Java packaging.
-
-%package -n javapackages-extra
-Summary:        Rarely-used macros and scripts for Java packaging support
-Requires:       javapackages-generators = %{version}-%{release}
-Requires:       lua
-
-%description -n javapackages-extra
-This package provides rarely-used and obsolete macros and scripts to
-support Java packaging.
-
 %package -n maven-local-openjdk8
 Summary:        OpenJDK 8 toolchain for XMvn
 RemovePathPostfixes: -openjdk8
@@ -159,9 +160,10 @@ Requires:       java-17-openjdk-devel
 OpenJDK 17 toolchain for XMvn
 
 %prep
-%setup -q -n javapackages-%{version}
+%autosetup -p1 -n javapackages-%{version}
 
-sed -i /javapackages-metadata.xml/d install
+sed -i '/^manpage /d' build
+sed -i '/${mandir}/d' install
 
 %build
 %configure --pyinterpreter=%{python_interpreter} \
@@ -182,15 +184,17 @@ rm -rf %{buildroot}%{_sysconfdir}/ivy
 rm -rf %{buildroot}%{_sysconfdir}/ant.d
 %endif
 
-mkdir -p %{buildroot}%{maven_home}/conf/
+mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
-cp -p %{SOURCE8} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk8
+cp -p %{SOURCE8} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
-cp -p %{SOURCE11} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk11
+cp -p %{SOURCE11} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
-cp -p %{SOURCE17} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk17
+cp -p %{SOURCE17} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
 
 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
 
+%if !0%{?rhel}
 %check
-./check
+#./check
+%endif
 
 %files -f files-tools
 
@@ -198,11 +202,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 
 %files -n javapackages-generators -f files-generators
 
-%files -n javapackages-common -f files-common
+%files -n javapackages-local -f files-local
-
-%files -n javapackages-extra -f files-extra
-
-%files -n javapackages-local
 
 %files -n maven-local
 
@@ -211,72 +211,55 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %endif
 
 %files -n maven-local-openjdk8
-%dir %{maven_home}/conf
+%dir %{_datadir}/xmvn/conf
-%{maven_home}/conf/toolchains.xml-openjdk8
+%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
 
 %files -n maven-local-openjdk11
-%dir %{maven_home}/conf
+%dir %{_datadir}/xmvn/conf
-%{maven_home}/conf/toolchains.xml-openjdk11
+%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
 
 %files -n maven-local-openjdk17
-%dir %{maven_home}/conf
+%dir %{_datadir}/xmvn/conf
-%{maven_home}/conf/toolchains.xml-openjdk17
+%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
 
 %files -n %{python_prefix}-javapackages -f files-python
 %license LICENSE
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-4
+* Mon Nov 18 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+- Use Java 11 build tool bindings for package builds
-
-* 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
+* Mon Nov 04 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-6
-- Rebuilt for Drop i686 JDKs
+- Drop generated Requires on various Java versions
+- Related: RHEL-62409
 
-* Thu Jun 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-1
+* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
-- Update to upstream version 6.1.0
+- Include java-21-headless in generated auto-requires
+- Related: RHEL-62409
 
-* Tue Jun 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-10
+* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
-- Introduce javapackages-extra and javapackages-common subpackages
+- Make OpenJDK 17 the default JRE/JDK
-- Drop metadata for com.sun:tools and sun.jdk:jconsole
+- Related: RHEL-62403
-- Re-enable tests
-- Re-add manpages
-- Drop bootstrap mode
 
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 6.0.0-9
+* Wed Jan 25 2023 Marián Konček <mkoncek@redhat.com> - 6.0.0-4
-- Rebuilt for Python 3.11
+- Add generated Requires on multiple versions of java-headless
+- Related: rhbz#2164437
 
-* Thu May 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-8
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-3
-- 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 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 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-1
 - Update to upstream version 6.0.0
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0~alpha-9
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuild to workaround DistroBaker issue
 
-* Wed Jul 14 2021 Sérgio Basto <sergio@serjux.com> - 6.0.0~alpha-8
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-8
-- Drop apache-ivy is orphan now
+- Bootstrap Maven for CentOS Stream 9
 
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.0.0~alpha-7
 - Rebuilt for Python 3.10

sources

@@ -1 +0,0 @@
-SHA512 (6.1.0.tar.gz) = c67f25add8117edcb5bc192157538f3b73579ee2a31e8eadf8e76a6264321503ec9e6d0439570b710ed510beccbf9db59a8aa43762fe560649d4eaf6742d314d