From e15b1b8c60a37ec42b1a7bace0f9231dd946b363 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 22 Feb 2016 12:17:02 +0000 Subject: [PATCH] Explicitly import more cglib packages in OSGi metadata to prevent mockito failing under certain circumstances during Eclipse test suites --- fix-bnd-config.patch | 2 +- mockito.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch index a1ef6d4..a9bf97e 100644 --- a/fix-bnd-config.patch +++ b/fix-bnd-config.patch @@ -23,7 +23,7 @@ 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.* diff --git a/mockito.spec b/mockito.spec index 8e65f04..96af48d 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito Version: 1.10.19 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A Java mocking framework License: MIT @@ -52,7 +52,7 @@ This package contains the API documentation for %{name}. # workaround rhbz#1292777 Files not found for javadoc generation touch javadoc/stylesheet.css -%pom_add_dep net.sf.cglib:cglib maven/%{name}-core.pom +%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 @@ -95,6 +95,10 @@ sed -i -e "s|@version@|%{version}|g" maven/%{name}-core.pom %license LICENSE NOTICE %changelog +* Mon Feb 22 2016 Mat Booth - 1.10.19-10 +- Explicitly import more cglib packages in OSGi metadata to prevent mockito + failing under certain circumstances during Eclipse test suites + * Fri Feb 12 2016 Mat Booth - 1.10.19-9 - Require hamcrest explicitly in OSGi metadata