Fix cglib dependency, pom version and depmap.
This commit is contained in:
parent
21cba1bf6c
commit
85781e8d78
@ -6,7 +6,7 @@ diff --git a/maven/mockito-core.pom b/maven/mockito-core.pom
|
|||||||
<version>1.0</version>
|
<version>1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
+ <dependency>
|
+ <dependency>
|
||||||
+ <groupId>cglib</groupId>
|
+ <groupId>net.sf.cglib</groupId>
|
||||||
+ <artifactId>cglib</artifactId>
|
+ <artifactId>cglib</artifactId>
|
||||||
+ <version>2.2</version>
|
+ <version>2.2</version>
|
||||||
+ </dependency>
|
+ </dependency>
|
||||||
|
17
mockito.spec
17
mockito.spec
@ -1,6 +1,6 @@
|
|||||||
Name: mockito
|
Name: mockito
|
||||||
Version: 1.9.0
|
Version: 1.9.0
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: A Java mocking framework
|
Summary: A Java mocking framework
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -52,6 +52,7 @@ ant jar javadoc
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_javadir}
|
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
|
cp -p target/mockito-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||||
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
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}
|
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||||
cp -rp target/javadoc $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
|
%files
|
||||||
%{_javadir}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
@ -76,6 +83,12 @@ cp -rp target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|||||||
%doc NOTICE
|
%doc NOTICE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 24 2012 Roman Kennke <rkennke@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@redhat.com> 1.9.0-3
|
* Wed Feb 22 2012 Roman Kennke <rkennke@redhat.com> 1.9.0-3
|
||||||
- Added cglib dependency to pom
|
- Added cglib dependency to pom
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user