Update to upstream version 4.13.

This commit is contained in:
Jerry James 2020-08-13 14:46:13 -06:00
parent 1e50c7d371
commit 11396be06b
3 changed files with 11 additions and 14 deletions

View File

@ -6,7 +6,7 @@ if [ $# -ne 1 ]; then
fi fi
VERSION=${1} VERSION=${1}
NAME="junit" NAME="junit4"
wget https://github.com/${NAME}-team/${NAME}/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

View File

@ -1,20 +1,21 @@
Name: junit Name: junit
Epoch: 1 Epoch: 1
Version: 4.12 Version: 4.13
Release: 18%{?dist} Release: 1%{?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}-%{version}-clean.tar.gz Source0: %{name}4-%{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
@ -37,10 +38,7 @@ Summary: Javadoc for %{name}
Javadoc for %{name}. Javadoc for %{name}.
%prep %prep
%setup -q -n %{name}-r%{version} %autosetup -n %{name}4-r%{version}
# InaccessibleBaseClassTest fails with Java 8
sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
%pom_remove_plugin :replacer %pom_remove_plugin :replacer
sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java
@ -79,11 +77,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
</properties> </properties>
</profile>" </profile>"
# Ignore test that breaks on Java 11 due to unexpected extra annotations in the JDK standard library %pom_xpath_set //pom:compilerVersion 1.8
sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/junit/runners/model/TestClassTest.java
# Set JPMS module name
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive" "<manifestEntries><Automatic-Module-Name>junit</Automatic-Module-Name></manifestEntries>"
%mvn_file : %{name} %mvn_file : %{name}
@ -105,6 +99,9 @@ sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/jun
%doc doc/* %doc doc/*
%changelog %changelog
* Thu Aug 13 2020 Jerry James <loganjerry@gmail.com> - 1:4.13-1
- Update to upstream version 4.13
* Tue Aug 04 2020 Mat Booth <mat.booth@redhat.com> - 1:4.12-18 * Tue Aug 04 2020 Mat Booth <mat.booth@redhat.com> - 1:4.12-18
- Add automatic module name - Add automatic module name

View File

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