Revert "Upate to 4.13 and fix build with Java 11."

This reverts commit 62330143ac.

junit 4.13 breaks jmock and mockito.
This commit is contained in:
Fabio Valentini 2020-06-25 19:53:13 +02:00
parent 62330143ac
commit efbc750544
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
4 changed files with 10 additions and 24 deletions

1
.gitignore vendored
View File

@ -3,4 +3,3 @@ junit3.8.2.zip
/r4.11.tar.gz /r4.11.tar.gz
/junit-4.11-clean.tar.gz /junit-4.11-clean.tar.gz
/junit-4.12-clean.tar.gz /junit-4.12-clean.tar.gz
/junit4-4.13-clean.tar.gz

View File

@ -8,15 +8,15 @@ fi
VERSION=${1} VERSION=${1}
NAME="junit" NAME="junit"
wget https://github.com/${NAME}-team/${NAME}4/archive/r${VERSION}.tar.gz wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz
tar xvf r${VERSION}.tar.gz tar xvf r${VERSION}.tar.gz
( (
cd ${NAME}4-r${VERSION} cd ${NAME}-r${VERSION}
find . -name "*.jar" -delete find . -name "*.jar" -delete
find . -name "*.class" -delete find . -name "*.class" -delete
) )
tar czvf ${NAME}4-${VERSION}-clean.tar.gz ${NAME}4-r${VERSION} tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION}
rm -Rf ${NAME}4-${VERSION}.tar.gz rm -Rf ${NAME}-${VERSION}.tar.gz

View File

@ -1,21 +1,20 @@
Name: junit Name: junit
Epoch: 1 Epoch: 1
Version: 4.13 Version: 4.12
Release: 1%{?dist} Release: 13%{?dist}
Summary: Java regression test package Summary: Java regression test package
License: EPL-1.0 License: EPL-1.0
URL: http://www.junit.org/ URL: http://www.junit.org/
BuildArch: noarch BuildArch: noarch
# ./clean-tarball.sh %{version} # ./clean-tarball.sh %{version}
Source0: %{name}4-%{version}-clean.tar.gz Source0: %{name}-%{version}-clean.tar.gz
Source3: create-tarball.sh Source3: create-tarball.sh
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.hamcrest:hamcrest-core)
BuildRequires: mvn(org.hamcrest:hamcrest-library)
Obsoletes: %{name}-demo < 4.12 Obsoletes: %{name}-demo < 4.12
@ -38,7 +37,7 @@ Summary: Javadoc for %{name}
Javadoc for %{name}. Javadoc for %{name}.
%prep %prep
%setup -q -n %{name}4-r%{version} %setup -q -n %{name}-r%{version}
# InaccessibleBaseClassTest fails with Java 8 # InaccessibleBaseClassTest fails with Java 8
sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
@ -68,18 +67,10 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
</configuration> </configuration>
</plugin>" </plugin>"
# Fix javadoc generation on java 11
%pom_xpath_inject pom:build/pom:plugins "<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration><source>1.6</source></configuration>
</plugin>"
%mvn_file : %{name} %mvn_file : %{name}
sed -i -e "s|1.5|1.6|" pom.xml
%build %build
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %mvn_build
%install %install
%mvn_install %mvn_install
@ -95,10 +86,6 @@ sed -i -e "s|1.5|1.6|" pom.xml
%doc doc/* %doc doc/*
%changelog %changelog
* Thu Jun 25 2020 Alexander Kurtakov <akurtako@redhat.com> 1:4.13-1
- Update to 4.13
- Fix build with Java 11.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-13 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (junit4-4.13-clean.tar.gz) = 608718a813e6709b5e63efa378c055e57204fc4403ff6a638950b935cb6cb18e0d9857b6fe5709bd78803499525c694b45f7abfb01fa8271e5658acc2ae47314 0de14594aaba3379f6b19ba75a393232 junit-4.12-clean.tar.gz