Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e9dfd0dfb | ||
|
|
a571dbe6f8 | ||
|
|
871864ee9c | ||
|
|
bd3acbc99f | ||
|
|
204bca60ba | ||
|
|
a03662c104 | ||
|
|
31a931a55f | ||
|
|
804ce2788e |
2 changed files with 7 additions and 14 deletions
17
junit.spec
17
junit.spec
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue