[java-sig-commits] [mockito] Fix cglib dependency, pom version and depmap.
Roman Kennke
rkennke at fedoraproject.org
Tue Apr 24 20:39:55 UTC 2012
commit 85781e8d78c3849196e3269cab62ce2911c62134
Author: Roman Kennke <rkennke at redhat.com>
Date: Tue Apr 24 22:39:43 2012 +0200
Fix cglib dependency, pom version and depmap.
maven-cglib-dependency.patch | 2 +-
mockito.spec | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/maven-cglib-dependency.patch b/maven-cglib-dependency.patch
index cf00851..313a9cf 100644
--- a/maven-cglib-dependency.patch
+++ b/maven-cglib-dependency.patch
@@ -6,7 +6,7 @@ diff --git a/maven/mockito-core.pom b/maven/mockito-core.pom
<version>1.0</version>
</dependency>
+ <dependency>
-+ <groupId>cglib</groupId>
++ <groupId>net.sf.cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
+ </dependency>
diff --git a/mockito.spec b/mockito.spec
index 193af90..b15ef58 100644
--- a/mockito.spec
+++ b/mockito.spec
@@ -1,6 +1,6 @@
Name: mockito
Version: 1.9.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Java mocking framework
License: MIT
@@ -52,6 +52,7 @@ ant jar javadoc
%install
mkdir -p $RPM_BUILD_ROOT%{_javadir}
+sed -i -e "s|@version@|%{version}|g" maven/mockito-core.pom
cp -p target/mockito-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -61,7 +62,13 @@ install -pm 644 maven/mockito-core.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
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.mockito:mockito-all"
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
%files
%{_javadir}/%{name}.jar
@@ -76,6 +83,12 @@ cp -rp target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc NOTICE
%changelog
+* Tue Apr 24 2012 Roman Kennke <rkennke at redhat.com> 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 <rkennke at redhat.com> 1.9.0-3
- Added cglib dependency to pom
More information about the java-sig-commits
mailing list