From 054b18286ac714f2cf52b56764c6e0823d8ca50f Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 28 Oct 2015 21:11:46 +0100 Subject: [PATCH 1/5] 2015-10-28: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 1 - dead.package | 3 + fix-bnd-config.patch | 32 ------- fix-cglib-refs.patch | 133 ---------------------------- fixup-ant-script.patch | 42 --------- make-mockito-sourcetarball.sh | 20 ----- maven-cglib-dependency.patch | 15 ---- mockito-junit4.patch | 13 --- mockito-matcher.patch | 24 ----- mockito.spec | 160 ---------------------------------- setting-naming-policy.patch | 34 -------- sources | 1 - 12 files changed, 3 insertions(+), 475 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 fix-bnd-config.patch delete mode 100644 fix-cglib-refs.patch delete mode 100644 fixup-ant-script.patch delete mode 100644 make-mockito-sourcetarball.sh delete mode 100644 maven-cglib-dependency.patch delete mode 100644 mockito-junit4.patch delete mode 100644 mockito-matcher.patch delete mode 100644 mockito.spec delete mode 100644 setting-naming-policy.patch delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e1a2940..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mockito-1.9.0.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..cc5d396 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2015-10-28: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch deleted file mode 100644 index b9eceae..0000000 --- a/fix-bnd-config.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- conf/mockito-core.bnd.orig 2012-09-06 14:42:08.417103606 +0200 -+++ conf/mockito-core.bnd 2012-09-06 14:43:41.391834567 +0200 -@@ -1,8 +1,3 @@ ---classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \ -- lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \ -- lib/run/com.springsource.org.objenesis-1.0.0.jar ---versionpolicy=[${version;==;${@}},${version;+;${@}}) -- - Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis. - Bundle-SymbolicName= org.mockito.mockito-core - Bundle-Version= 1.9.0 -@@ -10,15 +5,16 @@ - Export-Package= !org.mockito.asm.*, \ - !org.mockito.cglib.*, \ - !org.mockito.internal.*, \ -- org.mockito.*;version=${version} -+ org.mockito.* - - Import-Package= junit.*;resolution:=optional, \ - org.junit.*;resolution:=optional, \ - org.apache.tools.ant.*;resolution:=optional, \ - org.hamcrest;version="[1.0,2.0)", \ - org.objenesis;version="[1.0,2.0)", \ -- org.mockito.* -+ org.mockito.*, \ -+ net.sf.cglib* - - Private-Package: org.mockito.* - ---removeheaders: Private-Package -\ No newline at end of file -+-removeheaders: Private-Package diff --git a/fix-cglib-refs.patch b/fix-cglib-refs.patch deleted file mode 100644 index 19f8f21..0000000 --- a/fix-cglib-refs.patch +++ /dev/null @@ -1,133 +0,0 @@ -# HG changeset patch -# Parent 65e60f677b3cb9c40d5d37e91ce6be1897c46370 - -diff --git a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java ---- a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java -+++ b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java -@@ -4,7 +4,7 @@ - */ - package org.mockito.internal.creation; - --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - - public class DelegatingMockitoMethodProxy extends AbstractMockitoMethodProxy { - -diff --git a/src/org/mockito/internal/creation/MethodInterceptorFilter.java b/src/org/mockito/internal/creation/MethodInterceptorFilter.java ---- a/src/org/mockito/internal/creation/MethodInterceptorFilter.java -+++ b/src/org/mockito/internal/creation/MethodInterceptorFilter.java -@@ -8,8 +8,8 @@ - import java.io.Serializable; - import java.lang.reflect.Method; - --import org.mockito.cglib.proxy.MethodInterceptor; --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodInterceptor; -+import net.sf.cglib.proxy.MethodProxy; - import org.mockito.internal.MockitoInvocationHandler; - import org.mockito.internal.creation.cglib.CGLIBHacker; - import org.mockito.internal.invocation.*; -diff --git a/src/org/mockito/internal/creation/MockitoMethodProxy.java b/src/org/mockito/internal/creation/MockitoMethodProxy.java ---- a/src/org/mockito/internal/creation/MockitoMethodProxy.java -+++ b/src/org/mockito/internal/creation/MockitoMethodProxy.java -@@ -4,7 +4,7 @@ - */ - package org.mockito.internal.creation; - --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - - public interface MockitoMethodProxy { - -diff --git a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java ---- a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java -+++ b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java -@@ -6,7 +6,7 @@ - - import java.io.Serializable; - --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - import org.mockito.internal.util.reflection.Whitebox; - - public class SerializableMockitoMethodProxy extends AbstractMockitoMethodProxy implements Serializable { -diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java ---- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -+++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -@@ -8,7 +8,7 @@ - import java.lang.reflect.Field; - - import org.mockito.internal.creation.MockitoMethodProxy; --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - - public class CGLIBHacker implements Serializable { - -diff --git a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java b/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java ---- a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java -+++ b/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java -@@ -4,7 +4,7 @@ - */ - package org.mockito.internal.creation.cglib; - --import org.mockito.cglib.core.DefaultNamingPolicy; -+import net.sf.cglib.core.DefaultNamingPolicy; - - public class MockitoNamingPolicy extends DefaultNamingPolicy { - -diff --git a/src/org/mockito/internal/creation/jmock/ClassImposterizer.java b/src/org/mockito/internal/creation/jmock/ClassImposterizer.java ---- a/src/org/mockito/internal/creation/jmock/ClassImposterizer.java -+++ b/src/org/mockito/internal/creation/jmock/ClassImposterizer.java -@@ -7,8 +7,8 @@ - import java.lang.reflect.*; - import java.util.List; - --import org.mockito.cglib.core.*; --import org.mockito.cglib.proxy.*; -+import net.sf.cglib.core.*; -+import net.sf.cglib.proxy.*; - import org.mockito.exceptions.base.MockitoException; - import org.mockito.internal.creation.cglib.MockitoNamingPolicy; - import org.objenesis.ObjenesisStd; -diff --git a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java b/src/org/mockito/internal/creation/jmock/SerializableNoOp.java ---- a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java -+++ b/src/org/mockito/internal/creation/jmock/SerializableNoOp.java -@@ -6,8 +6,8 @@ - - import java.io.Serializable; - --import org.mockito.cglib.proxy.Callback; --import org.mockito.cglib.proxy.NoOp; -+import net.sf.cglib.proxy.Callback; -+import net.sf.cglib.proxy.NoOp; - - public class SerializableNoOp implements NoOp, Serializable { - -diff --git a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java ---- a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java -+++ b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java -@@ -9,8 +9,8 @@ - import java.util.Arrays; - - import org.mockito.Mockito; --import org.mockito.cglib.proxy.MethodInterceptor; --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodInterceptor; -+import net.sf.cglib.proxy.MethodProxy; - import org.mockito.exceptions.Reporter; - import org.mockito.internal.creation.jmock.ClassImposterizer; - import org.mockito.internal.debugging.Location; -diff --git a/src/org/mockito/internal/util/MockUtil.java b/src/org/mockito/internal/util/MockUtil.java ---- a/src/org/mockito/internal/util/MockUtil.java -+++ b/src/org/mockito/internal/util/MockUtil.java -@@ -4,8 +4,8 @@ - */ - package org.mockito.internal.util; - --import org.mockito.cglib.proxy.Callback; --import org.mockito.cglib.proxy.Factory; -+import net.sf.cglib.proxy.Callback; -+import net.sf.cglib.proxy.Factory; - import org.mockito.exceptions.misusing.NotAMockException; - import org.mockito.internal.InvocationNotifierHandler; - import org.mockito.internal.MockHandler; diff --git a/fixup-ant-script.patch b/fixup-ant-script.patch deleted file mode 100644 index 51a4384..0000000 --- a/fixup-ant-script.patch +++ /dev/null @@ -1,42 +0,0 @@ -# HG changeset patch -# Parent 5e1ff2ee5aa22b1c22238b520b3e6bd3b4aec0da - -diff --git a/build.xml b/build.xml ---- a/build.xml -+++ b/build.xml -@@ -42,6 +42,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -204,19 +210,14 @@ - - - -- -- -+ -+ - - - - -- -- -- - -- -- -- -+ - - - diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh deleted file mode 100644 index 58c1b67..0000000 --- a/make-mockito-sourcetarball.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -#set -x - -VERSION=1.9.0 -SRCDIR=mockito-${VERSION} - -hg clone https://code.google.com/p/mockito/ ${SRCDIR} -pushd $SRCDIR -hg archive --prefix ${SRCDIR} -t tar -r ${VERSION} ../${SRCDIR}.tar -popd - -rm -rf ${SRCDIR} - -tar -xf ${SRCDIR}.tar -pushd ${SRCDIR} -rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat -dos2unix `find -name *.java` -popd - -tar -cvJf mockito-${VERSION}.tar.xz ${SRCDIR} diff --git a/maven-cglib-dependency.patch b/maven-cglib-dependency.patch deleted file mode 100644 index 313a9cf..0000000 --- a/maven-cglib-dependency.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/maven/mockito-core.pom b/maven/mockito-core.pom ---- a/maven/mockito-core.pom -+++ b/maven/mockito-core.pom -@@ -29,6 +29,11 @@ - objenesis - 1.0 - -+ -+ net.sf.cglib -+ cglib -+ 2.2 -+ - - - diff --git a/mockito-junit4.patch b/mockito-junit4.patch deleted file mode 100644 index e0dc921..0000000 --- a/mockito-junit4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mockito-1.9.0/build.xml b/mockito-1.9.0/build.xml -index e6b49e8..487b632 100644 ---- a/mockito-1.9.0/build.xml -+++ b/mockito-1.9.0/build.xml -@@ -44,7 +44,7 @@ - - - -- -+ - - - diff --git a/mockito-matcher.patch b/mockito-matcher.patch deleted file mode 100644 index 71572d7..0000000 --- a/mockito-matcher.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/org/mockito/internal/matchers/LocalizedMatcher.java b/src/org/mockito/internal/matchers/LocalizedMatcher.java -index 01e83b3..7d249f5 100644 ---- a/src/org/mockito/internal/matchers/LocalizedMatcher.java -+++ b/src/org/mockito/internal/matchers/LocalizedMatcher.java -@@ -16,6 +16,12 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, - private final Matcher actualMatcher; - private Location location; - -+ /* This is a hack for Fedora. Bug has been filed here: -+ * https://code.google.com/p/mockito/issues/detail?id=428 */ -+ public void describeMismatch(Object item, Description mismatchDescription) { -+ mismatchDescription.appendText("was ").appendValue(item); -+ } -+ - public LocalizedMatcher(Matcher actualMatcher) { - this.actualMatcher = actualMatcher; - this.location = new Location(); -@@ -65,4 +71,4 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, - public Matcher getActualMatcher() { - return actualMatcher; - } --} -\ No newline at end of file -+} diff --git a/mockito.spec b/mockito.spec deleted file mode 100644 index 4a8330c..0000000 --- a/mockito.spec +++ /dev/null @@ -1,160 +0,0 @@ -Name: mockito -Version: 1.9.0 -Release: 18%{?dist} -Summary: A Java mocking framework - -License: MIT -URL: http://code.google.com/p/mockito/ -Source0: mockito-%{version}.tar.xz -Source1: make-mockito-sourcetarball.sh -Patch0: fixup-ant-script.patch -Patch1: fix-cglib-refs.patch -Patch2: maven-cglib-dependency.patch -Patch3: fix-bnd-config.patch -Patch4: %{name}-matcher.patch -# Workaround for NPE in setting NamingPolicy in cglib -Patch5: setting-naming-policy.patch -Patch6: mockito-junit4.patch - -BuildArch: noarch -BuildRequires: jpackage-utils -BuildRequires: java-devel -BuildRequires: ant -BuildRequires: objenesis -BuildRequires: cglib -BuildRequires: junit -BuildRequires: hamcrest -BuildRequires: aqute-bnd - -Requires: jpackage-utils -Requires: objenesis -Requires: cglib -Requires: junit -Requires: hamcrest - -%description -Mockito is a mocking framework that tastes really good. It lets you write -beautiful tests with clean & simple API. Mockito doesn't give you hangover -because the tests are very readable and they produce clean verification -errors. - -%package javadoc -Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -# Set Bundle-Version properly -sed -i 's/Bundle-Version= ${version}/Bundle-Version= %{version}/' conf/mockito-core.bnd -%patch3 -%patch4 -p1 -%patch5 -p1 -%patch6 -p2 - -%build -build-jar-repository lib/compile objenesis -ant jar javadoc -# Convert to OSGi bundle -pushd target -java -jar $(build-classpath aqute-bnd) wrap -output mockito-core-%{version}.bar -properties ../conf/mockito-core.bnd mockito-core-%{version}.jar -popd - -%install -mkdir -p $RPM_BUILD_ROOT%{_javadir} -sed -i -e "s|@version@|%{version}|g" maven/mockito-core.pom -cp -p target/mockito-core-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar - -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 maven/mockito-core.pom \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom - -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.mockito:mockito-all" - -%files -f .mfiles -%{_javadir}/%{name}.jar -%doc NOTICE -%doc LICENSE - -%files javadoc -%{_javadocdir}/%{name} -%doc LICENSE -%doc NOTICE - -%changelog -* Mon Aug 25 2014 Darryl L. Pierce - 1.9.0-18 -- First build for EPEL7 -- Resolves: BZ#1110030 - -* Mon Jun 09 2014 Omair Majid - 1.9.0-17 -- Use .mfiles to pick up xmvn metadata -- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros -- Fix FTBFS - -* Sat Jun 07 2014 Fedora Release Engineering - 1.9.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Severin Gehwolf - 1.9.0-16 -- Use junit R/BR over junit4. - -* Fri Mar 28 2014 Michael Simacek - 1.9.0-15 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Dec 11 2013 Michael Simacek - 1.9.0-14 -- Workaround for NPE in setting NamingPolicy - -* Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 25 2013 Tomas Radej - 1.9.0-12 -- Patched LocalizedMatcher due to hamcrest update, (bug upstream) - -* Thu Feb 14 2013 Fedora Release Engineering - 1.9.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Sep 6 2012 Severin Gehwolf 1.9.0-10 -- More Import-Package fixes. Note that fix-cglib-refs.patch is - not suitable for upstream: - http://code.google.com/p/mockito/issues/detail?id=373 - -* Tue Sep 4 2012 Severin Gehwolf 1.9.0-9 -- Fix missing Import-Package in manifest. - -* Mon Aug 27 2012 Severin Gehwolf 1.9.0-8 -- Add aqute bnd instructions for OSGi metadata - -* Fri Jul 20 2012 Fedora Release Engineering - 1.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 30 2012 Roman Kennke 1.9.0-6 -- Place JavaDoc in directly under %{_javadocdir}/%{name} instead - of %{_javadocdir}/%{name}/javadoc - -* Wed Apr 25 2012 Roman Kennke 1.9.0-5 -- Removed post/postun hook for update_maven_depmap - -* Tue Apr 24 2012 Roman Kennke 1.9.0-4 -- Fix groupId of cglib dependency -- Add additional depmap for mockito-all -- Update depmap on post and postun -- Fix version in pom - -* Wed Feb 22 2012 Roman Kennke 1.9.0-3 -- Added cglib dependency to pom - -* Tue Feb 21 2012 Roman Kennke 1.9.0-2 -- Include upstream Maven pom.xml in package -- Added missing Requires for cglib, junit4, hamcrest, objenesis -- Added source tarball generating script to sources - -* Thu Feb 16 2012 Roman Kennke 1.9.0-1 -- Initial package diff --git a/setting-naming-policy.patch b/setting-naming-policy.patch deleted file mode 100644 index d4f30b1..0000000 --- a/setting-naming-policy.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 04e36a01e93c3b79caa9f7e9e8573fe2a0d65d1a Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Thu, 5 Dec 2013 16:53:36 +0100 -Subject: [PATCH] Setting naming policy - -Signed-off-by: Michael Simacek ---- - src/org/mockito/internal/creation/cglib/CGLIBHacker.java | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -index 172f744..de53ab1 100644 ---- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -+++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -@@ -20,6 +20,9 @@ public class CGLIBHacker implements Serializable { - Field createInfoField = reflectOnCreateInfo(methodProxy); - createInfoField.setAccessible(true); - Object createInfo = createInfoField.get(methodProxy); -+ if (createInfo == null) { -+ return; -+ } - Field namingPolicyField = createInfo.getClass().getDeclaredField("namingPolicy"); - namingPolicyField.setAccessible(true); - if (namingPolicyField.get(createInfo) == null) { -@@ -43,4 +46,4 @@ public class CGLIBHacker implements Serializable { - } - return cglibMethodProxyClass.getDeclaredField("createInfo"); - } --} -\ No newline at end of file -+} --- -1.8.3.1 - diff --git a/sources b/sources deleted file mode 100644 index f6b13f3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -967d7b4059fa8185b94d6f7273f6cfe5 mockito-1.9.0.tar.xz From 388176e9c97a01278ae97eb2a18d64f4dbf1a681 Mon Sep 17 00:00:00 2001 From: Roman Mohr Date: Wed, 9 Dec 2015 11:23:59 +0100 Subject: [PATCH 2/5] Unretire package --- .gitignore | 1 + dead.package | 3 - fix-bnd-config.patch | 32 +++++++ fix-cglib-refs.patch | 133 ++++++++++++++++++++++++++++ fixup-ant-script.patch | 42 +++++++++ make-mockito-sourcetarball.sh | 20 +++++ maven-cglib-dependency.patch | 15 ++++ mockito-junit4.patch | 13 +++ mockito-matcher.patch | 24 +++++ mockito.spec | 160 ++++++++++++++++++++++++++++++++++ setting-naming-policy.patch | 34 ++++++++ sources | 1 + 12 files changed, 475 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 fix-bnd-config.patch create mode 100644 fix-cglib-refs.patch create mode 100644 fixup-ant-script.patch create mode 100644 make-mockito-sourcetarball.sh create mode 100644 maven-cglib-dependency.patch create mode 100644 mockito-junit4.patch create mode 100644 mockito-matcher.patch create mode 100644 mockito.spec create mode 100644 setting-naming-policy.patch create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e1a2940 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/mockito-1.9.0.tar.xz diff --git a/dead.package b/dead.package deleted file mode 100644 index cc5d396..0000000 --- a/dead.package +++ /dev/null @@ -1,3 +0,0 @@ -2015-10-28: Retired orphaned package, because it was orphaned for -more than six weeks. - diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch new file mode 100644 index 0000000..b9eceae --- /dev/null +++ b/fix-bnd-config.patch @@ -0,0 +1,32 @@ +--- conf/mockito-core.bnd.orig 2012-09-06 14:42:08.417103606 +0200 ++++ conf/mockito-core.bnd 2012-09-06 14:43:41.391834567 +0200 +@@ -1,8 +1,3 @@ +--classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \ +- lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \ +- lib/run/com.springsource.org.objenesis-1.0.0.jar +--versionpolicy=[${version;==;${@}},${version;+;${@}}) +- + Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis. + Bundle-SymbolicName= org.mockito.mockito-core + Bundle-Version= 1.9.0 +@@ -10,15 +5,16 @@ + Export-Package= !org.mockito.asm.*, \ + !org.mockito.cglib.*, \ + !org.mockito.internal.*, \ +- org.mockito.*;version=${version} ++ org.mockito.* + + Import-Package= junit.*;resolution:=optional, \ + org.junit.*;resolution:=optional, \ + org.apache.tools.ant.*;resolution:=optional, \ + org.hamcrest;version="[1.0,2.0)", \ + org.objenesis;version="[1.0,2.0)", \ +- org.mockito.* ++ org.mockito.*, \ ++ net.sf.cglib* + + Private-Package: org.mockito.* + +--removeheaders: Private-Package +\ No newline at end of file ++-removeheaders: Private-Package diff --git a/fix-cglib-refs.patch b/fix-cglib-refs.patch new file mode 100644 index 0000000..19f8f21 --- /dev/null +++ b/fix-cglib-refs.patch @@ -0,0 +1,133 @@ +# HG changeset patch +# Parent 65e60f677b3cb9c40d5d37e91ce6be1897c46370 + +diff --git a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java +--- a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java ++++ b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java +@@ -4,7 +4,7 @@ + */ + package org.mockito.internal.creation; + +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodProxy; + + public class DelegatingMockitoMethodProxy extends AbstractMockitoMethodProxy { + +diff --git a/src/org/mockito/internal/creation/MethodInterceptorFilter.java b/src/org/mockito/internal/creation/MethodInterceptorFilter.java +--- a/src/org/mockito/internal/creation/MethodInterceptorFilter.java ++++ b/src/org/mockito/internal/creation/MethodInterceptorFilter.java +@@ -8,8 +8,8 @@ + import java.io.Serializable; + import java.lang.reflect.Method; + +-import org.mockito.cglib.proxy.MethodInterceptor; +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; + import org.mockito.internal.MockitoInvocationHandler; + import org.mockito.internal.creation.cglib.CGLIBHacker; + import org.mockito.internal.invocation.*; +diff --git a/src/org/mockito/internal/creation/MockitoMethodProxy.java b/src/org/mockito/internal/creation/MockitoMethodProxy.java +--- a/src/org/mockito/internal/creation/MockitoMethodProxy.java ++++ b/src/org/mockito/internal/creation/MockitoMethodProxy.java +@@ -4,7 +4,7 @@ + */ + package org.mockito.internal.creation; + +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodProxy; + + public interface MockitoMethodProxy { + +diff --git a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java +--- a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java ++++ b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java +@@ -6,7 +6,7 @@ + + import java.io.Serializable; + +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodProxy; + import org.mockito.internal.util.reflection.Whitebox; + + public class SerializableMockitoMethodProxy extends AbstractMockitoMethodProxy implements Serializable { +diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java +--- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java ++++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java +@@ -8,7 +8,7 @@ + import java.lang.reflect.Field; + + import org.mockito.internal.creation.MockitoMethodProxy; +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodProxy; + + public class CGLIBHacker implements Serializable { + +diff --git a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java b/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java +--- a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java ++++ b/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java +@@ -4,7 +4,7 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.core.DefaultNamingPolicy; ++import net.sf.cglib.core.DefaultNamingPolicy; + + public class MockitoNamingPolicy extends DefaultNamingPolicy { + +diff --git a/src/org/mockito/internal/creation/jmock/ClassImposterizer.java b/src/org/mockito/internal/creation/jmock/ClassImposterizer.java +--- a/src/org/mockito/internal/creation/jmock/ClassImposterizer.java ++++ b/src/org/mockito/internal/creation/jmock/ClassImposterizer.java +@@ -7,8 +7,8 @@ + import java.lang.reflect.*; + import java.util.List; + +-import org.mockito.cglib.core.*; +-import org.mockito.cglib.proxy.*; ++import net.sf.cglib.core.*; ++import net.sf.cglib.proxy.*; + import org.mockito.exceptions.base.MockitoException; + import org.mockito.internal.creation.cglib.MockitoNamingPolicy; + import org.objenesis.ObjenesisStd; +diff --git a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java b/src/org/mockito/internal/creation/jmock/SerializableNoOp.java +--- a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java ++++ b/src/org/mockito/internal/creation/jmock/SerializableNoOp.java +@@ -6,8 +6,8 @@ + + import java.io.Serializable; + +-import org.mockito.cglib.proxy.Callback; +-import org.mockito.cglib.proxy.NoOp; ++import net.sf.cglib.proxy.Callback; ++import net.sf.cglib.proxy.NoOp; + + public class SerializableNoOp implements NoOp, Serializable { + +diff --git a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java +--- a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java ++++ b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java +@@ -9,8 +9,8 @@ + import java.util.Arrays; + + import org.mockito.Mockito; +-import org.mockito.cglib.proxy.MethodInterceptor; +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; + import org.mockito.exceptions.Reporter; + import org.mockito.internal.creation.jmock.ClassImposterizer; + import org.mockito.internal.debugging.Location; +diff --git a/src/org/mockito/internal/util/MockUtil.java b/src/org/mockito/internal/util/MockUtil.java +--- a/src/org/mockito/internal/util/MockUtil.java ++++ b/src/org/mockito/internal/util/MockUtil.java +@@ -4,8 +4,8 @@ + */ + package org.mockito.internal.util; + +-import org.mockito.cglib.proxy.Callback; +-import org.mockito.cglib.proxy.Factory; ++import net.sf.cglib.proxy.Callback; ++import net.sf.cglib.proxy.Factory; + import org.mockito.exceptions.misusing.NotAMockException; + import org.mockito.internal.InvocationNotifierHandler; + import org.mockito.internal.MockHandler; diff --git a/fixup-ant-script.patch b/fixup-ant-script.patch new file mode 100644 index 0000000..51a4384 --- /dev/null +++ b/fixup-ant-script.patch @@ -0,0 +1,42 @@ +# HG changeset patch +# Parent 5e1ff2ee5aa22b1c22238b520b3e6bd3b4aec0da + +diff --git a/build.xml b/build.xml +--- a/build.xml ++++ b/build.xml +@@ -42,6 +42,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -204,19 +210,14 @@ + + + +- +- ++ ++ + + + + +- +- +- + +- +- +- ++ + + + diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh new file mode 100644 index 0000000..58c1b67 --- /dev/null +++ b/make-mockito-sourcetarball.sh @@ -0,0 +1,20 @@ +#!/bin/sh +#set -x + +VERSION=1.9.0 +SRCDIR=mockito-${VERSION} + +hg clone https://code.google.com/p/mockito/ ${SRCDIR} +pushd $SRCDIR +hg archive --prefix ${SRCDIR} -t tar -r ${VERSION} ../${SRCDIR}.tar +popd + +rm -rf ${SRCDIR} + +tar -xf ${SRCDIR}.tar +pushd ${SRCDIR} +rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat +dos2unix `find -name *.java` +popd + +tar -cvJf mockito-${VERSION}.tar.xz ${SRCDIR} diff --git a/maven-cglib-dependency.patch b/maven-cglib-dependency.patch new file mode 100644 index 0000000..313a9cf --- /dev/null +++ b/maven-cglib-dependency.patch @@ -0,0 +1,15 @@ +diff --git a/maven/mockito-core.pom b/maven/mockito-core.pom +--- a/maven/mockito-core.pom ++++ b/maven/mockito-core.pom +@@ -29,6 +29,11 @@ + objenesis + 1.0 + ++ ++ net.sf.cglib ++ cglib ++ 2.2 ++ + + + diff --git a/mockito-junit4.patch b/mockito-junit4.patch new file mode 100644 index 0000000..e0dc921 --- /dev/null +++ b/mockito-junit4.patch @@ -0,0 +1,13 @@ +diff --git a/mockito-1.9.0/build.xml b/mockito-1.9.0/build.xml +index e6b49e8..487b632 100644 +--- a/mockito-1.9.0/build.xml ++++ b/mockito-1.9.0/build.xml +@@ -44,7 +44,7 @@ + + + +- ++ + + + diff --git a/mockito-matcher.patch b/mockito-matcher.patch new file mode 100644 index 0000000..71572d7 --- /dev/null +++ b/mockito-matcher.patch @@ -0,0 +1,24 @@ +diff --git a/src/org/mockito/internal/matchers/LocalizedMatcher.java b/src/org/mockito/internal/matchers/LocalizedMatcher.java +index 01e83b3..7d249f5 100644 +--- a/src/org/mockito/internal/matchers/LocalizedMatcher.java ++++ b/src/org/mockito/internal/matchers/LocalizedMatcher.java +@@ -16,6 +16,12 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, + private final Matcher actualMatcher; + private Location location; + ++ /* This is a hack for Fedora. Bug has been filed here: ++ * https://code.google.com/p/mockito/issues/detail?id=428 */ ++ public void describeMismatch(Object item, Description mismatchDescription) { ++ mismatchDescription.appendText("was ").appendValue(item); ++ } ++ + public LocalizedMatcher(Matcher actualMatcher) { + this.actualMatcher = actualMatcher; + this.location = new Location(); +@@ -65,4 +71,4 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, + public Matcher getActualMatcher() { + return actualMatcher; + } +-} +\ No newline at end of file ++} diff --git a/mockito.spec b/mockito.spec new file mode 100644 index 0000000..4a8330c --- /dev/null +++ b/mockito.spec @@ -0,0 +1,160 @@ +Name: mockito +Version: 1.9.0 +Release: 18%{?dist} +Summary: A Java mocking framework + +License: MIT +URL: http://code.google.com/p/mockito/ +Source0: mockito-%{version}.tar.xz +Source1: make-mockito-sourcetarball.sh +Patch0: fixup-ant-script.patch +Patch1: fix-cglib-refs.patch +Patch2: maven-cglib-dependency.patch +Patch3: fix-bnd-config.patch +Patch4: %{name}-matcher.patch +# Workaround for NPE in setting NamingPolicy in cglib +Patch5: setting-naming-policy.patch +Patch6: mockito-junit4.patch + +BuildArch: noarch +BuildRequires: jpackage-utils +BuildRequires: java-devel +BuildRequires: ant +BuildRequires: objenesis +BuildRequires: cglib +BuildRequires: junit +BuildRequires: hamcrest +BuildRequires: aqute-bnd + +Requires: jpackage-utils +Requires: objenesis +Requires: cglib +Requires: junit +Requires: hamcrest + +%description +Mockito is a mocking framework that tastes really good. It lets you write +beautiful tests with clean & simple API. Mockito doesn't give you hangover +because the tests are very readable and they produce clean verification +errors. + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +# Set Bundle-Version properly +sed -i 's/Bundle-Version= ${version}/Bundle-Version= %{version}/' conf/mockito-core.bnd +%patch3 +%patch4 -p1 +%patch5 -p1 +%patch6 -p2 + +%build +build-jar-repository lib/compile objenesis +ant jar javadoc +# Convert to OSGi bundle +pushd target +java -jar $(build-classpath aqute-bnd) wrap -output mockito-core-%{version}.bar -properties ../conf/mockito-core.bnd mockito-core-%{version}.jar +popd + +%install +mkdir -p $RPM_BUILD_ROOT%{_javadir} +sed -i -e "s|@version@|%{version}|g" maven/mockito-core.pom +cp -p target/mockito-core-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -pm 644 maven/mockito-core.pom \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.mockito:mockito-all" + +%files -f .mfiles +%{_javadir}/%{name}.jar +%doc NOTICE +%doc LICENSE + +%files javadoc +%{_javadocdir}/%{name} +%doc LICENSE +%doc NOTICE + +%changelog +* Mon Aug 25 2014 Darryl L. Pierce - 1.9.0-18 +- First build for EPEL7 +- Resolves: BZ#1110030 + +* Mon Jun 09 2014 Omair Majid - 1.9.0-17 +- Use .mfiles to pick up xmvn metadata +- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros +- Fix FTBFS + +* Sat Jun 07 2014 Fedora Release Engineering - 1.9.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 22 2014 Severin Gehwolf - 1.9.0-16 +- Use junit R/BR over junit4. + +* Fri Mar 28 2014 Michael Simacek - 1.9.0-15 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Dec 11 2013 Michael Simacek - 1.9.0-14 +- Workaround for NPE in setting NamingPolicy + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 25 2013 Tomas Radej - 1.9.0-12 +- Patched LocalizedMatcher due to hamcrest update, (bug upstream) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.9.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Sep 6 2012 Severin Gehwolf 1.9.0-10 +- More Import-Package fixes. Note that fix-cglib-refs.patch is + not suitable for upstream: + http://code.google.com/p/mockito/issues/detail?id=373 + +* Tue Sep 4 2012 Severin Gehwolf 1.9.0-9 +- Fix missing Import-Package in manifest. + +* Mon Aug 27 2012 Severin Gehwolf 1.9.0-8 +- Add aqute bnd instructions for OSGi metadata + +* Fri Jul 20 2012 Fedora Release Engineering - 1.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 30 2012 Roman Kennke 1.9.0-6 +- Place JavaDoc in directly under %{_javadocdir}/%{name} instead + of %{_javadocdir}/%{name}/javadoc + +* Wed Apr 25 2012 Roman Kennke 1.9.0-5 +- Removed post/postun hook for update_maven_depmap + +* Tue Apr 24 2012 Roman Kennke 1.9.0-4 +- Fix groupId of cglib dependency +- Add additional depmap for mockito-all +- Update depmap on post and postun +- Fix version in pom + +* Wed Feb 22 2012 Roman Kennke 1.9.0-3 +- Added cglib dependency to pom + +* Tue Feb 21 2012 Roman Kennke 1.9.0-2 +- Include upstream Maven pom.xml in package +- Added missing Requires for cglib, junit4, hamcrest, objenesis +- Added source tarball generating script to sources + +* Thu Feb 16 2012 Roman Kennke 1.9.0-1 +- Initial package diff --git a/setting-naming-policy.patch b/setting-naming-policy.patch new file mode 100644 index 0000000..d4f30b1 --- /dev/null +++ b/setting-naming-policy.patch @@ -0,0 +1,34 @@ +From 04e36a01e93c3b79caa9f7e9e8573fe2a0d65d1a Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Thu, 5 Dec 2013 16:53:36 +0100 +Subject: [PATCH] Setting naming policy + +Signed-off-by: Michael Simacek +--- + src/org/mockito/internal/creation/cglib/CGLIBHacker.java | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java +index 172f744..de53ab1 100644 +--- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java ++++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java +@@ -20,6 +20,9 @@ public class CGLIBHacker implements Serializable { + Field createInfoField = reflectOnCreateInfo(methodProxy); + createInfoField.setAccessible(true); + Object createInfo = createInfoField.get(methodProxy); ++ if (createInfo == null) { ++ return; ++ } + Field namingPolicyField = createInfo.getClass().getDeclaredField("namingPolicy"); + namingPolicyField.setAccessible(true); + if (namingPolicyField.get(createInfo) == null) { +@@ -43,4 +46,4 @@ public class CGLIBHacker implements Serializable { + } + return cglibMethodProxyClass.getDeclaredField("createInfo"); + } +-} +\ No newline at end of file ++} +-- +1.8.3.1 + diff --git a/sources b/sources new file mode 100644 index 0000000..f6b13f3 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +967d7b4059fa8185b94d6f7273f6cfe5 mockito-1.9.0.tar.xz From 98f3c1ec303faf113167872e9aebb44f2185ab16 Mon Sep 17 00:00:00 2001 From: Roman Mohr Date: Wed, 9 Dec 2015 11:29:19 +0100 Subject: [PATCH 3/5] Bump spec for new build after unretirement --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 4a8330c..5b1fc56 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito Version: 1.9.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A Java mocking framework License: MIT @@ -91,6 +91,9 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %doc NOTICE %changelog +* Wed Dec 09 2015 Roman Mohr - 1.9.0-19 +- Unretire package on EPEL7 + * Mon Aug 25 2014 Darryl L. Pierce - 1.9.0-18 - First build for EPEL7 - Resolves: BZ#1110030 From 115af1b15c37c5d810ea1469a695949a7eb03816 Mon Sep 17 00:00:00 2001 From: Roman Mohr Date: Tue, 1 Mar 2016 11:27:37 +0100 Subject: [PATCH 4/5] Update to 1.10.19 and sync with f24 branch --- .gitignore | 5 +- fix-bnd-config.patch | 27 +++---- fix-cglib-refs.patch | 133 ---------------------------------- fix-incompatible-types.patch | 12 +++ fixup-ant-script.patch | 87 ++++++++++++++++------ make-mockito-sourcetarball.sh | 10 +-- maven-cglib-dependency.patch | 15 ---- mockito-junit4.patch | 13 ---- mockito-matcher.patch | 41 +++++++---- mockito.spec | 93 +++++++++++++----------- sources | 2 +- 11 files changed, 178 insertions(+), 260 deletions(-) delete mode 100644 fix-cglib-refs.patch create mode 100644 fix-incompatible-types.patch mode change 100644 => 100755 make-mockito-sourcetarball.sh delete mode 100644 maven-cglib-dependency.patch delete mode 100644 mockito-junit4.patch diff --git a/.gitignore b/.gitignore index e1a2940..aa287b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -/mockito-1.9.0.tar.xz +/mockito-*.tar.xz +/.build-*.log +/noarch/ +/*.src.rpm diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch index b9eceae..a9bf97e 100644 --- a/fix-bnd-config.patch +++ b/fix-bnd-config.patch @@ -1,15 +1,13 @@ ---- conf/mockito-core.bnd.orig 2012-09-06 14:42:08.417103606 +0200 -+++ conf/mockito-core.bnd 2012-09-06 14:43:41.391834567 +0200 -@@ -1,8 +1,3 @@ ---classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \ -- lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \ -- lib/run/com.springsource.org.objenesis-1.0.0.jar +--- conf/mockito-core.bnd.orig 2014-12-31 16:43:56.000000000 +0000 ++++ conf/mockito-core.bnd 2015-09-01 19:36:18.534549995 +0100 +@@ -1,21 +1,19 @@ --versionpolicy=[${version;==;${@}},${version;+;${@}}) - - Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis. +-Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis. ++Bundle-Name= Mockito Mock Library for Java. Bundle-SymbolicName= org.mockito.mockito-core - Bundle-Version= 1.9.0 -@@ -10,15 +5,16 @@ + Bundle-Version= ${version} + Export-Package= !org.mockito.asm.*, \ !org.mockito.cglib.*, \ !org.mockito.internal.*, \ @@ -19,14 +17,13 @@ Import-Package= junit.*;resolution:=optional, \ org.junit.*;resolution:=optional, \ org.apache.tools.ant.*;resolution:=optional, \ - org.hamcrest;version="[1.0,2.0)", \ - org.objenesis;version="[1.0,2.0)", \ +- org.hamcrest;version="[1.0,3.0)", \ +- org.objenesis;version="[2.1,3.0)", \ ++ org.objenesis;version="[1.0,3.0)", \ + org.mockito.asm.signature;resolution:=optional, \ - org.mockito.* + org.mockito.*, \ -+ net.sf.cglib* ++ net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect Private-Package: org.mockito.* ---removeheaders: Private-Package -\ No newline at end of file -+-removeheaders: Private-Package diff --git a/fix-cglib-refs.patch b/fix-cglib-refs.patch deleted file mode 100644 index 19f8f21..0000000 --- a/fix-cglib-refs.patch +++ /dev/null @@ -1,133 +0,0 @@ -# HG changeset patch -# Parent 65e60f677b3cb9c40d5d37e91ce6be1897c46370 - -diff --git a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java ---- a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java -+++ b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java -@@ -4,7 +4,7 @@ - */ - package org.mockito.internal.creation; - --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - - public class DelegatingMockitoMethodProxy extends AbstractMockitoMethodProxy { - -diff --git a/src/org/mockito/internal/creation/MethodInterceptorFilter.java b/src/org/mockito/internal/creation/MethodInterceptorFilter.java ---- a/src/org/mockito/internal/creation/MethodInterceptorFilter.java -+++ b/src/org/mockito/internal/creation/MethodInterceptorFilter.java -@@ -8,8 +8,8 @@ - import java.io.Serializable; - import java.lang.reflect.Method; - --import org.mockito.cglib.proxy.MethodInterceptor; --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodInterceptor; -+import net.sf.cglib.proxy.MethodProxy; - import org.mockito.internal.MockitoInvocationHandler; - import org.mockito.internal.creation.cglib.CGLIBHacker; - import org.mockito.internal.invocation.*; -diff --git a/src/org/mockito/internal/creation/MockitoMethodProxy.java b/src/org/mockito/internal/creation/MockitoMethodProxy.java ---- a/src/org/mockito/internal/creation/MockitoMethodProxy.java -+++ b/src/org/mockito/internal/creation/MockitoMethodProxy.java -@@ -4,7 +4,7 @@ - */ - package org.mockito.internal.creation; - --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - - public interface MockitoMethodProxy { - -diff --git a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java ---- a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java -+++ b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java -@@ -6,7 +6,7 @@ - - import java.io.Serializable; - --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - import org.mockito.internal.util.reflection.Whitebox; - - public class SerializableMockitoMethodProxy extends AbstractMockitoMethodProxy implements Serializable { -diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java ---- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -+++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -@@ -8,7 +8,7 @@ - import java.lang.reflect.Field; - - import org.mockito.internal.creation.MockitoMethodProxy; --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodProxy; - - public class CGLIBHacker implements Serializable { - -diff --git a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java b/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java ---- a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java -+++ b/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java -@@ -4,7 +4,7 @@ - */ - package org.mockito.internal.creation.cglib; - --import org.mockito.cglib.core.DefaultNamingPolicy; -+import net.sf.cglib.core.DefaultNamingPolicy; - - public class MockitoNamingPolicy extends DefaultNamingPolicy { - -diff --git a/src/org/mockito/internal/creation/jmock/ClassImposterizer.java b/src/org/mockito/internal/creation/jmock/ClassImposterizer.java ---- a/src/org/mockito/internal/creation/jmock/ClassImposterizer.java -+++ b/src/org/mockito/internal/creation/jmock/ClassImposterizer.java -@@ -7,8 +7,8 @@ - import java.lang.reflect.*; - import java.util.List; - --import org.mockito.cglib.core.*; --import org.mockito.cglib.proxy.*; -+import net.sf.cglib.core.*; -+import net.sf.cglib.proxy.*; - import org.mockito.exceptions.base.MockitoException; - import org.mockito.internal.creation.cglib.MockitoNamingPolicy; - import org.objenesis.ObjenesisStd; -diff --git a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java b/src/org/mockito/internal/creation/jmock/SerializableNoOp.java ---- a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java -+++ b/src/org/mockito/internal/creation/jmock/SerializableNoOp.java -@@ -6,8 +6,8 @@ - - import java.io.Serializable; - --import org.mockito.cglib.proxy.Callback; --import org.mockito.cglib.proxy.NoOp; -+import net.sf.cglib.proxy.Callback; -+import net.sf.cglib.proxy.NoOp; - - public class SerializableNoOp implements NoOp, Serializable { - -diff --git a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java ---- a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java -+++ b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java -@@ -9,8 +9,8 @@ - import java.util.Arrays; - - import org.mockito.Mockito; --import org.mockito.cglib.proxy.MethodInterceptor; --import org.mockito.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.MethodInterceptor; -+import net.sf.cglib.proxy.MethodProxy; - import org.mockito.exceptions.Reporter; - import org.mockito.internal.creation.jmock.ClassImposterizer; - import org.mockito.internal.debugging.Location; -diff --git a/src/org/mockito/internal/util/MockUtil.java b/src/org/mockito/internal/util/MockUtil.java ---- a/src/org/mockito/internal/util/MockUtil.java -+++ b/src/org/mockito/internal/util/MockUtil.java -@@ -4,8 +4,8 @@ - */ - package org.mockito.internal.util; - --import org.mockito.cglib.proxy.Callback; --import org.mockito.cglib.proxy.Factory; -+import net.sf.cglib.proxy.Callback; -+import net.sf.cglib.proxy.Factory; - import org.mockito.exceptions.misusing.NotAMockException; - import org.mockito.internal.InvocationNotifierHandler; - import org.mockito.internal.MockHandler; diff --git a/fix-incompatible-types.patch b/fix-incompatible-types.patch new file mode 100644 index 0000000..10adc69 --- /dev/null +++ b/fix-incompatible-types.patch @@ -0,0 +1,12 @@ +diff --git a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java +index 1ca0003..15172bd 100644 +--- a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java ++++ b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java +@@ -11,6 +11,6 @@ class ObjenesisInstantiator implements Instantiator { + private final ObjenesisStd objenesis = new ObjenesisStd(new GlobalConfiguration().enableClassCache()); + + public T newInstance(Class cls) { +- return objenesis.newInstance(cls); ++ return (T) objenesis.newInstance(cls); + } + } diff --git a/fixup-ant-script.patch b/fixup-ant-script.patch index 51a4384..1d68dc6 100644 --- a/fixup-ant-script.patch +++ b/fixup-ant-script.patch @@ -1,23 +1,14 @@ -# HG changeset patch -# Parent 5e1ff2ee5aa22b1c22238b520b3e6bd3b4aec0da - -diff --git a/build.xml b/build.xml ---- a/build.xml -+++ b/build.xml -@@ -42,6 +42,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -204,19 +210,14 @@ +--- build.xml.orig 2014-12-31 16:43:56.000000000 +0000 ++++ build.xml 2015-06-22 09:20:12.859059775 +0100 +@@ -81,6 +81,7 @@ + + + ++ + + + +@@ -207,18 +208,14 @@ @@ -33,10 +24,64 @@ diff --git a/build.xml b/build.xml - - -- - - + +@@ -319,53 +316,10 @@ +

