Compare commits

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

8 commits

Author SHA1 Message Date
Mikolaj Izdebski
1e9dfd0dfb Remove build-dependency on maven-enforcer-plugin 2025-09-09 12:22:50 +02:00
Jiri Vanek
a571dbe6f8 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 00:02:32 +02:00
Fedora Release Engineering
871864ee9c Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 18:08:47 +00:00
Mikolaj Izdebski
bd3acbc99f Build with OpenJDK 25 2025-07-13 09:22:51 +02:00
Mikolaj Izdebski
204bca60ba Switch javapackages test plan to f43 ref 2025-05-22 13:35:31 +02:00
Mikolaj Izdebski
a03662c104 Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
31a931a55f Fix javadoc obsoletes version 2025-03-05 13:49:31 +01:00
Mikolaj Izdebski
804ce2788e Remove javadoc subpackage 2025-03-03 12:53:48 +01:00
2 changed files with 7 additions and 14 deletions

View file

@ -20,8 +20,7 @@ Patch: 0002-Port-to-OpenJDK-21.patch
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
BuildRequires: maven-local-openjdk25
BuildRequires: mvn(org.hamcrest:hamcrest-core)
%endif
%if %{without bootstrap}
@ -30,6 +29,8 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core)
# itself, so explicit BR on surefire-junit4 is needed.
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4)
%endif
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 1:4.13.2-20
%description
JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
@ -43,12 +44,6 @@ Summary: Manual for %{name}
%description manual
Documentation for %{name}.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%autosetup -p1 -C
@ -60,6 +55,7 @@ sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java
%pom_remove_plugin :animal-sniffer-maven-plugin
%pom_remove_plugin :maven-enforcer-plugin
# Removing hamcrest source jar references (not available and/or necessary)
%pom_remove_plugin :maven-javadoc-plugin
@ -69,7 +65,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
%mvn_alias junit:junit junit:junit-dep
%build
%mvn_build -- -DjdkVersion=1.8 -P\!restrict-doclint
%mvn_build -j -- -DjdkVersion=1.8 -P\!restrict-doclint
%install
%mvn_install
@ -82,8 +78,5 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
%license LICENSE-junit.txt
%doc doc/*
%files javadoc -f .mfiles-javadoc
%license LICENSE-junit.txt
%changelog
%autochangelog

View file

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