diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh index db3fb19..229dcbc 100755 --- a/make-mockito-sourcetarball.sh +++ b/make-mockito-sourcetarball.sh @@ -1,6 +1,6 @@ #!/bin/bash -ex -VERSION=2.23.9 +VERSION=2.28.2 SRCDIR=mockito-${VERSION} git clone https://github.com/mockito/mockito.git ${SRCDIR} diff --git a/mockito-core.pom b/mockito-core.pom index b6ca285..b6dd53b 100644 --- a/mockito-core.pom +++ b/mockito-core.pom @@ -35,6 +35,12 @@ 2.6 compile + + org.opentest4j + opentest4j + 1.1.1 + compile + org.hamcrest hamcrest-core @@ -90,8 +96,8 @@ cp - ${project.build.outputDirectory}/org/mockito/internal/creation/bytebuddy/MockMethodDispatcher.class - ${project.build.outputDirectory}/org/mockito/internal/creation/bytebuddy/MockMethodDispatcher.raw + ${project.build.outputDirectory}/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.class + ${project.build.outputDirectory}/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw diff --git a/mockito.spec b/mockito.spec index 0e1d17c..db07872 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito -Version: 2.23.9 -Release: 8%{?dist} +Version: 2.28.2 +Release: 1%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -26,6 +26,7 @@ BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.objenesis:objenesis) +BuildRequires: mvn(org.opentest4j:opentest4j) BuildRequires: mvn(org.ow2.asm:asm) %description @@ -74,6 +75,9 @@ EOF %license LICENSE %changelog +* Fri Aug 14 2020 Jerry James - 2.28.2-1 +- Update to version 2.28.2 + * Tue Jul 28 2020 Fedora Release Engineering - 2.23.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index d2e660a..3cd76f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mockito-2.23.9.tar.xz) = 2c6a8315cf043ec1c3fd38e4fa0609753dc7d898509eda88d2a20b2682ce4684c5ad7eab3c39effa7dfb3358a54b90ade5bc2a7547ea5c418449384a8eebe0f7 +SHA512 (mockito-2.28.2.tar.xz) = faed4efd2e02a23f09bab57e56ad35d0302e4334302713d7e807acf3f467f79674428c6a27289cc8f64fd0197a1bef6c9b69926b9baa262306099f4c29c5263b diff --git a/use-unbundled-asm.patch b/use-unbundled-asm.patch index 01d71f0..51275d8 100644 --- a/use-unbundled-asm.patch +++ b/use-unbundled-asm.patch @@ -1,21 +1,19 @@ ---- src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java.orig 2018-12-04 23:47:19.396895633 +0000 -+++ src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java 2018-12-04 23:48:19.129703720 +0000 -@@ -18,9 +18,9 @@ +--- src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java.orig 2020-08-14 16:48:03.903053256 -0600 ++++ src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java 2020-08-14 16:48:54.171048446 -0600 +@@ -18,8 +18,8 @@ import net.bytebuddy.dynamic.ClassFileLo import net.bytebuddy.dynamic.scaffold.MethodGraph; import net.bytebuddy.dynamic.scaffold.TypeValidation; import net.bytebuddy.implementation.Implementation; -import net.bytebuddy.jar.asm.ClassVisitor; -import net.bytebuddy.jar.asm.MethodVisitor; --import net.bytebuddy.jar.asm.Opcodes; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.MethodVisitor; -+import org.objectweb.asm.Opcodes; import net.bytebuddy.matcher.ElementMatchers; import net.bytebuddy.pool.TypePool; import net.bytebuddy.utility.OpenedClassReader; ---- ./src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java.orig 2018-12-04 23:49:03.170562228 +0000 -+++ ./src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java 2018-12-04 23:49:46.061424433 +0000 -@@ -12,6 +12,7 @@ +--- src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java.orig 2019-05-29 11:38:39.000000000 -0600 ++++ src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java 2020-08-14 16:48:03.904053256 -0600 +@@ -12,6 +12,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.internal.configuration.plugins.Plugins; import org.mockitoutil.ClassLoaders; @@ -23,7 +21,7 @@ import org.objenesis.Objenesis; import java.util.Set; -@@ -30,6 +31,7 @@ +@@ -30,6 +31,7 @@ public class NoJUnitDependenciesTest { Matcher.class, ByteBuddy.class, ByteBuddyAgent.class, @@ -31,9 +29,9 @@ Objenesis.class ) .withCodeSourceUrlOf(coverageTool()) ---- src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java.orig 2018-12-05 00:18:50.707528013 +0000 -+++ src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java 2018-12-05 00:19:49.520329138 +0000 -@@ -19,6 +19,7 @@ +--- src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java.orig 2019-05-29 11:38:39.000000000 -0600 ++++ src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java 2020-08-14 16:48:03.904053256 -0600 +@@ -19,6 +19,7 @@ import org.mockito.plugins.MockMaker; import org.mockito.stubbing.Answer; import org.mockitoutil.ClassLoaders; import org.mockitoutil.SimpleSerializationUtil; @@ -41,7 +39,7 @@ import org.objenesis.ObjenesisStd; import java.io.Serializable; -@@ -138,7 +139,7 @@ +@@ -138,7 +139,7 @@ public abstract class AbstractByteBuddyM public void instantiate_fine_when_objenesis_on_the_classpath() throws Exception { // given ClassLoader classpath_with_objenesis = ClassLoaders.excludingClassLoader() @@ -50,8 +48,8 @@ .withCodeSourceUrlOf(coverageTool()) .build(); ---- src/test/java/org/mockito/internal/junit/JUnitRuleTest.java.orig 2018-12-05 00:26:24.279002285 +0000 -+++ src/test/java/org/mockito/internal/junit/JUnitRuleTest.java 2018-12-05 00:27:47.327723119 +0000 +--- src/test/java/org/mockito/internal/junit/JUnitRuleTest.java.orig 2019-05-29 11:38:39.000000000 -0600 ++++ src/test/java/org/mockito/internal/junit/JUnitRuleTest.java 2020-08-14 16:48:03.905053256 -0600 @@ -4,6 +4,7 @@ */ package org.mockito.internal.junit; @@ -60,7 +58,7 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; -@@ -41,6 +42,7 @@ +@@ -41,6 +42,7 @@ public class JUnitRuleTest { @SuppressWarnings({"CheckReturnValue", "MockitoUsage"}) @Test