diff --git a/.gitignore b/.gitignore index 82462ae..aa287b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -SOURCES/mockito-1.10.19.tar.xz +/mockito-*.tar.xz +/.build-*.log +/noarch/ +/*.src.rpm diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index d6b7694..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_contexts: - - osci_compose_gate -rules: - # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test - - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap} diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 6b3c542..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -e - -name=mockito -version="$(sed -n 's/Version:\s*//p' *.spec)" - -# RETRIEVE -wget "https://github.com/mockito/mockito/archive/v${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" - -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar -xf "../${name}-${version}.orig.tar.gz" - -# CLEAN TARBALL -find -name '*.jar' -delete -find -name '*.class' -delete -rm -rf gradlew gradlew.bat src/javadoc - -tar -czf "../${name}-${version}.tar.gz" * -popd -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh old mode 100755 new mode 100644 diff --git a/mockito-core.pom b/mockito-core.pom deleted file mode 100644 index e305fc9..0000000 --- a/mockito-core.pom +++ /dev/null @@ -1,678 +0,0 @@ - - - 4.0.0 - org.mockito - mockito-core - @VERSION@ - mockito-core - jar - https://github.com/mockito/mockito - Mockito mock objects library core API and implementation - - - - org.ow2.asm - asm - 7.2 - compile - - - net.bytebuddy - byte-buddy - 1.9.3 - compile - - - net.bytebuddy - byte-buddy-agent - 1.9.3 - compile - - - org.objenesis - objenesis - 3.1 - compile - - - org.opentest4j - opentest4j - 1.2 - compile - - - org.hamcrest - hamcrest - 2.2 - provided - - - junit - junit - 4.12 - provided - - - org.assertj - assertj-core - 3.13.2 - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.apache.felix - maven-bundle-plugin - 3.5.0 - - ${project.build.directory}/osgi - - <_include>-osgi.bnd - - - - - process-classes - - manifest - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - ${project.build.directory}/osgi/MANIFEST.MF - - - **/MockMethodDispatcher.class - - - - - - - - The MIT License - https://github.com/mockito/mockito/blob/master/LICENSE - repo - - - - https://github.com/mockito/mockito.git - - - https://github.com/mockito/mockito/issues - GitHub issues - - - https://travis-ci.org/mockito/mockito - TravisCI - - - - mockitoguy - Szczepan Faber - - Core developer - - https://github.com/mockitoguy - - - bric3 - Brice Dutheil - - Core developer - - https://github.com/bric3 - - - raphw - Rafael Winterhalter - - Core developer - - https://github.com/raphw - - - TimvdLippe - Tim van der Lippe - - Core developer - - https://github.com/TimvdLippe - - - - - continuous-delivery-drone - https://github.com/continuous-delivery-drone - - - shipkit.org automated bot - https://github.com/shipkit-org - - - Marcin Zajączkowski - https://github.com/szpak - - - Pascal Schumacher - https://github.com/PascalSchumacher - - - Igor Czechowski - https://github.com/iczechowski - - - Bartosz Bańkowski - https://github.com/bbankowski - - - Erhard Pointl - https://github.com/epeee - - - Allon Murienik - https://github.com/mureinik - - - Christian Schwarz - https://github.com/ChristianSchwarz - - - Lukasz Szewc - https://github.com/lukasz-szewc - - - Marcin Grzejszczak - https://github.com/marcingrzejszczak - - - Marc Philipp - https://github.com/marcphilipp - - - Sangwoo Lee - https://github.com/marchpig - - - Philip P. Moltmann - https://github.com/moltmann - - - Tim Perry - https://github.com/pimterry - - - David J. M. Karlsen - https://github.com/davidkarlsen - - - Dawud-xx - https://github.com/Dawud-xx - - - Lovro Pandžić - https://github.com/lpandzic - - - Werner Beroux - https://github.com/wernight - - - Tsuyoshi Murakami - https://github.com/tmurakami - - - Serge Bishyr - https://github.com/SeriyBg - - - Dmitry Timofeev - https://github.com/dmitry-timofeev - - - jerzykrlk - https://github.com/jerzykrlk - - - alberskib - https://github.com/alberskib - - - Joseph Walton - https://github.com/josephw - - - Stephan Schroevers - https://github.com/Stephan202 - - - Michal Kordas - https://github.com/mkordas - - - Kamil Szymański - https://github.com/kamilszymanski - - - Hynek Mlnařík - https://github.com/hmlnarik - - - Hugh Hamill - https://github.com/hughwphamill - - - Hans Joachim Desserud - https://github.com/hansjoachim - - - Gunnar Wagenknecht - https://github.com/guw - - - Dmytro Chyzhykov - https://github.com/ffbit - - - r-smirnov - https://github.com/r-smirnov - - - ianparkinson - https://github.com/ianparkinson - - - dmac100 - https://github.com/dmac100 - - - Vineet Kumar - https://github.com/vin - - - Urs Metz - https://github.com/UrsMetz - - - Tarnowski Jan - https://github.com/tarnowskijan - - - Roman Elizarov - https://github.com/elizarov - - - Roland Hauser - https://github.com/SourcePond - - - Michał Borek - https://github.com/michalborek - - - Michael Pinnegar - https://github.com/Jazzepi - - - Marius Volkhart - https://github.com/MariusVolkhart - - - Lucas Cavalcanti - https://github.com/lucascs - - - Leonardo Carrasco - https://github.com/thesnowgoose - - - Krzysztof Wolny - https://github.com/vanta - - - Jeffrey Falgout - https://github.com/JeffreyFalgout - - - Ismael Juma - https://github.com/ijuma - - - Emory Merryman - https://github.com/AFnRFCb7 - - - Clark Brewer - https://github.com/brewerc - - - Carlos Aguayo - https://github.com/carlosaguayo - - - Arend v. Reinersdorff - https://github.com/arend-von-reinersdorff - - - Alberto Scotto - https://github.com/alb-i986 - - - yyvess - https://github.com/yyvess - - - 訾明华 - https://github.com/ziminghua - - - wuwen - https://github.com/wuwen5 - - - test111 - https://github.com/tradingreason - - - Xin Liu - https://github.com/L-KID - - - Wojtek Wilk - https://github.com/wwilk - - - Walter Scott Johnson - https://github.com/li-wjohnson - - - Walter Johnson - https://github.com/li-wjohnson - - - Vladislav - https://github.com/VChirp - - - Vivian Pennel - https://github.com/Vp3n - - - Venkata Jaswanth - https://github.com/aj-jaswanth - - - Tom Ball - https://github.com/tomball - - - Tokuhiro Matsuno - https://github.com/tokuhirom - - - Tim Cooke - https://github.com/trcooke - - - Stuart Blair - https://github.com/stuartblair - - - Simen Bekkhus - https://github.com/SimenB - - - Scott Markwell - https://github.com/smarkwell - - - Sanne Grinovero - https://github.com/Sanne - - - Roi Atalla - https://github.com/ra4king - - - Robert Stupp - https://github.com/snazy - - - Radim Kubacki - https://github.com/radimk - - - Philipp Jardas - https://github.com/phjardas - - - Oliver Drotbohm - https://github.com/odrotbohm - - - Niklas Baudy - https://github.com/vanniktech - - - Myrle Krantz - https://github.com/myrle-krantz - - - Matt Dean - https://github.com/mattbdean - - - Markus Wüstenberg - https://github.com/markuswustenberg - - - Maciej Kuster - https://github.com/NagRock - - - MEDDAH Julien - https://github.com/MeddahJ - - - Ludovic Meurillon - https://github.com/LudoMeurillon - - - Ludovic Chane - https://github.com/ludochane - - - Krisztian Milesz - https://github.com/mileszk - - - Kengo TODA - https://github.com/KengoTODA - - - Kayvan Najafzadeh - https://github.com/kayvannj - - - José Paumard - https://github.com/JosePaumard - - - Jonathan Lloyd - https://github.com/lloydjm77 - - - Johnny Lim - https://github.com/izeye - - - Jesse Englert - https://github.com/jpenglert - - - Jeremy Rickard - https://github.com/jrrickard - - - Ivan Vershinin - https://github.com/vershinin - - - Igor Kostenko - https://github.com/isanych - - - Igor Conrado Alves de Lima - https://github.com/igorcadelima - - - Gaëtan Muller - https://github.com/MGaetan89 - - - Felix W. Dekker - https://github.com/FWDekker - - - Evgeny Astafyev - https://github.com/astafev - - - Eugene Ivakhno - https://github.com/eugene-ivakhno - - - Erik Bakker - https://github.com/eamelink - - - Dmitriy Zaitsev - https://github.com/DmitriyZaitsev - - - Divyansh Gupta - https://github.com/divyansh-gupta - - - Dennis Cheung - https://github.com/hkdennis2k - - - Denis Zharkov - https://github.com/dzharkov - - - David Xia - https://github.com/davidxia - - - David Gageot - https://github.com/dgageot - - - Christian Persson - https://github.com/Saser - - - Bruno Krebs - https://github.com/brunokrebs - - - Ben Yu - https://github.com/fluentfuture - - - Bastien Jansen - https://github.com/bjansen - - - Bartosz Miller - https://github.com/BartoszMiller - - - Ariel Isaac - https://github.com/Ariel-Isaacm - - - Anuraag Agrawal - https://github.com/anuraaga - - - André Gonçalves - https://github.com/andrerigon - - - Andrey - https://github.com/andreyrmg - - - Andrei Solntsev - https://github.com/asolntsev - - - Allan Wang - https://github.com/AllanWang - - - Alex Simkin - https://github.com/SimY4 - - - rberghegger - https://github.com/rberghegger - - - philipa - https://github.com/philipa - - - paulduffin - https://github.com/paulduffin - - - mgrafl - https://github.com/mgrafl - - - jmetertea - https://github.com/jmetertea - - - geoffschoeman - https://github.com/geoffschoeman - - - bruceeddy - https://github.com/bruceeddy - - - ashleyfrieze - https://github.com/ashleyfrieze - - - Nirvanall - https://github.com/Nirvanall - - - LiamClark - https://github.com/LiamClark - - - diff --git a/use-unbundled-asm.patch b/use-unbundled-asm.patch deleted file mode 100644 index 9edcf60..0000000 --- a/use-unbundled-asm.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java -index 187f1ea..f8fa355 100644 ---- a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java -+++ b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java -@@ -30,8 +30,8 @@ import net.bytebuddy.dynamic.ClassFileLocator; - 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 org.objectweb.asm.ClassVisitor; -+import org.objectweb.asm.MethodVisitor; - import net.bytebuddy.matcher.ElementMatchers; - import net.bytebuddy.pool.TypePool; - import net.bytebuddy.utility.OpenedClassReader; -diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java -index f5b807a..c9ca662 100644 ---- a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java -+++ b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java -@@ -26,6 +26,7 @@ import org.mockito.plugins.MockMaker; - import org.mockito.stubbing.Answer; - import org.mockitoutil.ClassLoaders; - import org.mockitoutil.SimpleSerializationUtil; -+import org.objectweb.asm.ClassVisitor; - import org.objenesis.ObjenesisStd; - - public abstract class AbstractByteBuddyMockMakerTest { -@@ -154,7 +155,7 @@ public abstract class AbstractByteBuddyMockMakerTest { - // given - ClassLoader classpath_with_objenesis = - ClassLoaders.excludingClassLoader() -- .withCodeSourceUrlOf(Mockito.class, ByteBuddy.class, ObjenesisStd.class) -+ .withCodeSourceUrlOf(Mockito.class, ByteBuddy.class, ObjenesisStd.class, ClassVisitor.class) - .withCodeSourceUrlOf(coverageTool()) - .build(); - -diff --git a/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java b/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java -index f971893..63af9cd 100644 ---- a/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java -+++ b/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java -@@ -8,6 +8,7 @@ import static org.junit.Assert.assertTrue; - import static org.mockito.Mockito.mockingDetails; - import static org.mockito.Mockito.when; - -+import org.junit.Ignore; - import org.junit.Rule; - import org.junit.Test; - import org.mockito.Mock; -@@ -42,6 +43,7 @@ public class JUnitRuleTest { - - @SuppressWarnings({"CheckReturnValue", "MockitoUsage"}) - @Test -+ @Ignore - public void does_not_check_invalid_mockito_usage_on_failure() throws Throwable { - // This intended behavior is questionable - // However, it was like that since the beginning of JUnit rule support -diff --git a/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java b/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java -index 9cd47da..356a3e0 100644 ---- a/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java -+++ b/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java -@@ -16,6 +16,7 @@ import org.junit.Test; - import org.mockito.Mockito; - import org.mockito.internal.configuration.plugins.Plugins; - import org.mockitoutil.ClassLoaders; -+import org.objectweb.asm.ClassVisitor; - import org.objenesis.Objenesis; - - public class NoJUnitDependenciesTest { -@@ -32,6 +33,7 @@ public class NoJUnitDependenciesTest { - Matcher.class, - ByteBuddy.class, - ByteBuddyAgent.class, -+ ClassVisitor.class, - Objenesis.class) - .withCodeSourceUrlOf(coverageTool()) - .without("junit", "org.junit", "org.opentest4j")