Compare commits

...
Sign in to create a new pull request.

15 commits

Author SHA1 Message Date
Jiri Vanek
41a0397756 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.
2025-07-29 21:26:19 +02:00
Fedora Release Engineering
419026f492 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 17:57:17 +00:00
Mikolaj Izdebski
37352fb873 Build with OpenJDK 25 2025-07-13 09:57:34 +02:00
Mikolaj Izdebski
322db1f389 Switch javapackages test plan to f43 ref 2025-05-22 13:35:31 +02:00
Mikolaj Izdebski
7468dd818a Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
9d4fdc291e Remove javadoc subpackage 2025-03-03 12:53:44 +01:00
Fedora Release Engineering
6be261eece Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 07:44:55 +00:00
Mikolaj Izdebski
2873bd5511 Update javapackages test plan to f42 2024-11-29 08:28:38 +01:00
Mikolaj Izdebski
b13aaec293 Convert to %autorelease and %autochangelog 2024-08-23 00:45:49 +02:00
Mikolaj Izdebski
12a2c859c6 Switch from %setup to %autosetup 2024-08-20 16:33:56 +02:00
Mikolaj Izdebski
c6ad803165 Switch javapackages tests to f41 branch 2024-07-31 20:53:29 +02:00
Fedora Release Engineering
bcd040cf34 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 10:54:18 +00:00
Mikolaj Izdebski
adba2cd353 Use rlRun and rlAssertGrep 2024-07-02 09:52:23 +02:00
Mikolaj Izdebski
add2872dcf Extract smoke tests out of test plan
We want tests to be stored directly in the file system
instead of being embedded into tests plans.
2024-07-02 09:29:45 +02:00
Jiri Vanek
aa1c04ad84 Rebuilt for java-21-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java21
2024-02-27 16:15:35 +01:00
8 changed files with 103 additions and 84 deletions

62
changelog Normal file
View file

@ -0,0 +1,62 @@
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.5.1-4
- Rebuilt for java-21-openjdk as system jdk
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 11 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.1-1
- Update to upstream version 1.5.1
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0-8
- Convert License tag to SPDX format
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-6
- Remove provision of glassfish artifact
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Jan 16 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-4
- Reduce dependencies
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.5.0-2
- Rebuilt for Drop i686 JDKs
* Mon Apr 11 2022 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.0-1
- New upstream release 1.5.0
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.4.5-3
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Oct 26 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.4.5-1
- New upstream release 1.4.5
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.4.3-3
- Restore JDK 9+ bits for Jaxb
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.3-1
- Initial package renamed from glassfish-dtd-parser.

View file

@ -1,6 +1,6 @@
Name: jaxb-dtd-parser
Version: 1.5.1
Release: 3%{?dist}
Release: %autorelease
Summary: SAX-like API for parsing XML DTDs
License: BSD-3-Clause
URL: https://github.com/eclipse-ee4j/jaxb-dtd-parser
@ -9,25 +9,24 @@ ExclusiveArch: %{java_arches} noarch
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: maven-local
BuildRequires: maven-local-openjdk25
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 1.5.1-14
%description
SAX-like API for parsing XML DTDs.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%setup -q
%autosetup -p1 -C
pushd dtd-parser
# -Werror is considered harmful for downstream package builds
sed -i /-Werror/d pom.xml
%pom_remove_parent
%pom_remove_plugin :buildnumber-maven-plugin
@ -37,7 +36,7 @@ popd
%build
pushd dtd-parser
%mvn_build
%mvn_build -j
popd
%install
@ -49,63 +48,5 @@ popd
%license LICENSE.md NOTICE.md
%doc README.md
%files javadoc -f dtd-parser/.mfiles-javadoc
%license LICENSE.md NOTICE.md
%changelog
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 11 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.1-1
- Update to upstream version 1.5.1
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0-8
- Convert License tag to SPDX format
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-6
- Remove provision of glassfish artifact
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Jan 16 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-4
- Reduce dependencies
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.5.0-2
- Rebuilt for Drop i686 JDKs
* Mon Apr 11 2022 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.0-1
- New upstream release 1.5.0
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.4.5-3
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Oct 26 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.4.5-1
- New upstream release 1.4.5
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.4.3-3
- Restore JDK 9+ bits for Jaxb
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.3-1
- Initial package renamed from glassfish-dtd-parser.
%autochangelog

View file

@ -1,7 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: f40
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: f43
execute:
how: tmt

View file

@ -1,17 +1,5 @@
summary: Basic smoke test
prepare:
how: install
package:
- java-11-openjdk-devel
- xmvn-tools
discover:
how: shell
tests:
- name: /smoke/classpath-import
test: |
CLASSPATH+=":$(xmvn-resolve com.sun.xml.dtd-parser:dtd-parser)"
export CLASSPATH
/usr/lib/jvm/java-11-openjdk/bin/javac plans/Smoke.java
/usr/lib/jvm/java-11-openjdk/bin/java -cp "${CLASSPATH}:plans" Smoke
how: fmf
execute:
how: tmt

View file

@ -0,0 +1,7 @@
summary: jaxb-dtd-parser smoke test
description: |
Test basic functionality of jaxb-dtd-parser.
require:
- jaxb-dtd-parser
- java-21-openjdk-devel
- xmvn-tools

16
tests/Sanity/smoke/runtest.sh Executable file
View file

@ -0,0 +1,16 @@
#!/bin/bash
# Author: Marian Koncek <mkoncek@redhat.com>
. /usr/share/beakerlib/beakerlib.sh
rlJournalStart
rlPhaseStartTest "compile Smoke.java and run it"
CLASSPATH+=":$(xmvn-resolve com.sun.xml.dtd-parser:dtd-parser)"
export CLASSPATH
rlRun "/usr/lib/jvm/java-21-openjdk/bin/javac Smoke.java"
rlRun -s "/usr/lib/jvm/java-21-openjdk/bin/java -cp \"${CLASSPATH}:plans\" Smoke"
rlAssertGrep "com.sun.xml.dtdparser.DTDParser" $rlRun_LOG
rlPhaseEnd
rlJournalEnd
rlJournalPrintText

5
tests/main.fmf Normal file
View file

@ -0,0 +1,5 @@
contact: Marian Koncek <mkoncek@redhat.com>
framework: beakerlib
test: ./runtest.sh
tier: 0
component: jaxb-dtd-parser