Compare commits

..

9 commits

Author SHA1 Message Date
Fedora Release Engineering
a04f58337f Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:17:51 +00:00
Fedora Release Engineering
2adaacd1a3 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:45:01 +00:00
Jiri Vanek
4b0f3305b5 manual bodhi update for jdk25 needed on selected pkgs 2025-09-04 16:52:41 +02:00
Jiri Vanek
c071636ccc 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-30 01:31:26 +02:00
Fedora Release Engineering
fb3dba61df Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:55:22 +00:00
Mikolaj Izdebski
e26586076d Build with OpenJDK 25 2025-07-13 09:22:52 +02:00
Mikolaj Izdebski
0997a426ce Switch javapackages test plan to f43 ref 2025-05-22 13:35:32 +02:00
Mikolaj Izdebski
643428271a Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
aea691368a Remove javadoc and manual subpackages 2025-03-03 12:54:15 +01:00
2 changed files with 7 additions and 22 deletions

View file

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

View file

@ -16,9 +16,11 @@ Source2: %{name}-ext-MANIFEST.MF
Source3: http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
Source4: http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom
BuildRequires: javapackages-local
BuildRequires: ant
BuildRequires: javapackages-local-openjdk25
BuildRequires: ant-openjdk25
BuildRequires: apache-parent
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 1.4.01-59
Provides: xml-commons = %{version}-%{release}
%description
@ -26,18 +28,6 @@ xml-commons-apis is designed to organize and have common packaging for
the various externally-defined standard interfaces for XML. This
includes the DOM, SAX, and JAXP.
%package manual
Summary: Manual for %{name}
%description manual
%{summary}.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%autosetup -p1 -C
# Make sure upstream hasn't sneaked in any jars we don't know about
@ -59,7 +49,7 @@ sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
%mvn_alias :xml-apis-ext xerces:dom3-xml-apis
%build
%ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadoc
%ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar
# inject OSGi manifests
jar ufm build/xml-apis.jar %{SOURCE1}
@ -69,7 +59,7 @@ jar ufm build/xml-apis-ext.jar %{SOURCE2}
%mvn_artifact xml-apis-ext*.pom build/xml-apis-ext.jar
%install
%mvn_install -J build/docs/javadoc
%mvn_install
# prevent apis javadoc from being included in doc
rm -rf build/docs/javadoc
@ -80,10 +70,5 @@ rm -rf build/docs/javadoc
%doc LICENSE.dom-software.txt LICENSE.sac.html
%doc LICENSE.sax.txt README-sax README.sax.txt
%files manual
%doc build/docs/*
%files javadoc -f .mfiles-javadoc
%changelog
%autochangelog