rpms/mockito
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Explicitly import more cglib packages in OSGi metadata to prevent mockito

Browse Source 
failing under certain circumstances during Eclipse test suites
This commit is contained in:
Mat Booth 2016-02-22 12:17:02 +00:00
parent 0cd63e165d
commit e15b1b8c60
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fix-bnd-config.patch
View File

@ -23,7 +23,7 @@
org.mockito.asm.signature;resolution:=optional, \ org.mockito.asm.signature;resolution:=optional, \
- org.mockito.* - org.mockito.*
+ org.mockito.*, \ + org.mockito.*, \
+ net.sf.cglib* + net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect
Private-Package: org.mockito.* Private-Package: org.mockito.*

8
mockito.spec
View File

@ -1,6 +1,6 @@
Name: mockito Name: mockito
Version: 1.10.19 Version: 1.10.19
Release: 9%{?dist} Release: 10%{?dist}
Summary: A Java mocking framework Summary: A Java mocking framework
License: MIT License: MIT
@ -52,7 +52,7 @@ This package contains the API documentation for %{name}.
# workaround rhbz#1292777 Files not found for javadoc generation # workaround rhbz#1292777 Files not found for javadoc generation
touch javadoc/stylesheet.css 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" {} + find . -name "*.java" -exec sed -i "s|org\.%{name}\.cglib|net\.sf\.cglib|g" {} +
mkdir -p lib/compile mkdir -p lib/compile
@ -95,6 +95,10 @@ sed -i -e "s|@version@|%{version}|g" maven/%{name}-core.pom
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Mon Feb 22 2016 Mat Booth <mat.booth@redhat.com> - 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 <mat.booth@redhat.com> - 1.10.19-9 * Fri Feb 12 2016 Mat Booth <mat.booth@redhat.com> - 1.10.19-9
- Require hamcrest explicitly in OSGi metadata - Require hamcrest explicitly in OSGi metadata