Upate to 4.13 and fix build with Java 11.
This commit is contained in:
parent
25cfe9b5c3
commit
62330143ac
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ junit3.8.2.zip
|
||||
/r4.11.tar.gz
|
||||
/junit-4.11-clean.tar.gz
|
||||
/junit-4.12-clean.tar.gz
|
||||
/junit4-4.13-clean.tar.gz
|
||||
|
@ -8,15 +8,15 @@ fi
|
||||
VERSION=${1}
|
||||
NAME="junit"
|
||||
|
||||
wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz
|
||||
wget https://github.com/${NAME}-team/${NAME}4/archive/r${VERSION}.tar.gz
|
||||
tar xvf r${VERSION}.tar.gz
|
||||
|
||||
(
|
||||
cd ${NAME}-r${VERSION}
|
||||
cd ${NAME}4-r${VERSION}
|
||||
find . -name "*.jar" -delete
|
||||
find . -name "*.class" -delete
|
||||
)
|
||||
|
||||
tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION}
|
||||
rm -Rf ${NAME}-${VERSION}.tar.gz
|
||||
tar czvf ${NAME}4-${VERSION}-clean.tar.gz ${NAME}4-r${VERSION}
|
||||
rm -Rf ${NAME}4-${VERSION}.tar.gz
|
||||
|
||||
|
23
junit.spec
23
junit.spec
@ -1,20 +1,21 @@
|
||||
Name: junit
|
||||
Epoch: 1
|
||||
Version: 4.12
|
||||
Release: 13%{?dist}
|
||||
Version: 4.13
|
||||
Release: 1%{?dist}
|
||||
Summary: Java regression test package
|
||||
License: EPL-1.0
|
||||
URL: http://www.junit.org/
|
||||
BuildArch: noarch
|
||||
|
||||
# ./clean-tarball.sh %{version}
|
||||
Source0: %{name}-%{version}-clean.tar.gz
|
||||
Source0: %{name}4-%{version}-clean.tar.gz
|
||||
Source3: create-tarball.sh
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||
BuildRequires: mvn(org.hamcrest:hamcrest-core)
|
||||
BuildRequires: mvn(org.hamcrest:hamcrest-library)
|
||||
|
||||
Obsoletes: %{name}-demo < 4.12
|
||||
|
||||
@ -37,7 +38,7 @@ Summary: Javadoc for %{name}
|
||||
Javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-r%{version}
|
||||
%setup -q -n %{name}4-r%{version}
|
||||
|
||||
# InaccessibleBaseClassTest fails with Java 8
|
||||
sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
|
||||
@ -67,10 +68,18 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
|
||||
</configuration>
|
||||
</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}
|
||||
|
||||
sed -i -e "s|1.5|1.6|" pom.xml
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
@ -86,6 +95,10 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
|
||||
%doc doc/*
|
||||
|
||||
%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
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user