Compare commits

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

6 commits

Author SHA1 Message Date
Jiri Vanek
7771beb8b2 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:34:46 +02:00
Fedora Release Engineering
b57df37f9b Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:56:55 +00:00
Mikolaj Izdebski
c502929bf8 Build with OpenJDK 25 2025-07-13 09:22:52 +02:00
Mikolaj Izdebski
eced09baf2 Switch javapackages test plan to f43 ref 2025-05-22 13:35:32 +02:00
Mikolaj Izdebski
2cadf3b1fb Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
1b11d12427 Remove javadoc subpackage 2025-03-03 12:54:16 +01:00
2 changed files with 6 additions and 12 deletions

View file

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

View file

@ -26,7 +26,7 @@ BuildRequires: jurand
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: javapackages-bootstrap BuildRequires: javapackages-bootstrap
%else %else
BuildRequires: maven-local BuildRequires: maven-local-openjdk25
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.assertj:assertj-core)
@ -34,18 +34,14 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core)
BuildRequires: mvn(org.hamcrest:hamcrest-library) BuildRequires: mvn(org.hamcrest:hamcrest-library)
BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.mockito:mockito-core)
%endif %endif
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 2.10.0-8
%description %description
XMLUnit provides you with the tools to verify the XML you emit is the one you XMLUnit provides you with the tools to verify the XML you emit is the one you
want to create. It provides helpers to validate against an XML Schema, assert want to create. It provides helpers to validate against an XML Schema, assert
the values of XPath queries or compare XML documents against expected outcomes. the values of XPath queries or compare XML documents against expected outcomes.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%package assertj %package assertj
Summary: Assertj for %{name} Summary: Assertj for %{name}
@ -108,7 +104,7 @@ rm -r xmlunit-core/src/main/java/org/xmlunit/builder/javax_jaxb\
rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java} rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.java,JaxbBuilderTest.java}
%build %build
%mvn_build -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8 %mvn_build -j -s -- -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8
%install %install
%mvn_install %mvn_install
@ -117,8 +113,6 @@ rm -rf xmlunit-core/src/{main,test}/java/org/xmlunit/builder/{jaxb/,JaxbBuilder.
%doc README.md CONTRIBUTING.md RELEASE_NOTES.md %doc README.md CONTRIBUTING.md RELEASE_NOTES.md
%license LICENSE %license LICENSE
%files javadoc -f .mfiles-javadoc
%files assertj -f .mfiles-xmlunit-assertj3 %files assertj -f .mfiles-xmlunit-assertj3
%files core -f .mfiles-xmlunit-core %files core -f .mfiles-xmlunit-core