Attachment 835195 Details for Bug 1040350 – Update to upstream version 1.9.5

[patch] Update to upstream version 1.9.5

0002-Update-to-upstream-version-1.9.5.patch (text/plain), 19.21 KB, created by Michael Simacek on 2013-12-11 09:27:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2013-12-11 09:27:56 UTC

Size: 19.21 KB

patch

obsolete

>From 94f27f75811ccf19255aef7219802f6c30f6b8c6 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Wed, 11 Dec 2013 10:07:04 +0100
>Subject: [PATCH 2/2] Update to upstream version 1.9.5
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> fix-bnd-config.patch          |  30 +++++--
> fix-cglib-refs.patch          | 179 +++++++++++++++++++++++++++++++++---------
> make-mockito-sourcetarball.sh |   2 +-
> mockito-matcher.patch         |  41 +++++++---
> mockito.spec                  |  10 ++-
> 5 files changed, 202 insertions(+), 60 deletions(-)
>
>diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch
>index b9eceae..fd2f261 100644
>--- a/fix-bnd-config.patch
>+++ b/fix-bnd-config.patch
>@@ -1,15 +1,28 @@
>---- 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 @@
>+From 2a08198d8b85d7e71444bf5c79ce118a3ffd7553 Mon Sep 17 00:00:00 2001
>+From: Michael Simacek <msimacek@redhat.com>
>+Date: Wed, 11 Dec 2013 10:17:19 +0100
>+Subject: [PATCH] fix bnd config
>+
>+Signed-off-by: Michael Simacek <msimacek@redhat.com>
>+---
>+ conf/mockito-core.bnd | 14 +++++---------
>+ 1 file changed, 5 insertions(+), 9 deletions(-)
>+
>+diff --git a/conf/mockito-core.bnd b/conf/mockito-core.bnd
>+index f4b1540..d71e150 100644
>+--- a/conf/mockito-core.bnd
>++++ b/conf/mockito-core.bnd
>+@@ -1,24 +1,20 @@
> --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-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-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.*, \
>@@ -23,10 +36,13 @@
>                  org.objenesis;version="[1.0,2.0)", \
> -                org.mockito.*
> +                org.mockito.*, \
>-+                net.sf.cglib*
>++                net.sf.cglib.*
>  
>  Private-Package: org.mockito.*
>  
> --removeheaders: Private-Package
> \ No newline at end of file
> +-removeheaders: Private-Package
>+-- 
>+1.8.3.1
>+
>diff --git a/fix-cglib-refs.patch b/fix-cglib-refs.patch
>index 19f8f21..e1b9100 100644
>--- a/fix-cglib-refs.patch
>+++ b/fix-cglib-refs.patch
>@@ -1,7 +1,44 @@
>-# HG changeset patch
>-# Parent 65e60f677b3cb9c40d5d37e91ce6be1897c46370
>+From 70db90aa7cc212a37636f0de4be8890c0ac10047 Mon Sep 17 00:00:00 2001
>+From: Michael Simacek <msimacek@redhat.com>
>+Date: Wed, 4 Dec 2013 16:31:33 +0100
>+Subject: [PATCH] fix cglib refs
> 
>+Signed-off-by: Michael Simacek <msimacek@redhat.com>
>+---
>+ src/org/mockito/internal/creation/CglibMockMaker.java             | 4 ++--
>+ .../mockito/internal/creation/DelegatingMockitoMethodProxy.java   | 2 +-
>+ src/org/mockito/internal/creation/MethodInterceptorFilter.java    | 4 ++--
>+ src/org/mockito/internal/creation/MockitoMethodProxy.java         | 2 +-
>+ .../mockito/internal/creation/SerializableMockitoMethodProxy.java | 2 +-
>+ src/org/mockito/internal/creation/cglib/CGLIBHacker.java          | 2 +-
>+ src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java  | 2 +-
>+ src/org/mockito/internal/creation/jmock/ClassImposterizer.java    | 8 ++++----
>+ src/org/mockito/internal/creation/jmock/SerializableNoOp.java     | 4 ++--
>+ .../mockito/internal/creation/MethodInterceptorFilterTest.java    | 2 +-
>+ .../internal/creation/SerializableMockitoMethodProxyTest.java     | 2 +-
>+ test/org/mockito/internal/creation/cglib/CGLIBHackerTest.java     | 2 +-
>+ .../mockito/internal/creation/jmock/ClassImposterizerTest.java    | 6 +++---
>+ test/org/mockito/internal/util/MockUtilTest.java                  | 4 ++--
>+ .../configuration/ClassCacheVersusClassReloadingTest.java         | 2 +-
>+ 15 files changed, 24 insertions(+), 24 deletions(-)
>+
>+diff --git a/src/org/mockito/internal/creation/CglibMockMaker.java b/src/org/mockito/internal/creation/CglibMockMaker.java
>+index 7692b84..7509dd5 100644
>+--- a/src/org/mockito/internal/creation/CglibMockMaker.java
>++++ b/src/org/mockito/internal/creation/CglibMockMaker.java
>+@@ -4,8 +4,8 @@
>+  */
>+ package org.mockito.internal.creation;
>+ 
>+-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.base.MockitoException;
>+ import org.mockito.internal.InternalMockHandler;
>+ import org.mockito.invocation.MockHandler;
> diff --git a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java
>+index b744f2c..bc00573 100644
> --- a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java
> +++ b/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java
> @@ -4,7 +4,7 @@
>@@ -14,9 +51,10 @@ diff --git a/src/org/mockito/internal/creation/DelegatingMockitoMethodProxy.java
>  public class DelegatingMockitoMethodProxy extends AbstractMockitoMethodProxy {
>  
> diff --git a/src/org/mockito/internal/creation/MethodInterceptorFilter.java b/src/org/mockito/internal/creation/MethodInterceptorFilter.java
>+index 00a91d8..666d2c2 100644
> --- a/src/org/mockito/internal/creation/MethodInterceptorFilter.java
> +++ b/src/org/mockito/internal/creation/MethodInterceptorFilter.java
>-@@ -8,8 +8,8 @@
>+@@ -8,8 +8,8 @@ package org.mockito.internal.creation;
>  import java.io.Serializable;
>  import java.lang.reflect.Method;
>  
>@@ -24,10 +62,11 @@ diff --git a/src/org/mockito/internal/creation/MethodInterceptorFilter.java b/sr
> -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.*;
>+ import org.mockito.internal.InternalMockHandler;
>+ import org.mockito.invocation.Invocation;
>+ import org.mockito.invocation.MockHandler;
> diff --git a/src/org/mockito/internal/creation/MockitoMethodProxy.java b/src/org/mockito/internal/creation/MockitoMethodProxy.java
>+index 303f378..1aa8cc8 100644
> --- a/src/org/mockito/internal/creation/MockitoMethodProxy.java
> +++ b/src/org/mockito/internal/creation/MockitoMethodProxy.java
> @@ -4,7 +4,7 @@
>@@ -40,9 +79,10 @@ diff --git a/src/org/mockito/internal/creation/MockitoMethodProxy.java b/src/org
>  public interface MockitoMethodProxy {
>  
> diff --git a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java
>+index 35f28c6..681c3df 100644
> --- a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java
> +++ b/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.java
>-@@ -6,7 +6,7 @@
>+@@ -6,7 +6,7 @@ package org.mockito.internal.creation;
>  
>  import java.io.Serializable;
>  
>@@ -52,9 +92,10 @@ diff --git a/src/org/mockito/internal/creation/SerializableMockitoMethodProxy.ja
>  
>  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
>+index 34c5849..172f744 100644
> --- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java
> +++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java
>-@@ -8,7 +8,7 @@
>+@@ -8,7 +8,7 @@ import java.io.Serializable;
>  import java.lang.reflect.Field;
>  
>  import org.mockito.internal.creation.MockitoMethodProxy;
>@@ -64,6 +105,7 @@ diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/
>  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
>+index 41ed269..7e9c45b 100644
> --- a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java
> +++ b/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java
> @@ -4,7 +4,7 @@
>@@ -76,23 +118,29 @@ diff --git a/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java b/
>  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
>+index 078c5b3..50ec941 100644
> --- 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;
>+@@ -4,10 +4,10 @@
>+  */
>+ package org.mockito.internal.creation.jmock;
>  
>--import org.mockito.cglib.core.*;
>+-import org.mockito.cglib.core.CodeGenerationException;
>+-import org.mockito.cglib.core.NamingPolicy;
>+-import org.mockito.cglib.core.Predicate;
> -import org.mockito.cglib.proxy.*;
>-+import net.sf.cglib.core.*;
>++import net.sf.cglib.core.CodeGenerationException;
>++import net.sf.cglib.core.NamingPolicy;
>++import net.sf.cglib.core.Predicate;
> +import net.sf.cglib.proxy.*;
>  import org.mockito.exceptions.base.MockitoException;
>+ import org.mockito.internal.configuration.GlobalConfiguration;
>  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
>+index feec9d8..851b952 100644
> --- a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java
> +++ b/src/org/mockito/internal/creation/jmock/SerializableNoOp.java
>-@@ -6,8 +6,8 @@
>+@@ -6,8 +6,8 @@ package org.mockito.internal.creation.jmock;
>  
>  import java.io.Serializable;
>  
>@@ -103,31 +151,90 @@ diff --git a/src/org/mockito/internal/creation/jmock/SerializableNoOp.java b/src
>  
>  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;
>- 
>+diff --git a/test/org/mockito/internal/creation/MethodInterceptorFilterTest.java b/test/org/mockito/internal/creation/MethodInterceptorFilterTest.java
>+index 0b09c3d..fd7944f 100644
>+--- a/test/org/mockito/internal/creation/MethodInterceptorFilterTest.java
>++++ b/test/org/mockito/internal/creation/MethodInterceptorFilterTest.java
>+@@ -15,7 +15,7 @@ import java.lang.reflect.Method;
>+ import org.junit.Before;
>+ import org.junit.Test;
>  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.internal.InternalMockHandler;
>+ import org.mockito.internal.invocation.InvocationImpl;
>+ import org.mockito.internal.creation.cglib.CGLIBHacker;
>+diff --git a/test/org/mockito/internal/creation/SerializableMockitoMethodProxyTest.java b/test/org/mockito/internal/creation/SerializableMockitoMethodProxyTest.java
>+index 89d8f6f..1c1b313 100644
>+--- a/test/org/mockito/internal/creation/SerializableMockitoMethodProxyTest.java
>++++ b/test/org/mockito/internal/creation/SerializableMockitoMethodProxyTest.java
>+@@ -5,7 +5,7 @@
>+ package org.mockito.internal.creation;
>  
>--import org.mockito.cglib.proxy.Callback;
>+ import org.junit.Test;
>+-import org.mockito.cglib.proxy.MethodProxy;
>++import net.sf.cglib.proxy.MethodProxy;
>+ import org.mockitoutil.TestBase;
>+ import org.powermock.reflect.Whitebox;
>+ 
>+diff --git a/test/org/mockito/internal/creation/cglib/CGLIBHackerTest.java b/test/org/mockito/internal/creation/cglib/CGLIBHackerTest.java
>+index 83f5105..34544f7 100644
>+--- a/test/org/mockito/internal/creation/cglib/CGLIBHackerTest.java
>++++ b/test/org/mockito/internal/creation/cglib/CGLIBHackerTest.java
>+@@ -7,7 +7,7 @@ package org.mockito.internal.creation.cglib;
>+ import static org.mockito.Mockito.spy;
>+ 
>+ import org.junit.Test;
>+-import org.mockito.cglib.core.NamingPolicy;
>++import net.sf.cglib.core.NamingPolicy;
>+ import org.mockito.internal.creation.MockitoMethodProxy;
>+ import org.mockitoutil.TestBase;
>+ import org.powermock.reflect.Whitebox;
>+diff --git a/test/org/mockito/internal/creation/jmock/ClassImposterizerTest.java b/test/org/mockito/internal/creation/jmock/ClassImposterizerTest.java
>+index b113b13..d5bc4f7 100644
>+--- a/test/org/mockito/internal/creation/jmock/ClassImposterizerTest.java
>++++ b/test/org/mockito/internal/creation/jmock/ClassImposterizerTest.java
>+@@ -9,9 +9,9 @@ import static org.hamcrest.CoreMatchers.*;
>+ import java.lang.reflect.Method;
>+ 
>+ import org.junit.Test;
> -import org.mockito.cglib.proxy.Factory;
>-+import net.sf.cglib.proxy.Callback;
>+-import org.mockito.cglib.proxy.MethodInterceptor;
>+-import org.mockito.cglib.proxy.MethodProxy;
> +import net.sf.cglib.proxy.Factory;
>++import net.sf.cglib.proxy.MethodInterceptor;
>++import net.sf.cglib.proxy.MethodProxy;
>+ import org.mockitoutil.TestBase;
>+ 
>+ @SuppressWarnings("unchecked")
>+diff --git a/test/org/mockito/internal/util/MockUtilTest.java b/test/org/mockito/internal/util/MockUtilTest.java
>+index 67f882c..869a6d4 100644
>+--- a/test/org/mockito/internal/util/MockUtilTest.java
>++++ b/test/org/mockito/internal/util/MockUtilTest.java
>+@@ -8,8 +8,8 @@ package org.mockito.internal.util;
>+ import org.fest.assertions.Assertions;
>+ import org.junit.Test;
>+ import org.mockito.Mockito;
>+-import org.mockito.cglib.proxy.Enhancer;
>+-import org.mockito.cglib.proxy.NoOp;
>++import net.sf.cglib.proxy.Enhancer;
>++import net.sf.cglib.proxy.NoOp;
>+ import org.mockito.exceptions.base.MockitoException;
>  import org.mockito.exceptions.misusing.NotAMockException;
>- import org.mockito.internal.InvocationNotifierHandler;
>- import org.mockito.internal.MockHandler;
>+ import org.mockito.internal.creation.MockSettingsImpl;
>+diff --git a/test/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java b/test/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java
>+index 88a6c3c..fe1f537 100644
>+--- a/test/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java
>++++ b/test/org/mockitousage/configuration/ClassCacheVersusClassReloadingTest.java
>+@@ -102,7 +102,7 @@ public class ClassCacheVersusClassReloadingTest {
>+     private static SimplePerRealmReloadingClassLoader.ReloadClassPredicate reloadMockito() {
>+         return new SimplePerRealmReloadingClassLoader.ReloadClassPredicate() {
>+             public boolean needReload(String qualifiedName) {
>+-                return (!qualifiedName.contains("org.mockito.cglib") && qualifiedName.contains("org.mockito"));
>++                return (!qualifiedName.contains("net.sf.cglib") && qualifiedName.contains("org.mockito"));
>+             }
>+         };
>+     }
>+-- 
>+1.8.3.1
>+
>diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh
>index 58c1b67..d0b6807 100644
>--- a/make-mockito-sourcetarball.sh
>+++ b/make-mockito-sourcetarball.sh
>@@ -1,7 +1,7 @@
> #!/bin/sh
> #set -x
> 
>-VERSION=1.9.0
>+VERSION=1.9.5
> SRCDIR=mockito-${VERSION}
> 
> hg clone https://code.google.com/p/mockito/ ${SRCDIR}
>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 <msimacek@redhat.com>
>+Date: Wed, 4 Dec 2013 16:52:24 +0100
>+Subject: [PATCH] mockito matcher
>+
>+Signed-off-by: Michael Simacek <msimacek@redhat.com>
>+---
>+ 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
>+     }
>+@@ -37,7 +43,7 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation,
>+     public Location getLocation() {
>+         return location;
>      }
>--}
>-\ No newline at end of file
>-+}
>+-    
>++
>+     @Override
>+     public String toString() {
>+         return "Localized: " + this.actualMatcher;
>+-- 
>+1.8.3.1
>+
>diff --git a/mockito.spec b/mockito.spec
>index d651a87..6c14701 100644
>--- a/mockito.spec
>+++ b/mockito.spec
>@@ -1,6 +1,6 @@
> Name:           mockito
>-Version:        1.9.0
>-Release:        14%{?dist}
>+Version:        1.9.5
>+Release:        1%{?dist}
> Summary:        A Java mocking framework
> 
> License:        MIT
>@@ -51,9 +51,9 @@ This package contains the API documentation for %{name}.
> %patch0 -p1
> %patch1 -p1
> %patch2 -p1
>+%patch3 -p1
> # Set Bundle-Version properly
> sed -i 's/Bundle-Version= ${version}/Bundle-Version= %{version}/' conf/mockito-core.bnd
>-%patch3
> %patch4 -p1
> %patch5 -p1
> 
>@@ -62,6 +62,7 @@ build-jar-repository lib/compile objenesis
> ant jar javadoc
> # Convert to OSGi bundle
> pushd target
>+mv mockito-core-%{version}*.jar mockito-core-%{version}.jar
> java -jar $(build-classpath aqute-bnd) wrap -output mockito-core-%{version}.bar -properties ../conf/mockito-core.bnd mockito-core-%{version}.jar
> popd
> 
>@@ -92,6 +93,9 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %doc NOTICE
> 
> %changelog
>+* Wed Dec 11 2013 Michael Simacek <msimacek@redhat.com> - 1.9.5-1
>+- Update to upstream version 1.9.5
>+
> * Wed Dec 11 2013 Michael Simacek <msimacek@redhat.com> - 1.9.0-14
> - Workaround for NPE in setting NamingPolicy
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1040350: 835194 | 835195