#1 [WIP] Rebase to version 4.13
Closed 3 years ago by decathorpe. Opened 3 years ago by cipherboy.
rpms/ cipherboy/junit rebase-4.13  into  master

Rebase to junit4 version 4.13
Alexander Scheel • 3 years ago  
file modified
+5 -5
@@ -1,5 +1,5 @@ 

- junit3.8.2.zip

- /junit-4.10.tar.xz

- /r4.11.tar.gz

- /junit-4.11-clean.tar.gz

- /junit-4.12-clean.tar.gz

+ /r4.*.tar.gz

+ /junit-4.*-clean.tar.gz

+ /junit4-4.*-clean.tar.gz

+ /junit-r4.*/

+ /junit4-r4.*/

file modified
+2 -2
@@ -6,9 +6,9 @@ 

  fi

  

  VERSION=${1}

- NAME="junit"

+ NAME="junit4"

  

- wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz

+ wget https://github.com/junit-team/${NAME}/archive/r${VERSION}.tar.gz

  tar xvf r${VERSION}.tar.gz

  

  (

file modified
+11 -5
@@ -1,20 +1,23 @@ 

+ %global reponame junit4

+ 

  Name:           junit

  Epoch:          1

- Version:        4.12

- Release:        12%{?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

+ # ./clean-tarball.sh <version>

+ Source0:        %{reponame}-%{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 +40,7 @@ 

  Javadoc for %{name}.

  

  %prep

- %setup -q -n %{name}-r%{version}

+ %setup -q -n %{reponame}-r%{version}

  

  # InaccessibleBaseClassTest fails with Java 8

  sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
@@ -86,6 +89,9 @@ 

  %doc doc/*

  

  %changelog

+ * Mon Jan 20 2020 Alexander Scheel <ascheel@redhat.com> - 1:4.13-1

+ - Rebase to 4.13

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-12

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- 0de14594aaba3379f6b19ba75a393232  junit-4.12-clean.tar.gz

+ SHA512 (junit4-4.13-clean.tar.gz) = f281518429feec2e1cf869973abd8612d02db53dedb4e37e865ab95eff3a84572d18b269e16fbb60c05ea75b69bbc5a8fdb777ad6d48c0d40922fc449e06a98f

There's a few other patches in the modular repos we can add as we get a chance.

This adds a new dependency on hamcrest-library, which is already packaged.

JSS rebuild error is expected and not caused by junit.

Can you check the new build failures for:

  • jmock
  • mockito

They seem to be caused by junit behavior changes.

Updated in PR#2 with accompanying jmock 2.12.0, objectweb-asm 8.0.1, byte-buddy 1.10.14, mockito 2.28.2 updates.

Pull-Request has been closed by decathorpe

3 years ago