Click to see examples. Mockito ${version} API.

+ ]]> + +-
+- +- +- +- +- +- +- +- +- ]]> +-
+ + + +- +- +- +- +- +- ++ + + + diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh old mode 100644 new mode 100755 index 58c1b67..195fec1 --- a/make-mockito-sourcetarball.sh +++ b/make-mockito-sourcetarball.sh @@ -1,17 +1,17 @@ -#!/bin/sh -#set -x +#!/bin/bash -ex -VERSION=1.9.0 +VERSION=1.10.19 SRCDIR=mockito-${VERSION} -hg clone https://code.google.com/p/mockito/ ${SRCDIR} +git clone https://github.com/mockito/mockito.git ${SRCDIR} pushd $SRCDIR -hg archive --prefix ${SRCDIR} -t tar -r ${VERSION} ../${SRCDIR}.tar +git archive --format=tar --prefix=${SRCDIR}/ v${VERSION} > ../${SRCDIR}.tar popd rm -rf ${SRCDIR} tar -xf ${SRCDIR}.tar +rm ${SRCDIR}.tar pushd ${SRCDIR} rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat dos2unix `find -name *.java` diff --git a/maven-cglib-dependency.patch b/maven-cglib-dependency.patch deleted file mode 100644 index 313a9cf..0000000 --- a/maven-cglib-dependency.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/maven/mockito-core.pom b/maven/mockito-core.pom ---- a/maven/mockito-core.pom -+++ b/maven/mockito-core.pom -@@ -29,6 +29,11 @@ - objenesis - 1.0 - -+ -+ net.sf.cglib -+ cglib -+ 2.2 -+ - - - diff --git a/mockito-junit4.patch b/mockito-junit4.patch deleted file mode 100644 index e0dc921..0000000 --- a/mockito-junit4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mockito-1.9.0/build.xml b/mockito-1.9.0/build.xml -index e6b49e8..487b632 100644 ---- a/mockito-1.9.0/build.xml -+++ b/mockito-1.9.0/build.xml -@@ -44,7 +44,7 @@ - - - -- -+ - - - diff --git a/mockito-matcher.patch b/mockito-matcher.patch index 71572d7..72cc1cb 100644 --- a/mockito-matcher.patch +++ b/mockito-matcher.patch @@ -1,10 +1,20 @@ +From 02df4868e1614b9fd224e40c1556b78eeb01cd3d Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Wed, 4 Dec 2013 16:52:24 +0100 +Subject: [PATCH] mockito matcher + +Signed-off-by: Michael Simacek +--- + src/org/mockito/internal/matchers/LocalizedMatcher.java | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + diff --git a/src/org/mockito/internal/matchers/LocalizedMatcher.java b/src/org/mockito/internal/matchers/LocalizedMatcher.java -index 01e83b3..7d249f5 100644 +index d6dda04..9dffe06 100644 --- a/src/org/mockito/internal/matchers/LocalizedMatcher.java +++ b/src/org/mockito/internal/matchers/LocalizedMatcher.java -@@ -16,6 +16,12 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, - private final Matcher actualMatcher; - private Location location; +@@ -22,6 +22,12 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, + this.location = new LocationImpl(); + } + /* This is a hack for Fedora. Bug has been filed here: + * https://code.google.com/p/mockito/issues/detail?id=428 */ @@ -12,13 +22,18 @@ index 01e83b3..7d249f5 100644 + mismatchDescription.appendText("was ").appendValue(item); + } + - public LocalizedMatcher(Matcher actualMatcher) { - this.actualMatcher = actualMatcher; - this.location = new Location(); -@@ -65,4 +71,4 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, - public Matcher getActualMatcher() { - return actualMatcher; + public void _dont_implement_Matcher___instead_extend_BaseMatcher_() { + // yeah right } --} -\ No newline at end of file -+} +@@ -37,7 +43,7 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, + public Location getLocation() { + return location; + } +- ++ + @Override + public String toString() { + return "Localized: " + this.actualMatcher; +-- +1.8.3.1 + diff --git a/mockito.spec b/mockito.spec index 5b1fc56..574559d 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,23 +1,22 @@ Name: mockito -Version: 1.9.0 -Release: 19%{?dist} +Version: 1.10.19 +Release: 20%{?dist} Summary: A Java mocking framework License: MIT -URL: http://code.google.com/p/mockito/ -Source0: mockito-%{version}.tar.xz -Source1: make-mockito-sourcetarball.sh +URL: http://%{name}.org +Source0: %{name}-%{version}.tar.xz +Source1: make-%{name}-sourcetarball.sh Patch0: fixup-ant-script.patch -Patch1: fix-cglib-refs.patch -Patch2: maven-cglib-dependency.patch -Patch3: fix-bnd-config.patch -Patch4: %{name}-matcher.patch +Patch1: fix-bnd-config.patch +Patch2: %{name}-matcher.patch # Workaround for NPE in setting NamingPolicy in cglib -Patch5: setting-naming-policy.patch -Patch6: mockito-junit4.patch +Patch3: setting-naming-policy.patch +# because we have old objenesis +Patch4: fix-incompatible-types.patch BuildArch: noarch -BuildRequires: jpackage-utils +BuildRequires: maven-local BuildRequires: java-devel BuildRequires: ant BuildRequires: objenesis @@ -26,7 +25,6 @@ BuildRequires: junit BuildRequires: hamcrest BuildRequires: aqute-bnd -Requires: jpackage-utils Requires: objenesis Requires: cglib Requires: junit @@ -40,57 +38,66 @@ errors. %package javadoc Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch0 +%patch1 %patch2 -p1 -# Set Bundle-Version properly -sed -i 's/Bundle-Version= ${version}/Bundle-Version= %{version}/' conf/mockito-core.bnd -%patch3 +%patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p2 +# workaround rhbz#1292777 Files not found for javadoc generation +touch javadoc/stylesheet.css + +%pom_add_dep net.sf.cglib:cglib:3.1 maven/mockito-core.pom +find . -name "*.java" -exec sed -i "s|org\.%{name}\.cglib|net\.sf\.cglib|g" {} + +mkdir -p lib/compile %build -build-jar-repository lib/compile objenesis +build-jar-repository lib/compile objenesis cglib junit hamcrest/core ant jar javadoc + # Convert to OSGi bundle pushd target -java -jar $(build-classpath aqute-bnd) wrap -output mockito-core-%{version}.bar -properties ../conf/mockito-core.bnd mockito-core-%{version}.jar +%if 0%{?fedora} >= 23 +bnd wrap \ + --version %{version} \ + --output %{name}-core-%{version}.bar \ + --properties ../conf/%{name}-core.bnd \ +%else +java -jar $(build-classpath aqute-bnd) wrap \ + -output %{name}-core-%{version}.bar \ + -properties ../conf/%{name}-core.bnd \ +%endif + %{name}-core-%{version}.jar +mv %{name}-core-%{version}.bar %{name}-core-%{version}.jar + +# Explicit Require-Bundle on hamcrest +unzip mockito-core-%{version}.jar META-INF/MANIFEST.MF +sed -i -e '2iRequire-Bundle: org.hamcrest.core' META-INF/MANIFEST.MF +jar umf META-INF/MANIFEST.MF mockito-core-%{version}.jar popd +sed -i -e "s|@version@|%{version}|g" maven/%{name}-core.pom +%mvn_artifact maven/%{name}-core.pom target/%{name}-core-%{version}.jar +%mvn_alias org.%{name}:%{name}-core org.%{name}:%{name}-all + %install -mkdir -p $RPM_BUILD_ROOT%{_javadir} -sed -i -e "s|@version@|%{version}|g" maven/mockito-core.pom -cp -p target/mockito-core-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar - -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 maven/mockito-core.pom \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom - -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.mockito:mockito-all" +%mvn_install -J target/javadoc %files -f .mfiles -%{_javadir}/%{name}.jar -%doc NOTICE -%doc LICENSE +%license LICENSE NOTICE -%files javadoc -%{_javadocdir}/%{name} -%doc LICENSE -%doc NOTICE +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE %changelog +* Tue Mar 01 2016 Roman Mohr - 1.10.19-20 +- rebuilt + * Wed Dec 09 2015 Roman Mohr - 1.9.0-19 - Unretire package on EPEL7 diff --git a/sources b/sources index f6b13f3..1773385 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -967d7b4059fa8185b94d6f7273f6cfe5 mockito-1.9.0.tar.xz +b42b2fe1d47a2ca5c10a05aa211e357b mockito-1.10.19.tar.xz From bfa5081d4c0f47d3e54d4d05d554197d78717b66 Mon Sep 17 00:00:00 2001 From: Roman Mohr Date: Thu, 3 Mar 2016 09:38:24 +0100 Subject: [PATCH 5/5] Set correct release version --- mockito.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mockito.spec b/mockito.spec index 574559d..c998a01 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito Version: 1.10.19 -Release: 20%{?dist} +Release: 1%{?dist} Summary: A Java mocking framework License: MIT @@ -95,8 +95,8 @@ sed -i -e "s|@version@|%{version}|g" maven/%{name}-core.pom %license LICENSE NOTICE %changelog -* Tue Mar 01 2016 Roman Mohr - 1.10.19-20 -- rebuilt +* Tue Mar 01 2016 Roman Mohr - 1.10.19-1 +- Update to latest v1 release * Wed Dec 09 2015 Roman Mohr - 1.9.0-19 - Unretire package on EPEL7