From 4162076cea1106777ed1d80e556211d1edc7da45 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 26 Mar 2025 08:43:18 +0100
Subject: [PATCH 1/7] Switch to javapackages tests from CentOS Stream GitLab

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 86bfcea..e39d47c 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
   ref: f42
 execute:
   how: tmt

From eb32a64b634133c5fd68371d987436547da0cbe5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 May 2025 13:35:31 +0200
Subject: [PATCH 2/7] Switch javapackages test plan to f43 ref

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index e39d47c..ae17c0c 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f42
+  ref: f43
 execute:
   how: tmt

From f0a13613e3453c84a8060ec60f002eb3dd4b7854 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 13 Jul 2025 09:22:51 +0200
Subject: [PATCH 3/7] Build with OpenJDK 25

---
 antlr.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/antlr.spec b/antlr.spec
index 2410c0b..5535db1 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -21,8 +21,7 @@ Patch:         %{name}-%{version}-configure-c99.patch
 BuildRequires: gcc-c++
 BuildRequires: make
 BuildRequires: ant
-BuildRequires: java-devel
-BuildRequires: javapackages-local
+BuildRequires: javapackages-local-openjdk25
 
 %description
 ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a

From 9145b3a6b96b0286a42f43b2a78dc2c76846e5ec Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 13 Jul 2025 21:23:17 +0200
Subject: [PATCH 4/7] Remove javadoc subpackage

---
 antlr.spec | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/antlr.spec b/antlr.spec
index 5535db1..ec7795b 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -23,6 +23,9 @@ BuildRequires: make
 BuildRequires: ant
 BuildRequires: javapackages-local-openjdk25
 
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 2.7.7-86
+
 %description
 ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a
 language tool that provides a framework for constructing recognizers,
@@ -49,13 +52,6 @@ BuildArch:     noarch
 %description manual
 Documentation for %{name}.
 
-%package     javadoc
-Summary:       Javadoc for %{name}
-BuildArch:     noarch
-
-%description javadoc
-Javadoc for %{name}.
-
 %package     C++
 Summary:       C++ bindings for antlr2 generated parsers
 Provides:      antlr-static = %{version}-%{release}
@@ -75,7 +71,7 @@ sed -i 's/\r//' LICENSE.txt
 %mvn_file %{name}:%{name} %{name}
 
 %build
-ant -Dj2se.apidoc=%{_javadocdir}/java
+ant jar
 # make expects to find it here
 cp work/lib/antlr.jar .
 export CLASSPATH=.
@@ -92,7 +88,7 @@ chmod 0644 doc/*
 # jars, POM and depmap
 %mvn_artifact %{SOURCE3} work/lib/%{name}.jar
 %mvn_alias %{name}:%{name} %{name}:%{name}all
-%mvn_install -J work/api
+%mvn_install
 
 mkdir -p $RPM_BUILD_ROOT{%{_includedir}/%{name},%{_libdir},%{_bindir}}
 
@@ -121,8 +117,5 @@ install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 %license LICENSE.txt
 %doc doc/*
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt
-
 %changelog
 %autochangelog

From caf8df7dcb0bbb6f049348736c13bf28eecba9c2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:03:48 +0000
Subject: [PATCH 5/7] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 760610389cb64373dbb27421906da76d47af2e6d Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 29 Jul 2025 18:57:59 +0200
Subject: [PATCH 6/7] Rebuilt for java-25-openjdk as preffered jdk

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
---
 antlr.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/antlr.spec b/antlr.spec
index ec7795b..c89dede 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -20,7 +20,7 @@ Patch:         %{name}-%{version}-configure-c99.patch
 
 BuildRequires: gcc-c++
 BuildRequires: make
-BuildRequires: ant
+BuildRequires: ant-openjdk25 
 BuildRequires: javapackages-local-openjdk25
 
 # TODO Remove in Fedora 46

From 316bbcb560242edd871e839bad168359d0e2dae3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:45:01 +0000
Subject: [PATCH 7/7] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild