From 68838d8733591b0cb6a5786560e8941c11721d58 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Nov 2014 10:15:11 +0100 Subject: [PATCH 01/76] Update to upstream version 3.3 --- .gitignore | 1 + easymock-remove-android-support.patch | 30 ++++++++++++++++----------- easymock.spec | 9 ++++---- sources | 2 +- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 4c06021..e85fc0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ easymock-1.2-src.tar.gz /easymock-1.2_Java1.5.pom /easymock-3.2.tar.gz +/easymock-3.3.tar.gz diff --git a/easymock-remove-android-support.patch b/easymock-remove-android-support.patch index 53e101a..6173127 100644 --- a/easymock-remove-android-support.patch +++ b/easymock-remove-android-support.patch @@ -1,25 +1,25 @@ -From 210c8bae09fb9309519c8266b71635ef308872b3 Mon Sep 17 00:00:00 2001 +From badde85d06cd5ccec026b93cc753dc3e93fb4132 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 9 Aug 2013 12:44:48 +0200 Subject: [PATCH] Remove android support --- .../internal/AndroidClassProxyFactory.java | 101 --------------------- - .../java/org/easymock/internal/AndroidSupport.java | 37 -------- + .../java/org/easymock/internal/AndroidSupport.java | 43 --------- .../java/org/easymock/internal/MocksControl.java | 6 -- .../easymock/tests2/ClassExtensionHelperTest.java | 12 +-- - 4 files changed, 3 insertions(+), 153 deletions(-) + 4 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java delete mode 100644 easymock/src/main/java/org/easymock/internal/AndroidSupport.java diff --git a/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java b/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java deleted file mode 100644 -index da04042..0000000 +index 3e7f11c..0000000 --- a/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java +++ /dev/null @@ -1,101 +0,0 @@ -/** -- * Copyright 2001-2013 the original author or authors. +- * Copyright 2001-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. @@ -122,12 +122,12 @@ index da04042..0000000 \ No newline at end of file diff --git a/easymock/src/main/java/org/easymock/internal/AndroidSupport.java b/easymock/src/main/java/org/easymock/internal/AndroidSupport.java deleted file mode 100644 -index 43c683e..0000000 +index dd073cf..0000000 --- a/easymock/src/main/java/org/easymock/internal/AndroidSupport.java +++ /dev/null -@@ -1,37 +0,0 @@ +@@ -1,43 +0,0 @@ -/** -- * Copyright 2001-2013 the original author or authors. +- * Copyright 2001-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. @@ -152,6 +152,12 @@ index 43c683e..0000000 - static { - try { - Class.forName("dalvik.system.PathClassLoader"); +- +- // Also verify that dexmaker is present, if not we might +- // be running under something like robolectric, which +- // means we should not use dexmaker +- Class.forName("com.google.dexmaker.Code"); +- - isAndroid = true; - } catch (final ClassNotFoundException e) { - isAndroid = false; @@ -164,10 +170,10 @@ index 43c683e..0000000 - // ///CLOVER:ON -} diff --git a/easymock/src/main/java/org/easymock/internal/MocksControl.java b/easymock/src/main/java/org/easymock/internal/MocksControl.java -index e709dc4..cd9d5a9 100644 +index 131d22c..0782825 100644 --- a/easymock/src/main/java/org/easymock/internal/MocksControl.java +++ b/easymock/src/main/java/org/easymock/internal/MocksControl.java -@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, +@@ -152,12 +152,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, return cached; } @@ -181,7 +187,7 @@ index e709dc4..cd9d5a9 100644 return classProxyFactory = new ClassProxyFactory(); } catch (final NoClassDefFoundError e) { diff --git a/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java b/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java -index b40466c..b0a7c69 100644 +index 04a413f..3f45555 100644 --- a/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java +++ b/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java @@ -15,7 +15,6 @@ @@ -218,5 +224,5 @@ index b40466c..b0a7c69 100644 getControl(o); fail(); -- -1.8.1.4 +1.9.3 diff --git a/easymock.spec b/easymock.spec index 65d79ef..af6d522 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock -Version: 3.2 -Release: 3%{?dist} +Version: 3.3 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -57,9 +57,7 @@ find . -name "*.zip" -delete %pom_add_dep net.sf.cglib:cglib easymock # remove some warning caused by unavailable plugin -%pom_remove_plugin com.atlassian.maven.plugins:maven-clover2-plugin %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin -%pom_xpath_remove pom:profiles easymock-classextension %pom_disable_module easymock-integration @@ -84,6 +82,9 @@ find . -name "*.zip" -delete %changelog +* Tue Nov 25 2014 Mikolaj Izdebski - 3.3-1 +- Update to upstream version 3.3 + * Sat Jun 07 2014 Fedora Release Engineering - 3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index db0d7d3..10691b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2907bf4fbc5ed3cf0ef751e31c67a38e easymock-3.2.tar.gz +3ce129f1477b920b34df245996d258d1 easymock-3.3.tar.gz From fd2526742751cfccde1113d80d7b8ac256bd0a9c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Sat, 7 Mar 2015 11:48:52 +0100 Subject: [PATCH 02/76] Remove retired maven-timestamp-plugin --- easymock.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index af6d522..3456322 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -12,7 +12,6 @@ Patch5: %{name}-remove-android-support.patch BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(com.keyboardsamurais.maven:maven-timestamp-plugin) BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.sf.cglib:cglib) @@ -59,6 +58,9 @@ find . -name "*.zip" -delete # remove some warning caused by unavailable plugin %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin +# retired +%pom_remove_plugin :maven-timestamp-plugin + %pom_disable_module easymock-integration # For compatibility reasons @@ -82,6 +84,9 @@ find . -name "*.zip" -delete %changelog +* Sat Mar 07 2015 Michael Simacek - 3.3-2 +- Remove retired maven-timestamp-plugin + * Tue Nov 25 2014 Mikolaj Izdebski - 3.3-1 - Update to upstream version 3.3 From 35a7a9355bc3b46af331c503fec9f3ece8c900e3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 5 May 2015 09:31:01 +0300 Subject: [PATCH 03/76] Update to upstream 3.3.1 release. --- .gitignore | 1 + easymock-remove-android-support.patch | 163 +------------------------- easymock.spec | 15 ++- sources | 2 +- 4 files changed, 13 insertions(+), 168 deletions(-) diff --git a/.gitignore b/.gitignore index e85fc0c..acad3f5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ easymock-1.2-src.tar.gz /easymock-1.2_Java1.5.pom /easymock-3.2.tar.gz /easymock-3.3.tar.gz +/easymock-3.3.1.tar.gz diff --git a/easymock-remove-android-support.patch b/easymock-remove-android-support.patch index 6173127..6048190 100644 --- a/easymock-remove-android-support.patch +++ b/easymock-remove-android-support.patch @@ -4,171 +4,10 @@ Date: Fri, 9 Aug 2013 12:44:48 +0200 Subject: [PATCH] Remove android support --- - .../internal/AndroidClassProxyFactory.java | 101 --------------------- - .../java/org/easymock/internal/AndroidSupport.java | 43 --------- .../java/org/easymock/internal/MocksControl.java | 6 -- .../easymock/tests2/ClassExtensionHelperTest.java | 12 +-- - 4 files changed, 3 insertions(+), 159 deletions(-) - delete mode 100644 easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java - delete mode 100644 easymock/src/main/java/org/easymock/internal/AndroidSupport.java + 2 files changed, 3 insertions(+), 159 deletions(-) -diff --git a/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java b/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java -deleted file mode 100644 -index 3e7f11c..0000000 ---- a/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java -+++ /dev/null -@@ -1,101 +0,0 @@ --/** -- * Copyright 2001-2014 the original author or authors. -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --package org.easymock.internal; -- --import java.io.IOException; --import java.lang.reflect.Constructor; --import java.lang.reflect.InvocationHandler; --import java.lang.reflect.Method; --import java.lang.reflect.Modifier; --import java.util.Arrays; --import java.util.HashSet; --import java.util.Set; -- --import org.easymock.ConstructorArgs; -- --import com.google.dexmaker.stock.ProxyBuilder; -- --// ///CLOVER:OFF (sadly not possible to test android with clover) --/** -- * Mocks concrete classes for Android's runtime by generating dex files. -- */ --public final class AndroidClassProxyFactory implements IProxyFactory { -- public T createProxy(Class toMock, InvocationHandler handler, -- Method[] mockedMethods, ConstructorArgs constructorArgs) { -- final MockHandler interceptor = new MockHandler(handler, mockedMethods); -- try { -- ProxyBuilder builder = ProxyBuilder.forClass(toMock) -- .handler(interceptor); -- if (constructorArgs != null) { -- builder.constructorArgTypes(constructorArgs.getConstructor().getParameterTypes()) -- .constructorArgValues(constructorArgs.getInitArgs()); -- } else { -- try { -- DefaultClassInstantiator instantiator = new DefaultClassInstantiator(); -- Constructor constructor = instantiator.getConstructorToUse(toMock); -- Object[] params = instantiator.getArgsForTypes(constructor.getParameterTypes()); -- builder.constructorArgTypes(constructor.getParameterTypes()) -- .constructorArgValues(params); -- } catch (InstantiationException e) { -- throw new RuntimeException("Fail to instantiate mock for " + toMock); -- } -- } -- return builder.build(); -- } catch (IOException e) { -- throw new RuntimeException("Failed to mock " + toMock, e); -- } -- } -- -- public InvocationHandler getInvocationHandler(Object mock) { -- MockHandler mockHandler = (MockHandler) ProxyBuilder.getInvocationHandler(mock); -- return mockHandler.delegate; -- } -- -- private static class MockHandler implements InvocationHandler { -- private final InvocationHandler delegate; -- private final Set mockedMethods; -- -- public MockHandler(InvocationHandler delegate, Method... mockedMethods) { -- this.delegate = delegate; -- this.mockedMethods = (mockedMethods != null) -- ? new HashSet(Arrays.asList(mockedMethods)) -- : null; -- } -- -- public Object invoke(Object obj, Method method, Object[] args) throws Throwable { -- if (method.isBridge()) { -- method = BridgeMethodResolver.findBridgedMethod(method); -- } -- -- // Never intercept EasyMock's own calls to fillInStackTrace -- boolean internalFillInStackTraceCall = obj instanceof Throwable -- && method.getName().equals("fillInStackTrace") -- && ClassProxyFactory.isCallerMockInvocationHandlerInvoke(new Throwable()); -- -- if (internalFillInStackTraceCall -- || isMocked(method) && !Modifier.isAbstract(method.getModifiers())) { -- return ProxyBuilder.callSuper(obj, method, args); -- } -- -- return delegate.invoke(obj, method, args); -- } -- -- private boolean isMocked(Method method) { -- return mockedMethods != null && !mockedMethods.contains(method); -- } -- } --} --// ///CLOVER:ON -\ No newline at end of file -diff --git a/easymock/src/main/java/org/easymock/internal/AndroidSupport.java b/easymock/src/main/java/org/easymock/internal/AndroidSupport.java -deleted file mode 100644 -index dd073cf..0000000 ---- a/easymock/src/main/java/org/easymock/internal/AndroidSupport.java -+++ /dev/null -@@ -1,43 +0,0 @@ --/** -- * Copyright 2001-2014 the original author or authors. -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --package org.easymock.internal; -- --/** -- * Android-specific support. -- */ --public final class AndroidSupport { -- // ///CLOVER:OFF -- private static boolean isAndroid; -- static { -- try { -- Class.forName("dalvik.system.PathClassLoader"); -- -- // Also verify that dexmaker is present, if not we might -- // be running under something like robolectric, which -- // means we should not use dexmaker -- Class.forName("com.google.dexmaker.Code"); -- -- isAndroid = true; -- } catch (final ClassNotFoundException e) { -- isAndroid = false; -- } -- } -- -- public static boolean isAndroid() { -- return isAndroid; -- } -- // ///CLOVER:ON --} diff --git a/easymock/src/main/java/org/easymock/internal/MocksControl.java b/easymock/src/main/java/org/easymock/internal/MocksControl.java index 131d22c..0782825 100644 --- a/easymock/src/main/java/org/easymock/internal/MocksControl.java diff --git a/easymock.spec b/easymock.spec index 3456322..1274b6b 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock -Version: 3.3 -Release: 2%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -47,12 +47,13 @@ Javadoc for %{name}. find . -name "*.zip" -delete # remove android support -%patch5 -p1 +rm -fr easymock/src/main/java/org/easymock/internal/Android*.java +%patch5 -p1 -b .sav %pom_xpath_remove "pom:profile[pom:id[text()='android']]" %pom_remove_dep :dexmaker easymock # fix cglib aId and gId -%pom_remove_dep :cglib-nodep easymock +%pom_remove_dep :cglib easymock %pom_add_dep net.sf.cglib:cglib easymock # remove some warning caused by unavailable plugin @@ -61,7 +62,8 @@ find . -name "*.zip" -delete # retired %pom_remove_plugin :maven-timestamp-plugin -%pom_disable_module easymock-integration +%pom_disable_module easymock-test-integration +%pom_disable_module easymock-test-osgi # For compatibility reasons %mvn_file ":easymock{*}" easymock@1 easymock3@1 @@ -84,6 +86,9 @@ find . -name "*.zip" -delete %changelog +* Tue May 5 2015 Alexander Kurtakov 3.3.1-1 +- Update to upstream 3.3.1 release. + * Sat Mar 07 2015 Michael Simacek - 3.3-2 - Remove retired maven-timestamp-plugin diff --git a/sources b/sources index 10691b4..bd52cfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ce129f1477b920b34df245996d258d1 easymock-3.3.tar.gz +a50189b3ef81f810f13d8f00697ebcd8 easymock-3.3.1.tar.gz From 6bb65e05a98d3d11e4d3f13862de152e09e4a5dd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 05:01:08 +0000 Subject: [PATCH 04/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 1274b6b..415f10b 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -86,6 +86,9 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue May 5 2015 Alexander Kurtakov 3.3.1-1 - Update to upstream 3.3.1 release. From 2adcca3609a3151ed93ab5892fe2253e19ee4e3d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jul 2015 08:55:14 +0200 Subject: [PATCH 05/76] Obsolete easymock2 - Resolves: rhbz#1172958 --- easymock.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 415f10b..ab13372 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -24,6 +24,7 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) Obsoletes: %{name}3 < %{version}-%{release} Provides: %{name}3 = %{version}-%{release} +Obsoletes: %{name}2 < 2.5.2-10 %description @@ -86,6 +87,10 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %changelog +* Mon Jul 13 2015 Mikolaj Izdebski - 3.3.1-3 +- Obsolete easymock2 +- Resolves: rhbz#1172958 + * Wed Jun 17 2015 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From d1de73df9001908aa911c81022d37714840455cd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 19:28:03 +0000 Subject: [PATCH 06/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index ab13372..042edd1 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -87,6 +87,9 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jul 13 2015 Mikolaj Izdebski - 3.3.1-3 - Obsolete easymock2 - Resolves: rhbz#1172958 From 3d407bc514977ad91ecec82e9620a1f0eb6e3f53 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 May 2016 10:41:54 +0200 Subject: [PATCH 07/76] Port to maven-jar-plugin 3.0.0 --- easymock-port-to-maven-jar-plugin-3.patch | 14 ++++++++++++++ easymock.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 easymock-port-to-maven-jar-plugin-3.patch diff --git a/easymock-port-to-maven-jar-plugin-3.patch b/easymock-port-to-maven-jar-plugin-3.patch new file mode 100644 index 0000000..11cedd9 --- /dev/null +++ b/easymock-port-to-maven-jar-plugin-3.patch @@ -0,0 +1,14 @@ +--- pom.xml~ 2015-01-05 15:26:16.000000000 +0100 ++++ pom.xml 2016-05-30 10:43:28.487416122 +0200 +@@ -334,10 +334,10 @@ + + maven-jar-plugin + +- true + + true + false ++ ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + true diff --git a/easymock.spec b/easymock.spec index 042edd1..3fc4964 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -8,6 +8,7 @@ URL: http://www.easymock.org Source0: https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz Patch5: %{name}-remove-android-support.patch +Patch6: %{name}-port-to-maven-jar-plugin-3.patch BuildArch: noarch @@ -50,6 +51,7 @@ find . -name "*.zip" -delete # remove android support rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %patch5 -p1 -b .sav +%patch6 %pom_xpath_remove "pom:profile[pom:id[text()='android']]" %pom_remove_dep :dexmaker easymock @@ -87,6 +89,9 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %changelog +* Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 +- Port to maven-jar-plugin 3.0.0 + * Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3bb60e3562fd91a09af22018148a28ff74b860fd Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 May 2016 15:09:44 +0200 Subject: [PATCH 08/76] Update to upstream version 3.4 --- .gitignore | 1 + ... 0001-Port-to-maven-jar-plugin-3.0.0.patch | 41 ++++++++---- 0002-Disable-android-support.patch | 29 ++++++++ 0003-Unshade-cglib-and-asm.patch | 27 ++++++++ easymock-remove-android-support.patch | 67 ------------------- easymock.spec | 57 ++++++++-------- sources | 2 +- 7 files changed, 115 insertions(+), 109 deletions(-) rename easymock-port-to-maven-jar-plugin-3.patch => 0001-Port-to-maven-jar-plugin-3.0.0.patch (50%) create mode 100644 0002-Disable-android-support.patch create mode 100644 0003-Unshade-cglib-and-asm.patch delete mode 100644 easymock-remove-android-support.patch diff --git a/.gitignore b/.gitignore index acad3f5..4ca92dc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ easymock-1.2-src.tar.gz /easymock-3.2.tar.gz /easymock-3.3.tar.gz /easymock-3.3.1.tar.gz +/easymock-3.4.tar.gz diff --git a/easymock-port-to-maven-jar-plugin-3.patch b/0001-Port-to-maven-jar-plugin-3.0.0.patch similarity index 50% rename from easymock-port-to-maven-jar-plugin-3.patch rename to 0001-Port-to-maven-jar-plugin-3.0.0.patch index 11cedd9..b566044 100644 --- a/easymock-port-to-maven-jar-plugin-3.patch +++ b/0001-Port-to-maven-jar-plugin-3.0.0.patch @@ -1,14 +1,27 @@ ---- pom.xml~ 2015-01-05 15:26:16.000000000 +0100 -+++ pom.xml 2016-05-30 10:43:28.487416122 +0200 -@@ -334,10 +334,10 @@ - - maven-jar-plugin - -- true - - true - false -+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - true - true +From 4291ccd3927865d7da94f8e9408cb24d898ba22e Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 30 May 2016 10:45:16 +0200 +Subject: [PATCH 1/3] Port to maven-jar-plugin 3.0.0 + +--- + pom.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pom.xml b/pom.xml +index db33e5b..df2c483 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -339,9 +339,9 @@ + + maven-jar-plugin + +- true + + true ++ ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + true +-- +2.5.5 + diff --git a/0002-Disable-android-support.patch b/0002-Disable-android-support.patch new file mode 100644 index 0000000..583e9f0 --- /dev/null +++ b/0002-Disable-android-support.patch @@ -0,0 +1,29 @@ +From f8a748f63a7d54ecaccabf88205968c87b55332c Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 30 May 2016 14:24:43 +0200 +Subject: [PATCH 2/3] Disable android support + +--- + core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java +index 6ae65d1..d5937b0 100644 +--- a/core/src/main/java/org/easymock/internal/MocksControl.java ++++ b/core/src/main/java/org/easymock/internal/MocksControl.java +@@ -141,12 +141,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, + return cached; + } + +- // ///CLOVER:OFF +- if (AndroidSupport.isAndroid()) { +- return classProxyFactory = new AndroidClassProxyFactory(); +- } +- // ///CLOVER:ON +- + return classProxyFactory = new ClassProxyFactory(); + } + +-- +2.5.5 + diff --git a/0003-Unshade-cglib-and-asm.patch b/0003-Unshade-cglib-and-asm.patch new file mode 100644 index 0000000..c686162 --- /dev/null +++ b/0003-Unshade-cglib-and-asm.patch @@ -0,0 +1,27 @@ +From 16f8ae1d94ec088841f06506ec260695d8b97703 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 30 May 2016 15:14:40 +0200 +Subject: [PATCH 3/3] Unshade cglib and asm + +--- + core/pom.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/pom.xml b/core/pom.xml +index 00e1575..2fa5653 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -87,8 +87,8 @@ + maven-bundle-plugin + + +- org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm +- org.easymock,org.easymock.internal;poweruser=true,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm,org.objenesis;resolution:=optional ++ org.easymock.internal.*;poweruser=true;mandatory:=poweruser ++ org.easymock,org.easymock.internal;poweruser=true,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.objectweb.asm,org.objenesis;resolution:=optional + + + +-- +2.5.5 + diff --git a/easymock-remove-android-support.patch b/easymock-remove-android-support.patch deleted file mode 100644 index 6048190..0000000 --- a/easymock-remove-android-support.patch +++ /dev/null @@ -1,67 +0,0 @@ -From badde85d06cd5ccec026b93cc753dc3e93fb4132 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Fri, 9 Aug 2013 12:44:48 +0200 -Subject: [PATCH] Remove android support - ---- - .../java/org/easymock/internal/MocksControl.java | 6 -- - .../easymock/tests2/ClassExtensionHelperTest.java | 12 +-- - 2 files changed, 3 insertions(+), 159 deletions(-) - -diff --git a/easymock/src/main/java/org/easymock/internal/MocksControl.java b/easymock/src/main/java/org/easymock/internal/MocksControl.java -index 131d22c..0782825 100644 ---- a/easymock/src/main/java/org/easymock/internal/MocksControl.java -+++ b/easymock/src/main/java/org/easymock/internal/MocksControl.java -@@ -152,12 +152,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, - return cached; - } - -- // ///CLOVER:OFF -- if (AndroidSupport.isAndroid()) { -- return classProxyFactory = new AndroidClassProxyFactory(); -- } -- // ///CLOVER:ON -- - try { - return classProxyFactory = new ClassProxyFactory(); - } catch (final NoClassDefFoundError e) { -diff --git a/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java b/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java -index 04a413f..3f45555 100644 ---- a/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java -+++ b/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java -@@ -15,7 +15,6 @@ - */ - package org.easymock.tests2; - --import com.google.dexmaker.stock.ProxyBuilder; - import java.lang.reflect.InvocationHandler; - import java.lang.reflect.Method; - import java.lang.reflect.Proxy; -@@ -25,7 +24,6 @@ import net.sf.cglib.proxy.Enhancer; - import net.sf.cglib.proxy.NoOp; - import org.easymock.EasyMock; - import static org.easymock.EasyMock.createMock; --import org.easymock.internal.AndroidSupport; - import static org.easymock.internal.MocksControl.getControl; - import static org.easymock.internal.MocksControl.getMockedType; - import org.easymock.internal.MocksControl; -@@ -61,13 +59,9 @@ public class ClassExtensionHelperTest { - @Test - public void testGetControl_EnhancedButNotAMock() throws Exception { - final Object o; -- if (AndroidSupport.isAndroid()) { -- o = ProxyBuilder.forClass(ArrayList.class) -- .handler(NOOP_INVOCATION_HANDLER) -- .build(); -- } else { -- o = Enhancer.create(ArrayList.class, NoOp.INSTANCE); -- } -+ -+ o = Enhancer.create(ArrayList.class, NoOp.INSTANCE); -+ - try { - getControl(o); - fail(); --- -1.9.3 - diff --git a/easymock.spec b/easymock.spec index 3fc4964..a6856ce 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,27 +1,26 @@ Name: easymock -Version: 3.3.1 -Release: 5%{?dist} +Version: 3.4 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org -Source0: https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.tar.gz -Patch5: %{name}-remove-android-support.patch -Patch6: %{name}-port-to-maven-jar-plugin-3.patch +Patch1: 0001-Port-to-maven-jar-plugin-3.0.0.patch +Patch2: 0002-Disable-android-support.patch +Patch3: 0003-Unshade-cglib-and-asm.patch BuildArch: noarch BuildRequires: maven-local +BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(net.sf.cglib:cglib) -BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin) -BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.objenesis:objenesis) Obsoletes: %{name}3 < %{version}-%{release} Provides: %{name}3 = %{version}-%{release} @@ -43,21 +42,25 @@ Javadoc for %{name}. %prep -# Unpack the sources: -%setup -q -n easymock-easymock-%{version} +%setup -q -n %{name}-%{name}-%{version} -find . -name "*.zip" -delete +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 # remove android support -rm -fr easymock/src/main/java/org/easymock/internal/Android*.java -%patch5 -p1 -b .sav -%patch6 -%pom_xpath_remove "pom:profile[pom:id[text()='android']]" -%pom_remove_dep :dexmaker easymock +rm core/src/main/java/org/easymock/internal/Android*.java +rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java +%pom_disable_module test-android +%pom_remove_dep :dexmaker core -# fix cglib aId and gId -%pom_remove_dep :cglib easymock -%pom_add_dep net.sf.cglib:cglib easymock +# unbundle asm and cglib +%pom_disable_module test-nodeps +%pom_remove_plugin :maven-shade-plugin core + +# missing test deps +%pom_disable_module test-integration +%pom_disable_module test-osgi # remove some warning caused by unavailable plugin %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin @@ -65,13 +68,10 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java # retired %pom_remove_plugin :maven-timestamp-plugin -%pom_disable_module easymock-test-integration -%pom_disable_module easymock-test-osgi - # For compatibility reasons %mvn_file ":easymock{*}" easymock@1 easymock3@1 -# ssh not needed during our builds +# ssh not needed during our builds %pom_xpath_remove pom:extensions %build @@ -82,13 +82,16 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java %files -f .mfiles -%doc easymock/LICENSE.txt +%license core/LICENSE.txt %files javadoc -f .mfiles-javadoc -%doc easymock/LICENSE.txt +%license core/LICENSE.txt %changelog +* Mon May 30 2016 Michael Simacek - 3.4-1 +- Update to upstream version 3.4 + * Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 - Port to maven-jar-plugin 3.0.0 diff --git a/sources b/sources index bd52cfb..793b305 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a50189b3ef81f810f13d8f00697ebcd8 easymock-3.3.1.tar.gz +2c17cff0e93bb88ddb30f09eb3b684ee easymock-3.4.tar.gz From 00c2c26bd2dddaef679853fefb4eb19fb24efdb1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 1 Jun 2016 09:32:47 +0200 Subject: [PATCH 09/76] Fix OSGi manifest - Resolves: rhbz#1341052 --- 0001-Port-to-maven-jar-plugin-3.0.0.patch | 4 ++-- 0002-Disable-android-support.patch | 4 ++-- 0003-Unshade-cglib-and-asm.patch | 4 ++-- 0004-Fix-OSGi-manifest.patch | 28 +++++++++++++++++++++++ easymock.spec | 10 ++++++-- 5 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 0004-Fix-OSGi-manifest.patch diff --git a/0001-Port-to-maven-jar-plugin-3.0.0.patch b/0001-Port-to-maven-jar-plugin-3.0.0.patch index b566044..a5a882d 100644 --- a/0001-Port-to-maven-jar-plugin-3.0.0.patch +++ b/0001-Port-to-maven-jar-plugin-3.0.0.patch @@ -1,7 +1,7 @@ -From 4291ccd3927865d7da94f8e9408cb24d898ba22e Mon Sep 17 00:00:00 2001 +From c68c40a586dc187e5f004a0279f143b278b81cd6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 May 2016 10:45:16 +0200 -Subject: [PATCH 1/3] Port to maven-jar-plugin 3.0.0 +Subject: [PATCH 1/4] Port to maven-jar-plugin 3.0.0 --- pom.xml | 2 +- diff --git a/0002-Disable-android-support.patch b/0002-Disable-android-support.patch index 583e9f0..e4b65d3 100644 --- a/0002-Disable-android-support.patch +++ b/0002-Disable-android-support.patch @@ -1,7 +1,7 @@ -From f8a748f63a7d54ecaccabf88205968c87b55332c Mon Sep 17 00:00:00 2001 +From 1422eddacbbe4ca5614794ebb7ba8779ce2718f2 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 May 2016 14:24:43 +0200 -Subject: [PATCH 2/3] Disable android support +Subject: [PATCH 2/4] Disable android support --- core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------ diff --git a/0003-Unshade-cglib-and-asm.patch b/0003-Unshade-cglib-and-asm.patch index c686162..2ae8c91 100644 --- a/0003-Unshade-cglib-and-asm.patch +++ b/0003-Unshade-cglib-and-asm.patch @@ -1,7 +1,7 @@ -From 16f8ae1d94ec088841f06506ec260695d8b97703 Mon Sep 17 00:00:00 2001 +From 1f0a742506d9d6270607158d91f9939089a1b731 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 May 2016 15:14:40 +0200 -Subject: [PATCH 3/3] Unshade cglib and asm +Subject: [PATCH 3/4] Unshade cglib and asm --- core/pom.xml | 4 ++-- diff --git a/0004-Fix-OSGi-manifest.patch b/0004-Fix-OSGi-manifest.patch new file mode 100644 index 0000000..7c0b04c --- /dev/null +++ b/0004-Fix-OSGi-manifest.patch @@ -0,0 +1,28 @@ +From a228c98f921520577d9563b0a330f7af4f19b66c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 1 Jun 2016 09:31:44 +0200 +Subject: [PATCH 4/4] Fix OSGi manifest + +Resolves: rhbz#1341052 +--- + core/pom.xml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/core/pom.xml b/core/pom.xml +index 2fa5653..73c4d94 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -87,8 +87,9 @@ + maven-bundle-plugin + + +- org.easymock.internal.*;poweruser=true;mandatory:=poweruser ++ org.easymock,org.easymock.internal.*;poweruser=true;mandatory:=poweruser + org.easymock,org.easymock.internal;poweruser=true,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.objectweb.asm,org.objenesis;resolution:=optional ++ <_nouses>true + + + +-- +2.5.5 + diff --git a/easymock.spec b/easymock.spec index a6856ce..7a48fed 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -10,6 +10,7 @@ Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.ta Patch1: 0001-Port-to-maven-jar-plugin-3.0.0.patch Patch2: 0002-Disable-android-support.patch Patch3: 0003-Unshade-cglib-and-asm.patch +Patch4: 0004-Fix-OSGi-manifest.patch BuildArch: noarch @@ -22,7 +23,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.objenesis:objenesis) -Obsoletes: %{name}3 < %{version}-%{release} +Obsoletes: %{name}3 < 3.4 Provides: %{name}3 = %{version}-%{release} Obsoletes: %{name}2 < 2.5.2-10 @@ -47,6 +48,7 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # remove android support rm core/src/main/java/org/easymock/internal/Android*.java @@ -89,6 +91,10 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Wed Jun 1 2016 Mikolaj Izdebski - 3.4-2 +- Fix OSGi manifest +- Resolves: rhbz#1341052 + * Mon May 30 2016 Michael Simacek - 3.4-1 - Update to upstream version 3.4 From a010737aeb1a096068501970b8fe002919a3139c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 7 Feb 2017 11:24:17 +0100 Subject: [PATCH 10/76] Remove useless license-plugin --- easymock.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 7a48fed..642077f 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -16,7 +16,6 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) @@ -50,6 +49,8 @@ Javadoc for %{name}. %patch3 -p1 %patch4 -p1 +%pom_remove_plugin :maven-license-plugin + # remove android support rm core/src/main/java/org/easymock/internal/Android*.java rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java @@ -91,6 +92,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Tue Feb 07 2017 Michael Simacek - 3.4-3 +- Remove useless license-plugin + * Wed Jun 1 2016 Mikolaj Izdebski - 3.4-2 - Fix OSGi manifest - Resolves: rhbz#1341052 From 8ed2637e70cd9427fd81db73fb9e6b49d9680a22 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 23 Feb 2017 13:48:49 +0100 Subject: [PATCH 11/76] Add missing BR on apache-resource-bundles --- easymock.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 642077f..41bbbff 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -21,6 +21,9 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.objenesis:objenesis) +BuildRequires: mvn(org.ow2.asm:asm) +# xmvn-builddep misses this: +BuildRequires: mvn(org.apache:apache-jar-resource-bundle) Obsoletes: %{name}3 < 3.4 Provides: %{name}3 = %{version}-%{release} @@ -92,6 +95,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Thu Feb 23 2017 Mikolaj Izdebski - 3.4-4 +- Add missing BR on apache-resource-bundles + * Tue Feb 07 2017 Michael Simacek - 3.4-3 - Remove useless license-plugin From a139df84626f763a53c55141dfcafcf8f1e9d802 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:57:42 +0000 Subject: [PATCH 12/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 41bbbff..f929e91 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -95,6 +95,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 23 2017 Mikolaj Izdebski - 3.4-4 - Add missing BR on apache-resource-bundles From 5c79af3c625638746473303512562ec7a0f2c418 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 15 Sep 2017 15:23:21 +0100 Subject: [PATCH 13/76] Regenerate OSGi metadata due to Objectweb ASM upgrade --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index f929e91..79662c4 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -95,6 +95,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Fri Sep 15 2017 Mat Booth - 3.4-6 +- Regenerate OSGi metadata due to Objectweb ASM upgrade + * Wed Jul 26 2017 Fedora Release Engineering - 3.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b58a89d51aeda47c112bbd305c6eb230906b60db Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 Sep 2017 09:08:46 +0200 Subject: [PATCH 14/76] Update to upstream version 3.5 --- ...atch => 0001-Disable-android-support.patch | 10 +++---- 0001-Port-to-maven-jar-plugin-3.0.0.patch | 27 ------------------- ....patch => 0002-Unshade-cglib-and-asm.patch | 12 ++++----- ...fest.patch => 0003-Fix-OSGi-manifest.patch | 12 ++++----- easymock.spec | 18 ++++++++----- 5 files changed, 28 insertions(+), 51 deletions(-) rename 0002-Disable-android-support.patch => 0001-Disable-android-support.patch (79%) delete mode 100644 0001-Port-to-maven-jar-plugin-3.0.0.patch rename 0003-Unshade-cglib-and-asm.patch => 0002-Unshade-cglib-and-asm.patch (83%) rename 0004-Fix-OSGi-manifest.patch => 0003-Fix-OSGi-manifest.patch (80%) diff --git a/0002-Disable-android-support.patch b/0001-Disable-android-support.patch similarity index 79% rename from 0002-Disable-android-support.patch rename to 0001-Disable-android-support.patch index e4b65d3..208e85b 100644 --- a/0002-Disable-android-support.patch +++ b/0001-Disable-android-support.patch @@ -1,17 +1,17 @@ -From 1422eddacbbe4ca5614794ebb7ba8779ce2718f2 Mon Sep 17 00:00:00 2001 +From 57501046dc32012210433444543c513b20c5d517 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 May 2016 14:24:43 +0200 -Subject: [PATCH 2/4] Disable android support +Subject: [PATCH 1/3] Disable android support --- core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java -index 6ae65d1..d5937b0 100644 +index fb2a5dc..356b1c4 100644 --- a/core/src/main/java/org/easymock/internal/MocksControl.java +++ b/core/src/main/java/org/easymock/internal/MocksControl.java -@@ -141,12 +141,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, +@@ -147,12 +147,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, return cached; } @@ -25,5 +25,5 @@ index 6ae65d1..d5937b0 100644 } -- -2.5.5 +2.13.5 diff --git a/0001-Port-to-maven-jar-plugin-3.0.0.patch b/0001-Port-to-maven-jar-plugin-3.0.0.patch deleted file mode 100644 index a5a882d..0000000 --- a/0001-Port-to-maven-jar-plugin-3.0.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c68c40a586dc187e5f004a0279f143b278b81cd6 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 30 May 2016 10:45:16 +0200 -Subject: [PATCH 1/4] Port to maven-jar-plugin 3.0.0 - ---- - pom.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pom.xml b/pom.xml -index db33e5b..df2c483 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -339,9 +339,9 @@ - - maven-jar-plugin - -- true - - true -+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - true - true --- -2.5.5 - diff --git a/0003-Unshade-cglib-and-asm.patch b/0002-Unshade-cglib-and-asm.patch similarity index 83% rename from 0003-Unshade-cglib-and-asm.patch rename to 0002-Unshade-cglib-and-asm.patch index 2ae8c91..93d3367 100644 --- a/0003-Unshade-cglib-and-asm.patch +++ b/0002-Unshade-cglib-and-asm.patch @@ -1,18 +1,18 @@ -From 1f0a742506d9d6270607158d91f9939089a1b731 Mon Sep 17 00:00:00 2001 +From 2ad2e79989f64072d8437ada55b12eaa8c23834d Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 May 2016 15:14:40 +0200 -Subject: [PATCH 3/4] Unshade cglib and asm +Subject: [PATCH 2/3] Unshade cglib and asm --- core/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml -index 00e1575..2fa5653 100644 +index 1ca847a..5ed6adb 100644 --- a/core/pom.xml +++ b/core/pom.xml -@@ -87,8 +87,8 @@ - maven-bundle-plugin +@@ -100,8 +100,8 @@ + true - org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm @@ -23,5 +23,5 @@ index 00e1575..2fa5653 100644 -- -2.5.5 +2.13.5 diff --git a/0004-Fix-OSGi-manifest.patch b/0003-Fix-OSGi-manifest.patch similarity index 80% rename from 0004-Fix-OSGi-manifest.patch rename to 0003-Fix-OSGi-manifest.patch index 7c0b04c..d4b3263 100644 --- a/0004-Fix-OSGi-manifest.patch +++ b/0003-Fix-OSGi-manifest.patch @@ -1,7 +1,7 @@ -From a228c98f921520577d9563b0a330f7af4f19b66c Mon Sep 17 00:00:00 2001 +From fa908a1748cb3090d677a63db4986ffc57acbf1e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 1 Jun 2016 09:31:44 +0200 -Subject: [PATCH 4/4] Fix OSGi manifest +Subject: [PATCH 3/3] Fix OSGi manifest Resolves: rhbz#1341052 --- @@ -9,11 +9,11 @@ Resolves: rhbz#1341052 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml -index 2fa5653..73c4d94 100644 +index 5ed6adb..ea6d015 100644 --- a/core/pom.xml +++ b/core/pom.xml -@@ -87,8 +87,9 @@ - maven-bundle-plugin +@@ -100,8 +100,9 @@ + true - org.easymock.internal.*;poweruser=true;mandatory:=poweruser @@ -24,5 +24,5 @@ index 2fa5653..73c4d94 100644 -- -2.5.5 +2.13.5 diff --git a/easymock.spec b/easymock.spec index 79662c4..3611233 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,16 +1,15 @@ Name: easymock -Version: 3.4 -Release: 6%{?dist} +Version: 3.5 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.tar.gz -Patch1: 0001-Port-to-maven-jar-plugin-3.0.0.patch -Patch2: 0002-Disable-android-support.patch -Patch3: 0003-Unshade-cglib-and-asm.patch -Patch4: 0004-Fix-OSGi-manifest.patch +Patch1: 0001-Disable-android-support.patch +Patch2: 0002-Unshade-cglib-and-asm.patch +Patch3: 0003-Fix-OSGi-manifest.patch BuildArch: noarch @@ -19,9 +18,12 @@ BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47) +BuildRequires: mvn(org.apache.maven.surefire:surefire-testng) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.testng:testng) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) @@ -50,7 +52,6 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %pom_remove_plugin :maven-license-plugin @@ -95,6 +96,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Mon Sep 18 2017 Mikolaj Izdebski - 3.5-1 +- Update to upstream version 3.5 + * Fri Sep 15 2017 Mat Booth - 3.4-6 - Regenerate OSGi metadata due to Objectweb ASM upgrade From 0c006d5f55635f1730fb41790c3b9a74b680ae58 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 Sep 2017 10:16:01 +0200 Subject: [PATCH 15/76] Upload sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4ca92dc..9f1347b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ easymock-1.2-src.tar.gz /easymock-3.3.tar.gz /easymock-3.3.1.tar.gz /easymock-3.4.tar.gz +/easymock-3.5.tar.gz diff --git a/sources b/sources index 793b305..c536732 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c17cff0e93bb88ddb30f09eb3b684ee easymock-3.4.tar.gz +SHA512 (easymock-3.5.tar.gz) = dd3ebbcc9a8e7b58f67e10f159df9aa5f42d8c28cc8de921b057d25af14f147f33e37f1dedd737771f6adfb4365774f60ee50dd0c2ffe9652ae2f593c20ead68 From ec73cda0418821c8cbf80ff4cdd41234b872384e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 07:51:24 +0000 Subject: [PATCH 16/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 3611233..d6ffb1d 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -96,6 +96,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Sep 18 2017 Mikolaj Izdebski - 3.5-1 - Update to upstream version 3.5 From 4d6a81d601bd0691b6cb8745018a8e9f9f2be7ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 23:29:31 +0000 Subject: [PATCH 17/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index d6ffb1d..6e1e0d1 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -96,6 +96,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 12854ef367753a22f200eed6f0e66282523177ed Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 31 Jul 2018 10:48:54 +0200 Subject: [PATCH 18/76] Repack the tarball without binaries --- easymock.spec | 10 ++++++++-- generate-tarball.sh | 23 +++++++++++++++++++++++ sources | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100755 generate-tarball.sh diff --git a/easymock.spec b/easymock.spec index 6e1e0d1..26ec055 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,11 +1,14 @@ Name: easymock Version: 3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org -Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.tar.gz +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +# Remove bundled binaries which cannot be easily verified for licensing +Source1: generate-tarball.sh Patch1: 0001-Disable-android-support.patch Patch2: 0002-Unshade-cglib-and-asm.patch @@ -96,6 +99,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Tue Jul 31 2018 Michael Simacek - 3.5-4 +- Repack the tarball without binaries + * Thu Jul 12 2018 Fedora Release Engineering - 3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..3d5fe1e --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +name=easymock +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://github.com/${name}/${name}/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +cd tarball-tmp +tar xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +find -name '*.jar' -delete +find -name '*.class' -delete +# Contains minified js of uncertain origin +rm -r */website + +tar cf "../${name}-${version}.tar.gz" * +cd .. +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/sources b/sources index c536732..66e9671 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-3.5.tar.gz) = dd3ebbcc9a8e7b58f67e10f159df9aa5f42d8c28cc8de921b057d25af14f147f33e37f1dedd737771f6adfb4365774f60ee50dd0c2ffe9652ae2f593c20ead68 +SHA512 (easymock-3.5.tar.gz) = fea9d14a880311f7b9ba372356af26084c07c95cbf331ee90a8e8d928c6176b59c17ff9838ce49589264feb06837c2f361b04a0428e6a3bd74ff75b076a16279 From 4eeae1b430941f47f772602785820b3f306c4ff5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 8 Oct 2018 14:40:37 +0000 Subject: [PATCH 19/76] Update to upstream version 3.6 --- .gitignore | 1 + easymock.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9f1347b..bd3aee6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ easymock-1.2-src.tar.gz /easymock-3.3.1.tar.gz /easymock-3.4.tar.gz /easymock-3.5.tar.gz +/easymock-3.6.tar.gz diff --git a/easymock.spec b/easymock.spec index 26ec055..48e5fbb 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock -Version: 3.5 -Release: 4%{?dist} +Version: 3.6 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -57,6 +57,10 @@ Javadoc for %{name}. %patch3 -p1 %pom_remove_plugin :maven-license-plugin +%pom_remove_plugin :maven-timestamp-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin core # remove android support rm core/src/main/java/org/easymock/internal/Android*.java @@ -75,9 +79,6 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java # remove some warning caused by unavailable plugin %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin -# retired -%pom_remove_plugin :maven-timestamp-plugin - # For compatibility reasons %mvn_file ":easymock{*}" easymock@1 easymock3@1 @@ -99,6 +100,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Mon Oct 8 2018 Mikolaj Izdebski - 3.6-1 +- Update to upstream version 3.6 + * Tue Jul 31 2018 Michael Simacek - 3.5-4 - Repack the tarball without binaries diff --git a/sources b/sources index 66e9671..965d62f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-3.5.tar.gz) = fea9d14a880311f7b9ba372356af26084c07c95cbf331ee90a8e8d928c6176b59c17ff9838ce49589264feb06837c2f361b04a0428e6a3bd74ff75b076a16279 +SHA512 (easymock-3.6.tar.gz) = 847bb31cd086dfa2cc849c2b8a37b9289a415afbbe78d1e72986e1a141529955951b01242ebf4ffed02d8f42a192a87fd10e72670dcac803129847749ede88d5 From cd3b89969a888161a5ce052a4ae7ffd07d6a1760 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:38 +0000 Subject: [PATCH 20/76] Remove Obsoletes --- easymock.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 26ec055..aee2cf6 100644 --- a/easymock.spec +++ b/easymock.spec @@ -30,9 +30,7 @@ BuildRequires: mvn(org.testng:testng) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) -Obsoletes: %{name}3 < 3.4 Provides: %{name}3 = %{version}-%{release} -Obsoletes: %{name}2 < 2.5.2-10 %description From 7493e11a11e3c280e251304a57c3851d4e7f1a72 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 30 Nov 2018 00:49:58 +0000 Subject: [PATCH 21/76] Rebuild to fix OSGi dependency on ASM 7 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 48e5fbb..3badccd 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -100,6 +100,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Fri Nov 30 2018 Mat Booth - 3.6-2 +- Rebuild to fix OSGi dependency on ASM 7 + * Mon Oct 8 2018 Mikolaj Izdebski - 3.6-1 - Update to upstream version 3.6 From fd1293ad99496e9d33a961dfe3a8d8baa24b4fe2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 18:07:31 +0000 Subject: [PATCH 22/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 3badccd..263f359 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -100,6 +100,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Nov 30 2018 Mat Booth - 3.6-2 - Rebuild to fix OSGi dependency on ASM 7 From c578fc32812077c5eadd456e1fa28d7c39cd30ba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:29 +0200 Subject: [PATCH 23/76] Mass rebuild for javapackages-tools 201901 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index aee2cf6..b8f7d5a 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -97,6 +97,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.5-5 +- Mass rebuild for javapackages-tools 201901 + * Tue Jul 31 2018 Michael Simacek - 3.5-4 - Repack the tarball without binaries From fa943ad03f368c553ac932a4a167d8db7d60022b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 18 Jul 2019 09:58:26 +0200 Subject: [PATCH 24/76] Update to upstream version 4.0.2 --- .gitignore | 1 + easymock.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9f1347b..0cbacf3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ easymock-1.2-src.tar.gz /easymock-3.3.1.tar.gz /easymock-3.4.tar.gz /easymock-3.5.tar.gz +/easymock-4.0.2.tar.gz diff --git a/easymock.spec b/easymock.spec index b8f7d5a..6d9f479 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock -Version: 3.5 -Release: 5%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -32,21 +32,18 @@ BuildRequires: mvn(org.apache:apache-jar-resource-bundle) Provides: %{name}3 = %{version}-%{release} - %description EasyMock provides Mock Objects for interfaces in JUnit tests by generating them on the fly using Java's proxy mechanism. Due to EasyMock's unique style of recording expectations, most refactorings will not affect the Mock Objects. So EasyMock is a perfect fit for Test-Driven Development. - %package javadoc Summary: Javadoc for %{name} %description javadoc Javadoc for %{name}. - %prep %setup -q -n %{name}-%{name}-%{version} @@ -54,7 +51,10 @@ Javadoc for %{name}. %patch2 -p1 %patch3 -p1 -%pom_remove_plugin :maven-license-plugin +%pom_remove_plugin :license-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin core # remove android support rm core/src/main/java/org/easymock/internal/Android*.java @@ -88,15 +88,16 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %install %mvn_install - %files -f .mfiles %license core/LICENSE.txt %files javadoc -f .mfiles-javadoc %license core/LICENSE.txt - %changelog +* Thu Jul 18 2019 Marian Koncek - 4.0.2-1 +- Update to upstream version 4.0.2 + * Fri May 24 2019 Mikolaj Izdebski - 3.5-5 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 66e9671..1ef16d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-3.5.tar.gz) = fea9d14a880311f7b9ba372356af26084c07c95cbf331ee90a8e8d928c6176b59c17ff9838ce49589264feb06837c2f361b04a0428e6a3bd74ff75b076a16279 +SHA512 (easymock-4.0.2.tar.gz) = ee6bb5dfd7dbfe92cf09089cf928be4e333c106750a1bd54624ba42693e90d35e07b9d2201c528a26b02cec35b136733ac48248bf66ebfec5ae35e89a48db3ec From 3a2a16ce2fb410e7becf6910f93b7484dc949929 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 22:55:23 +0000 Subject: [PATCH 25/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 263f359..135bd67 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -100,6 +100,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a3eda01c72148c1e21b536515ab11bbe628a1dc9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 29 Aug 2019 15:42:46 +0200 Subject: [PATCH 26/76] Port to hamcrest 2.1 --- 0004-Port-to-hamcrest-2.1.patch | 75 +++++++++++++++++++++++++++++++++ easymock.spec | 2 + 2 files changed, 77 insertions(+) create mode 100644 0004-Port-to-hamcrest-2.1.patch diff --git a/0004-Port-to-hamcrest-2.1.patch b/0004-Port-to-hamcrest-2.1.patch new file mode 100644 index 0000000..542db7e --- /dev/null +++ b/0004-Port-to-hamcrest-2.1.patch @@ -0,0 +1,75 @@ +From 5393d71f7bf9de06efd763c501486bf14413ab4a Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 29 Aug 2019 15:18:53 +0200 +Subject: [PATCH] Port to hamcrest 2.1 + +--- + .../tests2/EasyMockSupportClassTest.java | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +index c5dd63b..b8be307 100644 +--- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java ++++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +@@ -48,49 +48,49 @@ public class EasyMockSupportClassTest extends EasyMockSupport { + @Test + public void testCreateStrictControl() { + IMocksControl ctrl = createStrictControl(); +- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateControl() { + IMocksControl ctrl = createControl(); +- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateNiceControl() { + IMocksControl ctrl = createNiceControl(); +- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateStrictMockClassOfT() { +- assertThat(createStrictMock(ToMock.class), is(ToMock.class)); ++ assertThat(createStrictMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateStrictMockStringClassOfT() { +- assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class)); ++ assertThat(createStrictMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateMockClassOfT() { +- assertThat(createMock(ToMock.class), is(ToMock.class)); ++ assertThat(createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateMockStringClassOfT() { +- assertThat(createMock("myMock", ToMock.class), is(ToMock.class)); ++ assertThat(createMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateNiceMockClassOfT() { +- assertThat(createNiceMock(ToMock.class), is(ToMock.class)); ++ assertThat(createNiceMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test + public void testCreateNiceMockStringClassOfT() { +- assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class)); ++ assertThat(createNiceMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); + } + + @Test +-- +2.21.0 + diff --git a/easymock.spec b/easymock.spec index 6d9f479..a32a9bf 100644 --- a/easymock.spec +++ b/easymock.spec @@ -13,6 +13,7 @@ Source1: generate-tarball.sh Patch1: 0001-Disable-android-support.patch Patch2: 0002-Unshade-cglib-and-asm.patch Patch3: 0003-Fix-OSGi-manifest.patch +Patch4: 0004-Port-to-hamcrest-2.1.patch BuildArch: noarch @@ -50,6 +51,7 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin From 69199fe2369b04bf1a27ba63342057ae88c27fc1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 27/76] Mass rebuild for javapackages-tools 201902 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index a32a9bf..9549f0e 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -97,6 +97,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 18 2019 Marian Koncek - 4.0.2-1 - Update to upstream version 4.0.2 From 56cbd27e76361b65219fd268654d6ab545f85c55 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:21:37 +0100 Subject: [PATCH 28/76] Properly compress taballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 3d5fe1e..cd9e1f7 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -9,7 +9,7 @@ wget "https://github.com/${name}/${name}/archive/${name}-${version}.tar.gz" -O " rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp +pushd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL @@ -18,6 +18,6 @@ find -name '*.class' -delete # Contains minified js of uncertain origin rm -r */website -tar cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" From ebbec2acbbe651a9c911244496e3354ab016c9db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 16:49:55 +0000 Subject: [PATCH 29/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 135bd67..d1a320b 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -100,6 +100,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 3.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c0aa6e11caf336d5fc79de883a4459863f905eea Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 9 Mar 2020 13:07:35 +0100 Subject: [PATCH 30/76] Update to upstream version 4.2 --- .gitignore | 1 + easymock.spec | 16 +++++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0cbacf3..380682d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ easymock-1.2-src.tar.gz /easymock-3.4.tar.gz /easymock-3.5.tar.gz /easymock-4.0.2.tar.gz +/easymock-4.2.tar.gz diff --git a/easymock.spec b/easymock.spec index 9549f0e..2195bc1 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock -Version: 4.0.2 -Release: 2%{?dist} +Version: 4.2 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -22,15 +22,18 @@ BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.apache.maven.surefire:surefire-testng) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.testng:testng) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) + Provides: %{name}3 = %{version}-%{release} %description @@ -58,6 +61,10 @@ Javadoc for %{name}. %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :animal-sniffer-maven-plugin core +%pom_remove_plugin :maven-gpg-plugin test-testng +%pom_remove_plugin :maven-gpg-plugin test-java8 +%pom_remove_plugin :maven-gpg-plugin test-junit5 + # remove android support rm core/src/main/java/org/easymock/internal/Android*.java rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java @@ -97,6 +104,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Mar 04 2020 Marian Koncek - 4.2-1 +- Update to upstream version 4.2 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 1ef16d1..b7b960d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-4.0.2.tar.gz) = ee6bb5dfd7dbfe92cf09089cf928be4e333c106750a1bd54624ba42693e90d35e07b9d2201c528a26b02cec35b136733ac48248bf66ebfec5ae35e89a48db3ec +SHA512 (easymock-4.2.tar.gz) = f5bb5cf7a99ac8819c9b8ac9ab587a4526ce7febd442d128241c8a2c6ace5e47226881e42f492db98617ee6c2a8e3edf588f6595142b93fec512f9ba5e972dca From 964e53d6aaf4f95ef9a7dd58d752ae0e555c01c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 18:16:33 +0200 Subject: [PATCH 31/76] Force Surefire to run tests with JUnit, not with TestNG --- easymock.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easymock.spec b/easymock.spec index 2195bc1..3abcf0a 100644 --- a/easymock.spec +++ b/easymock.spec @@ -91,6 +91,10 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java # ssh not needed during our builds %pom_xpath_remove pom:extensions +# Force Surefire to run tests with JUnit, not with TestNG +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']" \ + "none:none" core + %build %mvn_build From e47357896d1272835eba535acc1499b981347b9f Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 18:22:00 +0200 Subject: [PATCH 32/76] Rebuilt for JDK-11 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index d1a320b..174fbdf 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -100,6 +100,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Fri Jul 10 2020 Jiri Vanek - 3.6-6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jan 28 2020 Fedora Release Engineering - 3.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d85621f8371ae67509efa52a8dc5dc24e57fbf42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 16:12:12 +0000 Subject: [PATCH 33/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 174fbdf..d87de0c 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -100,6 +100,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 3.6-6 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From fe88f72a6852263b6f561c7b6c184da8437c0652 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 31 Aug 2020 17:06:44 +0200 Subject: [PATCH 34/76] update to version 4.2 --- .gitignore | 6 +++++- easymock.spec | 35 +++++++++++++++++++---------------- generate-tarball.sh | 23 ----------------------- sources | 2 +- 4 files changed, 25 insertions(+), 41 deletions(-) delete mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index bd3aee6..546b294 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ -easymock-1.2-src.tar.gz +/results_* +/*.src.rpm + +/easymock-1.2-src.tar.gz /easymock-1.2_Java1.5.pom /easymock-3.2.tar.gz /easymock-3.3.tar.gz @@ -6,3 +9,4 @@ easymock-1.2-src.tar.gz /easymock-3.4.tar.gz /easymock-3.5.tar.gz /easymock-3.6.tar.gz +/easymock-4.2.tar.gz diff --git a/easymock.spec b/easymock.spec index d87de0c..7830fc6 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,14 +1,11 @@ Name: easymock -Version: 3.6 -Release: 7%{?dist} +Version: 4.2 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 -URL: http://www.easymock.org -# ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz -# Remove bundled binaries which cannot be easily verified for licensing -Source1: generate-tarball.sh +URL: http://www.easymock.org +Source0: https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz Patch1: 0001-Disable-android-support.patch Patch2: 0002-Unshade-cglib-and-asm.patch @@ -21,9 +18,11 @@ BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.apache.maven.surefire:surefire-testng) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.testng:testng) @@ -34,7 +33,6 @@ Obsoletes: %{name}3 < 3.4 Provides: %{name}3 = %{version}-%{release} Obsoletes: %{name}2 < 2.5.2-10 - %description EasyMock provides Mock Objects for interfaces in JUnit tests by generating them on the fly using Java's proxy mechanism. Due to EasyMock's unique style @@ -56,11 +54,13 @@ Javadoc for %{name}. %patch2 -p1 %patch3 -p1 -%pom_remove_plugin :maven-license-plugin -%pom_remove_plugin :maven-timestamp-plugin +# disable unnecessary maven plugins +%pom_remove_plugin :animal-sniffer-maven-plugin . core +%pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :animal-sniffer-maven-plugin core +%pom_remove_plugin :maven-gpg-plugin test-java8 test-junit5 test-testng +%pom_remove_plugin :maven-timestamp-plugin +%pom_remove_plugin :versions-maven-plugin # remove android support rm core/src/main/java/org/easymock/internal/Android*.java @@ -76,18 +76,17 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %pom_disable_module test-integration %pom_disable_module test-osgi -# remove some warning caused by unavailable plugin -%pom_remove_plugin org.codehaus.mojo:versions-maven-plugin - # For compatibility reasons %mvn_file ":easymock{*}" easymock@1 easymock3@1 # ssh not needed during our builds %pom_xpath_remove pom:extensions + %build %mvn_build + %install %mvn_install @@ -100,6 +99,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Mon Aug 31 2020 Fabio Valentini - 4.2-1 +- Update to version 4.2. + * Mon Jul 27 2020 Fedora Release Engineering - 3.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -263,3 +265,4 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java * Mon Oct 04 2004 Ralph Apel - 0:1.1-1jpp - First JPackage release + diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 3d5fe1e..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -name=easymock -version="$(sed -n 's/Version:\s*//p' *.spec)" - -# RETRIEVE -wget "https://github.com/${name}/${name}/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" - -rm -rf tarball-tmp -mkdir tarball-tmp -cd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" - -# CLEAN TARBALL -find -name '*.jar' -delete -find -name '*.class' -delete -# Contains minified js of uncertain origin -rm -r */website - -tar cf "../${name}-${version}.tar.gz" * -cd .. -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/sources b/sources index 965d62f..819dcfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-3.6.tar.gz) = 847bb31cd086dfa2cc849c2b8a37b9289a415afbbe78d1e72986e1a141529955951b01242ebf4ffed02d8f42a192a87fd10e72670dcac803129847749ede88d5 +SHA512 (easymock-4.2.tar.gz) = c0cdd3b11fd2ae9acddeb69b7393593bb7e7452e60cc88c8ec9725887a7597410705f170a0d733b7abc80207c28cd5827c41e0921bb432a93669d09f8e0d30c4 From 6633bfe14e481119c3a90567476a13a8ae09c812 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 04:12:45 +0000 Subject: [PATCH 35/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 7830fc6..1039730 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 @@ -99,6 +99,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Aug 31 2020 Fabio Valentini - 4.2-1 - Update to version 4.2. From 2a189d51b7d5141b1cea931e9206182ea2a50044 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 36/76] Conditionalize buildrequires in bootstrap mode --- easymock.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/easymock.spec b/easymock.spec index 3abcf0a..a0303ec 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: easymock Version: 4.2 Release: 1%{?dist} @@ -18,6 +20,9 @@ Patch4: 0004-Port-to-hamcrest-2.1.patch BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -30,8 +35,11 @@ BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.testng:testng) +%endif # xmvn-builddep misses this: +%if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif Provides: %{name}3 = %{version}-%{release} From 98162a0440f2f99a7bb062d9372523d3703b8738 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 37/76] Turn off bootstrap mode by default --- easymock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index a0303ec..a295070 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: easymock Version: 4.2 From 5ba5a85307c5e8d9b51e43ba0d9946d6065f7db5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:40 +0200 Subject: [PATCH 38/76] Bootstrap build --- easymock.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 4fb9e8d..014009c 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: easymock Version: 4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -116,6 +116,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 4.2-3 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 67a07c21687d8f3238de3a8a791278f47359d099 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:42 +0200 Subject: [PATCH 39/76] Non-bootstrap build --- easymock.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 014009c..a239bb5 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: easymock Version: 4.2 @@ -118,6 +118,7 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog * Mon May 17 2021 Mikolaj Izdebski - 4.2-3 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0d98b65f49a79534990ffd24dad6595755a3f7bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 21:34:18 +0000 Subject: [PATCH 40/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index a239bb5..e191890 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -116,6 +116,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 4.2-3 - Bootstrap build - Non-bootstrap build From 39ccca4ee53b7436af69f64d8793e96be3349424 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 16:20:00 +0100 Subject: [PATCH 41/76] Workaround build issue with OpenJDK 17 --- easymock.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index e191890..27a2949 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -103,6 +103,17 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']" \ "none:none" core +# Workaround Java 17 compatibility issue that should be fixed in +# easymock 4.4: https://github.com/easymock/easymock/issues/274 +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \ + "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED" core +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \ + "--add-opens=java.base/java.lang=ALL-UNNAMED" test-testng +%pom_add_plugin :maven-surefire-plugin test-java8 " + --add-opens=java.base/java.lang=ALL-UNNAMED" +%pom_add_plugin :maven-surefire-plugin test-junit5 " + --add-opens=java.base/java.lang=ALL-UNNAMED" + %build %mvn_build @@ -116,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 4.2-5 +- Workaround build issue with OpenJDK 17 + * Wed Jul 21 2021 Fedora Release Engineering - 4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c104fd1b2392b8cbe46755558b4cff7d6ae36dd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 01:33:24 +0000 Subject: [PATCH 42/76] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 27a2949..898d9e2 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 4.2-5 - Workaround build issue with OpenJDK 17 From 50b4bcdb97f3a27083b90aa3f142695f5ac550cc Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:29:36 +0100 Subject: [PATCH 43/76] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 898d9e2..b1a35a0 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 4.2-7 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 4.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9bb6aad8789c50d0e357ce031c20fc115075cefe Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 44/76] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- easymock.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/easymock.spec b/easymock.spec index b1a35a0..8acd43f 100644 --- a/easymock.spec +++ b/easymock.spec @@ -18,6 +18,7 @@ Patch3: 0003-Fix-OSGi-manifest.patch Patch4: 0004-Port-to-hamcrest-2.1.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local %if %{with bootstrap} From ed2a3b0fb5e3f9af4c003b9ec3889fbdff003cd2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 45/76] Update build-requires in bootstrap mode --- easymock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 8acd43f..4f2abc5 100644 --- a/easymock.spec +++ b/easymock.spec @@ -20,10 +20,10 @@ Patch4: 0004-Port-to-hamcrest-2.1.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From 65c9384087f39ad28ca8eb3f2aae403c77571c97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 01:32:19 +0000 Subject: [PATCH 46/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 4f2abc5..6c236ff 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -128,6 +128,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 4.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 4.2-7 - Rebuilt for java-17-openjdk as system jdk From 0613f0a430692396efae1e159bbfb285fa6b1d5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 47/76] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From bdf5f58c6da0ec4d950c27010769e0fb48c55676 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 8 Sep 2022 12:51:48 +0200 Subject: [PATCH 48/76] Use HTTPS URL --- easymock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 6c236ff..8aa42a9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -5,7 +5,7 @@ Version: 4.2 Release: 8%{?dist} Summary: Easy mock objects License: ASL 2.0 -URL: http://www.easymock.org +URL: https://www.easymock.org # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From fc6e402a805c28b792999f87f922c9177c3f157a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 8 Sep 2022 13:08:13 +0200 Subject: [PATCH 49/76] Update to upstream version 4.3 --- .gitignore | 1 + easymock.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8294ef9..d66b93d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /easymock-3.6.tar.gz /easymock-4.0.2.tar.gz /easymock-4.2.tar.gz +/easymock-4.3.tar.gz diff --git a/easymock.spec b/easymock.spec index 8aa42a9..92d9829 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: easymock -Version: 4.2 -Release: 8%{?dist} +Version: 4.3 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: https://www.easymock.org @@ -42,7 +42,6 @@ BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif - Provides: %{name}3 = %{version}-%{release} %description @@ -128,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Thu Sep 08 2022 Marian Koncek - 4.3-1 +- Update to upstream version 4.3 + * Thu Jul 21 2022 Fedora Release Engineering - 4.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index b7b960d..5f72e52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-4.2.tar.gz) = f5bb5cf7a99ac8819c9b8ac9ab587a4526ce7febd442d128241c8a2c6ace5e47226881e42f492db98617ee6c2a8e3edf588f6595142b93fec512f9ba5e972dca +SHA512 (easymock-4.3.tar.gz) = 694219c948e3db85d75bd368440d24ddb575cc8bf7b436a2ef8cd7eeb8c9d173edfd2bf28bde2aea38587f7df4e50b290003b03e50f069520e5f474dec574fa7 From f011b2ebaf44709302902b96ff2b824fd3127838 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 02:01:32 +0000 Subject: [PATCH 50/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 92d9829..1477436 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Sep 08 2022 Marian Koncek - 4.3-1 - Update to upstream version 4.3 From 42c3ed79bcadd1786ac6d9b2726a5eddc5d93196 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:08:42 +0000 Subject: [PATCH 51/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 1477436..5181552 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c3e1ea63e94bfeca68248ad17fdc1d72e0b7f7fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:32 +0200 Subject: [PATCH 52/76] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- easymock.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 5181552..32a8720 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,9 +2,9 @@ Name: easymock Version: 4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy mock objects -License: ASL 2.0 +License: Apache-2.0 URL: https://www.easymock.org # ./generate-tarball.sh @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 +- Convert License tag to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b48cf830df6d196152c7ca3281bd0aabc3c7e152 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 53/76] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From ba422e29d20440ebf735a9457d20e959180e45ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:47:01 +0000 Subject: [PATCH 54/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 32a8720..f8ae245 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 - Convert License tag to SPDX format From 97db8edf9a504cf1df15a459ad990553e0ffcce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:03:56 +0000 Subject: [PATCH 55/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index f8ae245..63cceb9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 02b370541c0a3e568b887547dc8ac2c61857c46a Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:18:32 +0100 Subject: [PATCH 56/76] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 63cceb9..c0c443f 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 4.3-7 +- bump of release for for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fc120c89808a6453d6ddee4015198184dade09a2 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:20:03 +0100 Subject: [PATCH 57/76] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index c0c443f..3a8271a 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 4.3-8 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 4.3-7 - bump of release for for java-21-openjdk as system jdk From 8e19929592a3240725e9da012b6d21c96981cbb0 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 58/76] Eliminate use of obsolete %patchN syntax (#2283636) --- easymock.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easymock.spec b/easymock.spec index 3a8271a..6b78140 100644 --- a/easymock.spec +++ b/easymock.spec @@ -59,10 +59,10 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin From 1df286a387fce19a836ada51bb6b543fad02835f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2024 05:41:47 +0200 Subject: [PATCH 59/76] Switch to a newer %patch syntax --- easymock.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/easymock.spec b/easymock.spec index 6b78140..2599c67 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -59,10 +59,10 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 +%patch 4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri May 31 2024 Mikolaj Izdebski - 4.3-9 +- Switch to a newer patch macro syntax + * Tue Feb 27 2024 Jiri Vanek - 4.3-8 - Rebuilt for java-21-openjdk as system jdk From dbdee2d3a5d710aaf6e39b01ec3c38e1e4d4c825 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:38:40 +0000 Subject: [PATCH 60/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 2599c67..8b5643e 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 31 2024 Mikolaj Izdebski - 4.3-9 - Switch to a newer patch macro syntax From 7e35fcf43d5dabe86e9dd8cc7892f92b07927fa0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 61/76] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 50591cdbc24715fcf99d6aba2d53beae04a18847 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 62/76] Switch from %setup to %autosetup --- easymock.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/easymock.spec b/easymock.spec index 8b5643e..c90b38e 100644 --- a/easymock.spec +++ b/easymock.spec @@ -57,12 +57,8 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -p1 -C -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin From 59b360672d64081a9f01b6ce046c7a716b01d8ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 63/76] Switch to non-numdered patches --- easymock.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easymock.spec b/easymock.spec index c90b38e..6632f1f 100644 --- a/easymock.spec +++ b/easymock.spec @@ -12,10 +12,10 @@ Source0: %{name}-%{version}.tar.gz # Remove bundled binaries which cannot be easily verified for licensing Source1: generate-tarball.sh -Patch1: 0001-Disable-android-support.patch -Patch2: 0002-Unshade-cglib-and-asm.patch -Patch3: 0003-Fix-OSGi-manifest.patch -Patch4: 0004-Port-to-hamcrest-2.1.patch +Patch: 0001-Disable-android-support.patch +Patch: 0002-Unshade-cglib-and-asm.patch +Patch: 0003-Fix-OSGi-manifest.patch +Patch: 0004-Port-to-hamcrest-2.1.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 6291ac457495599a00dbc146b0cdd51972512a2a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:03 +0200 Subject: [PATCH 64/76] Convert to %autorelease and %autochangelog --- changelog | 230 +++++++++++++++++++++++++++++++++++++++++++++++++ easymock.spec | 233 +------------------------------------------------- 2 files changed, 232 insertions(+), 231 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..946e90d --- /dev/null +++ b/changelog @@ -0,0 +1,230 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 4.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 4.3-9 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 4.3-8 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 4.3-7 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Sep 08 2022 Marian Koncek - 4.3-1 +- Update to upstream version 4.3 + +* Thu Jul 21 2022 Fedora Release Engineering - 4.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 4.2-7 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 4.2-5 +- Workaround build issue with OpenJDK 17 + +* Wed Jul 21 2021 Fedora Release Engineering - 4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 4.2-3 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 31 2020 Fabio Valentini - 4.2-1 +- Update to version 4.2. + +* Mon Jul 27 2020 Fedora Release Engineering - 3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.6-6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Mar 04 2020 Marian Koncek - 4.2-1 +- Update to upstream version 4.2 + +* Tue Jan 28 2020 Fedora Release Engineering - 3.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 Marian Koncek - 4.0.2-1 +- Update to upstream version 4.0.2 + +* Fri May 24 2019 Mikolaj Izdebski - 3.5-5 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Nov 30 2018 Mat Booth - 3.6-2 +- Rebuild to fix OSGi dependency on ASM 7 + +* Mon Oct 8 2018 Mikolaj Izdebski - 3.6-1 +- Update to upstream version 3.6 + +* Tue Jul 31 2018 Michael Simacek - 3.5-4 +- Repack the tarball without binaries + +* Thu Jul 12 2018 Fedora Release Engineering - 3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 18 2017 Mikolaj Izdebski - 3.5-1 +- Update to upstream version 3.5 + +* Fri Sep 15 2017 Mat Booth - 3.4-6 +- Regenerate OSGi metadata due to Objectweb ASM upgrade + +* Wed Jul 26 2017 Fedora Release Engineering - 3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Mikolaj Izdebski - 3.4-4 +- Add missing BR on apache-resource-bundles + +* Tue Feb 07 2017 Michael Simacek - 3.4-3 +- Remove useless license-plugin + +* Wed Jun 1 2016 Mikolaj Izdebski - 3.4-2 +- Fix OSGi manifest +- Resolves: rhbz#1341052 + +* Mon May 30 2016 Michael Simacek - 3.4-1 +- Update to upstream version 3.4 + +* Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 +- Port to maven-jar-plugin 3.0.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jul 13 2015 Mikolaj Izdebski - 3.3.1-3 +- Obsolete easymock2 +- Resolves: rhbz#1172958 + +* Wed Jun 17 2015 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 5 2015 Alexander Kurtakov 3.3.1-1 +- Update to upstream 3.3.1 release. + +* Sat Mar 07 2015 Michael Simacek - 3.3-2 +- Remove retired maven-timestamp-plugin + +* Tue Nov 25 2014 Mikolaj Izdebski - 3.3-1 +- Update to upstream version 3.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 3.2-2 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Aug 30 2013 Mikolaj Izdebski - 0:3.2-1 +- Update to upstream version 3.2 + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Feb 18 2013 Tomas Radej - 0:1.2-20 +- Fixed sources (bz #905973) + +* Wed Feb 13 2013 Fedora Release Engineering - 0:1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 27 2012 Tomas Radej - 0:1.2-18 +- Removed ownership of _mavenpomdir + +* Thu Aug 16 2012 Mikolaj Izdebski - 0:1.2-17 +- Add LICENSE file +- Remove rpm bug workaround +- Update to current packaging guidelines + +* Wed Jul 18 2012 Fedora Release Engineering - 0:1.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 21 2012 Tomas Radej - 0:1.2-15 +- Removed test + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Nov 26 2010 Stanislav Ochotnicky - 0:1.2-12 +- Fix pom filename (Resolves rhbz#655795) +- Remove clean section and buildroot declaration +- Remove versioned jars and pom files + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-11 +- Bump release for rebuild. + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-10 +- Disable tests. + +* Mon May 18 2009 Fernando Nasser 0:1.2-9 +- Update instructions for obtaining source tar ball + +* Mon May 04 2009 Yong Yang 0:1.2-8 +- Rebuild with maven2-2.0.8 built in non-bootstrap mode + +* Wed Mar 18 2009 Yong Yang 0:1.2-7 +- merge from JPP-6 +- rebuild with new maven2 2.0.8 built in bootstrap mode + +* Mon Feb 02 2009 David Walluck 0:1.2-6 +- fix component-info.xml + +* Mon Feb 02 2009 David Walluck 0:1.2-5 +- remove unneeded maven flag + +* Mon Feb 02 2009 David Walluck 0:1.2-4 +- add repolib + +* Fri Jan 30 2009 Will Tatam 1.2-3.jpp5 +- Inital JPP-5 Build + +* Fri Jan 09 2009 Yong Yang 1.2-2jpp.1 +- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6 + +* Fri Apr 11 2008 Deepak Bhole 1.2-1jpp.1 +- Import from JPackage +- Add pom file + +* Fri Feb 24 2006 Ralph Apel - 0:1.2-1jpp +- Update to 1.2 keeping only java 1.4 requirement + +* Fri Feb 24 2006 Ralph Apel - 0:1.1-3jpp +- drop java-1.3.1 requirement + +* Mon Oct 04 2004 Ralph Apel - 0:1.1-2jpp +- Fixed Url, Summary, Description and License + +* Mon Oct 04 2004 Ralph Apel - 0:1.1-1jpp +- First JPackage release diff --git a/easymock.spec b/easymock.spec index 6632f1f..2a7fbb9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 10%{?dist} +Release: %autorelease Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -123,233 +123,4 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 4.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 4.3-9 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 4.3-8 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 4.3-7 -- bump of release for for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Sep 08 2022 Marian Koncek - 4.3-1 -- Update to upstream version 4.3 - -* Thu Jul 21 2022 Fedora Release Engineering - 4.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 4.2-7 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 4.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 4.2-5 -- Workaround build issue with OpenJDK 17 - -* Wed Jul 21 2021 Fedora Release Engineering - 4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 4.2-3 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 31 2020 Fabio Valentini - 4.2-1 -- Update to version 4.2. - -* Mon Jul 27 2020 Fedora Release Engineering - 3.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 3.6-6 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Mar 04 2020 Marian Koncek - 4.2-1 -- Update to upstream version 4.2 - -* Tue Jan 28 2020 Fedora Release Engineering - 3.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 3.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 18 2019 Marian Koncek - 4.0.2-1 -- Update to upstream version 4.0.2 - -* Fri May 24 2019 Mikolaj Izdebski - 3.5-5 -- Mass rebuild for javapackages-tools 201901 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Nov 30 2018 Mat Booth - 3.6-2 -- Rebuild to fix OSGi dependency on ASM 7 - -* Mon Oct 8 2018 Mikolaj Izdebski - 3.6-1 -- Update to upstream version 3.6 - -* Tue Jul 31 2018 Michael Simacek - 3.5-4 -- Repack the tarball without binaries - -* Thu Jul 12 2018 Fedora Release Engineering - 3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 18 2017 Mikolaj Izdebski - 3.5-1 -- Update to upstream version 3.5 - -* Fri Sep 15 2017 Mat Booth - 3.4-6 -- Regenerate OSGi metadata due to Objectweb ASM upgrade - -* Wed Jul 26 2017 Fedora Release Engineering - 3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 23 2017 Mikolaj Izdebski - 3.4-4 -- Add missing BR on apache-resource-bundles - -* Tue Feb 07 2017 Michael Simacek - 3.4-3 -- Remove useless license-plugin - -* Wed Jun 1 2016 Mikolaj Izdebski - 3.4-2 -- Fix OSGi manifest -- Resolves: rhbz#1341052 - -* Mon May 30 2016 Michael Simacek - 3.4-1 -- Update to upstream version 3.4 - -* Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 -- Port to maven-jar-plugin 3.0.0 - -* Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jul 13 2015 Mikolaj Izdebski - 3.3.1-3 -- Obsolete easymock2 -- Resolves: rhbz#1172958 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 5 2015 Alexander Kurtakov 3.3.1-1 -- Update to upstream 3.3.1 release. - -* Sat Mar 07 2015 Michael Simacek - 3.3-2 -- Remove retired maven-timestamp-plugin - -* Tue Nov 25 2014 Mikolaj Izdebski - 3.3-1 -- Update to upstream version 3.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 3.2-2 -- Use Requires: java-headless rebuild (#1067528) - -* Fri Aug 30 2013 Mikolaj Izdebski - 0:3.2-1 -- Update to upstream version 3.2 - -* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Feb 18 2013 Tomas Radej - 0:1.2-20 -- Fixed sources (bz #905973) - -* Wed Feb 13 2013 Fedora Release Engineering - 0:1.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 27 2012 Tomas Radej - 0:1.2-18 -- Removed ownership of _mavenpomdir - -* Thu Aug 16 2012 Mikolaj Izdebski - 0:1.2-17 -- Add LICENSE file -- Remove rpm bug workaround -- Update to current packaging guidelines - -* Wed Jul 18 2012 Fedora Release Engineering - 0:1.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 21 2012 Tomas Radej - 0:1.2-15 -- Removed test - -* Fri Jan 13 2012 Fedora Release Engineering - 0:1.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0:1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Nov 26 2010 Stanislav Ochotnicky - 0:1.2-12 -- Fix pom filename (Resolves rhbz#655795) -- Remove clean section and buildroot declaration -- Remove versioned jars and pom files - -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-11 -- Bump release for rebuild. - -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-10 -- Disable tests. - -* Mon May 18 2009 Fernando Nasser 0:1.2-9 -- Update instructions for obtaining source tar ball - -* Mon May 04 2009 Yong Yang 0:1.2-8 -- Rebuild with maven2-2.0.8 built in non-bootstrap mode - -* Wed Mar 18 2009 Yong Yang 0:1.2-7 -- merge from JPP-6 -- rebuild with new maven2 2.0.8 built in bootstrap mode - -* Mon Feb 02 2009 David Walluck 0:1.2-6 -- fix component-info.xml - -* Mon Feb 02 2009 David Walluck 0:1.2-5 -- remove unneeded maven flag - -* Mon Feb 02 2009 David Walluck 0:1.2-4 -- add repolib - -* Fri Jan 30 2009 Will Tatam 1.2-3.jpp5 -- Inital JPP-5 Build - -* Fri Jan 09 2009 Yong Yang 1.2-2jpp.1 -- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6 - -* Fri Apr 11 2008 Deepak Bhole 1.2-1jpp.1 -- Import from JPackage -- Add pom file - -* Fri Feb 24 2006 Ralph Apel - 0:1.2-1jpp -- Update to 1.2 keeping only java 1.4 requirement - -* Fri Feb 24 2006 Ralph Apel - 0:1.1-3jpp -- drop java-1.3.1 requirement - -* Mon Oct 04 2004 Ralph Apel - 0:1.1-2jpp -- Fixed Url, Summary, Description and License - -* Mon Oct 04 2004 Ralph Apel - 0:1.1-1jpp -- First JPackage release +%autochangelog From 2429a6b5cad0a2b1a456b0de8d608f93a1676925 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 65/76] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 0e32c5c5768f46c1c0a27e239e0560f1dbf12b98 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 66/76] Unify spec style with the rest of Java/Maven packages [skip changelog] --- easymock.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/easymock.spec b/easymock.spec index 2a7fbb9..5655bc0 100644 --- a/easymock.spec +++ b/easymock.spec @@ -16,7 +16,6 @@ Patch: 0001-Disable-android-support.patch Patch: 0002-Unshade-cglib-and-asm.patch Patch: 0003-Fix-OSGi-manifest.patch Patch: 0004-Port-to-hamcrest-2.1.patch - BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -37,11 +36,10 @@ BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.testng:testng) %endif -# xmvn-builddep misses this: %if %{without bootstrap} +# xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif - Provides: %{name}3 = %{version}-%{release} %description From 7da5066474d75845ff68593e7f0f853e9e7f8d1e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:40:57 +0100 Subject: [PATCH 67/76] Reorder spec file tags [skip changelog] --- easymock.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 5655bc0..4aa54b0 100644 --- a/easymock.spec +++ b/easymock.spec @@ -6,6 +6,8 @@ Release: %autorelease Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz @@ -16,8 +18,6 @@ Patch: 0001-Disable-android-support.patch Patch: 0002-Unshade-cglib-and-asm.patch Patch: 0003-Fix-OSGi-manifest.patch Patch: 0004-Port-to-hamcrest-2.1.patch -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 9c3ea43b9150aa6932d1c8bffb715873834182a7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 68/76] Update javadoc package description [skip changelog] --- easymock.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 4aa54b0..ece6ca1 100644 --- a/easymock.spec +++ b/easymock.spec @@ -49,10 +49,10 @@ of recording expectations, most refactorings will not affect the Mock Objects. So EasyMock is a perfect fit for Test-Driven Development. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 3ee30f735b24575b55b666746488a8d2bbc1fe0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:32:59 +0000 Subject: [PATCH 69/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 66510002e192a65f4228152af90d40dd060f276f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 70/76] Remove javadoc subpackage --- easymock.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/easymock.spec b/easymock.spec index ece6ca1..fb5d195 100644 --- a/easymock.spec +++ b/easymock.spec @@ -40,6 +40,8 @@ BuildRequires: mvn(org.testng:testng) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 4.3-23 Provides: %{name}3 = %{version}-%{release} %description @@ -48,12 +50,6 @@ them on the fly using Java's proxy mechanism. Due to EasyMock's unique style of recording expectations, most refactorings will not affect the Mock Objects. So EasyMock is a perfect fit for Test-Driven Development. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -109,7 +105,7 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java --add-opens=java.base/java.lang=ALL-UNNAMED" %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -117,8 +113,5 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %files -f .mfiles %license core/LICENSE.txt -%files javadoc -f .mfiles-javadoc -%license core/LICENSE.txt - %changelog %autochangelog From a83653b270b9ed5ceec97f979fc9ee83231e1673 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 71/76] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From fed37692862a3e935094d4d0ab173d9a5f4272cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 72/76] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From cfacf1236ae2e531078c1069ceb3e21e7edabbc2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 73/76] Build with OpenJDK 25 --- easymock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index fb5d195..eadbda3 100644 --- a/easymock.spec +++ b/easymock.spec @@ -22,7 +22,7 @@ Patch: 0004-Port-to-hamcrest-2.1.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From ee8f8637d4b0f367cd6c1751a64535fcf475df3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:40:19 +0000 Subject: [PATCH 74/76] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 17eb67e965875beea1f49e3dc6dfdb4687fde11d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 20:09:13 +0200 Subject: [PATCH 75/76] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From 368a7189b3cc094775b9ac7fec7045b36964f33e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Sep 2025 09:09:05 +0200 Subject: [PATCH 76/76] Update to upstream version 5.6.0 --- .gitignore | 1 + 0001-Disable-android-support.patch | 10 +- ...e-from-deprecated-Hamcrest-is-to-isA.patch | 94 +++++++++++++++++++ 0002-Unshade-cglib-and-asm.patch | 27 ------ 0003-Fix-OSGi-manifest.patch | 28 ------ 0004-Port-to-hamcrest-2.1.patch | 75 --------------- easymock.spec | 15 ++- sources | 2 +- 8 files changed, 107 insertions(+), 145 deletions(-) create mode 100644 0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch delete mode 100644 0002-Unshade-cglib-and-asm.patch delete mode 100644 0003-Fix-OSGi-manifest.patch delete mode 100644 0004-Port-to-hamcrest-2.1.patch diff --git a/.gitignore b/.gitignore index d66b93d..7d16d25 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /easymock-4.0.2.tar.gz /easymock-4.2.tar.gz /easymock-4.3.tar.gz +/easymock-5.6.0.tar.gz diff --git a/0001-Disable-android-support.patch b/0001-Disable-android-support.patch index 208e85b..fddb078 100644 --- a/0001-Disable-android-support.patch +++ b/0001-Disable-android-support.patch @@ -1,17 +1,17 @@ -From 57501046dc32012210433444543c513b20c5d517 Mon Sep 17 00:00:00 2001 +From 3458c2cd3d453dbb866c9515568b288529af05a5 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 May 2016 14:24:43 +0200 -Subject: [PATCH 1/3] Disable android support +Subject: [PATCH 1/2] Disable android support --- core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java -index fb2a5dc..356b1c4 100644 +index b86f1a1..cfa0fa1 100644 --- a/core/src/main/java/org/easymock/internal/MocksControl.java +++ b/core/src/main/java/org/easymock/internal/MocksControl.java -@@ -147,12 +147,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, +@@ -154,12 +154,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, return cached; } @@ -25,5 +25,5 @@ index fb2a5dc..356b1c4 100644 } -- -2.13.5 +2.51.0 diff --git a/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch b/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch new file mode 100644 index 0000000..0a1e070 --- /dev/null +++ b/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch @@ -0,0 +1,94 @@ +From 9c100b4d67397bd096de6caaef58cd8c9f49c692 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 23 Sep 2025 12:03:42 +0200 +Subject: [PATCH 2/2] Migrate from deprecated Hamcrest `is` to `isA` + +Replace usages of `is(Class)` with `isA(Class)` in +`EasyMockSupportClassTest` to avoid relying on the deprecated +`org.hamcrest.core.Is.is` method. This removes the need for +`@SuppressWarnings("deprecation")` and keeps the tests aligned with +current Hamcrest best practices. +--- + .../tests2/EasyMockSupportClassTest.java | 21 +++++++++---------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +index cbe9e01..9b89ed5 100644 +--- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java ++++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +@@ -25,12 +25,11 @@ import org.junit.jupiter.api.Test; + import java.lang.reflect.Method; + + import static org.easymock.EasyMock.*; +-import static org.hamcrest.core.Is.*; ++import static org.hamcrest.core.Is.isA; + + /** + * @author Henri Tremblay + */ +-@SuppressWarnings("deprecation") + class EasyMockSupportClassTest extends EasyMockSupport { + + public static class ToMock { +@@ -49,49 +48,49 @@ class EasyMockSupportClassTest extends EasyMockSupport { + @Test + void testCreateStrictControl() { + IMocksControl ctrl = createStrictControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateControl() { + IMocksControl ctrl = createControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceControl() { + IMocksControl ctrl = createNiceControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateStrictMockClassOfT() { +- MatcherAssert.assertThat(createStrictMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createStrictMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateStrictMockStringClassOfT() { +- MatcherAssert.assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createStrictMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateMockClassOfT() { +- MatcherAssert.assertThat(createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateMockStringClassOfT() { +- MatcherAssert.assertThat(createMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceMockClassOfT() { +- MatcherAssert.assertThat(createNiceMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createNiceMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceMockStringClassOfT() { +- MatcherAssert.assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createNiceMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test +-- +2.51.0 + diff --git a/0002-Unshade-cglib-and-asm.patch b/0002-Unshade-cglib-and-asm.patch deleted file mode 100644 index 93d3367..0000000 --- a/0002-Unshade-cglib-and-asm.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2ad2e79989f64072d8437ada55b12eaa8c23834d Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 30 May 2016 15:14:40 +0200 -Subject: [PATCH 2/3] Unshade cglib and asm - ---- - core/pom.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/pom.xml b/core/pom.xml -index 1ca847a..5ed6adb 100644 ---- a/core/pom.xml -+++ b/core/pom.xml -@@ -100,8 +100,8 @@ - true - - -- org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm -- org.easymock,org.easymock.internal;poweruser=true,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm,org.objenesis;resolution:=optional -+ org.easymock.internal.*;poweruser=true;mandatory:=poweruser -+ org.easymock,org.easymock.internal;poweruser=true,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.objectweb.asm,org.objenesis;resolution:=optional - - - --- -2.13.5 - diff --git a/0003-Fix-OSGi-manifest.patch b/0003-Fix-OSGi-manifest.patch deleted file mode 100644 index d4b3263..0000000 --- a/0003-Fix-OSGi-manifest.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fa908a1748cb3090d677a63db4986ffc57acbf1e Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 1 Jun 2016 09:31:44 +0200 -Subject: [PATCH 3/3] Fix OSGi manifest - -Resolves: rhbz#1341052 ---- - core/pom.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/core/pom.xml b/core/pom.xml -index 5ed6adb..ea6d015 100644 ---- a/core/pom.xml -+++ b/core/pom.xml -@@ -100,8 +100,9 @@ - true - - -- org.easymock.internal.*;poweruser=true;mandatory:=poweruser -+ org.easymock,org.easymock.internal.*;poweruser=true;mandatory:=poweruser - org.easymock,org.easymock.internal;poweruser=true,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.objectweb.asm,org.objenesis;resolution:=optional -+ <_nouses>true - - - --- -2.13.5 - diff --git a/0004-Port-to-hamcrest-2.1.patch b/0004-Port-to-hamcrest-2.1.patch deleted file mode 100644 index 542db7e..0000000 --- a/0004-Port-to-hamcrest-2.1.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5393d71f7bf9de06efd763c501486bf14413ab4a Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 29 Aug 2019 15:18:53 +0200 -Subject: [PATCH] Port to hamcrest 2.1 - ---- - .../tests2/EasyMockSupportClassTest.java | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java -index c5dd63b..b8be307 100644 ---- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java -+++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java -@@ -48,49 +48,49 @@ public class EasyMockSupportClassTest extends EasyMockSupport { - @Test - public void testCreateStrictControl() { - IMocksControl ctrl = createStrictControl(); -- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); -+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateControl() { - IMocksControl ctrl = createControl(); -- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); -+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateNiceControl() { - IMocksControl ctrl = createNiceControl(); -- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); -+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateStrictMockClassOfT() { -- assertThat(createStrictMock(ToMock.class), is(ToMock.class)); -+ assertThat(createStrictMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateStrictMockStringClassOfT() { -- assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class)); -+ assertThat(createStrictMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateMockClassOfT() { -- assertThat(createMock(ToMock.class), is(ToMock.class)); -+ assertThat(createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateMockStringClassOfT() { -- assertThat(createMock("myMock", ToMock.class), is(ToMock.class)); -+ assertThat(createMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateNiceMockClassOfT() { -- assertThat(createNiceMock(ToMock.class), is(ToMock.class)); -+ assertThat(createNiceMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateNiceMockStringClassOfT() { -- assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class)); -+ assertThat(createNiceMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test --- -2.21.0 - diff --git a/easymock.spec b/easymock.spec index eadbda3..20ee9a9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: easymock -Version: 4.3 +Version: 5.6.0 Release: %autorelease Summary: Easy mock objects License: Apache-2.0 @@ -15,16 +15,15 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh Patch: 0001-Disable-android-support.patch -Patch: 0002-Unshade-cglib-and-asm.patch -Patch: 0003-Fix-OSGi-manifest.patch -Patch: 0004-Port-to-hamcrest-2.1.patch +# Forwarded: https://github.com/easymock/easymock/pull/807 +Patch: 0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) @@ -54,6 +53,8 @@ So EasyMock is a perfect fit for Test-Driven Development. %autosetup -p1 -C +%pom_remove_plugin -r :maven-javadoc-plugin +%pom_remove_plugin -r :maven-source-plugin %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :animal-sniffer-maven-plugin @@ -71,7 +72,6 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java # unbundle asm and cglib %pom_disable_module test-nodeps -%pom_remove_plugin :maven-shade-plugin core # missing test deps %pom_disable_module test-integration @@ -80,9 +80,6 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java # remove some warning caused by unavailable plugin %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin -# retired -%pom_remove_plugin :maven-timestamp-plugin - # For compatibility reasons %mvn_file ":easymock{*}" easymock@1 easymock3@1 diff --git a/sources b/sources index 5f72e52..65a1be4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-4.3.tar.gz) = 694219c948e3db85d75bd368440d24ddb575cc8bf7b436a2ef8cd7eeb8c9d173edfd2bf28bde2aea38587f7df4e50b290003b03e50f069520e5f474dec574fa7 +SHA512 (easymock-5.6.0.tar.gz) = a285cbfbd80eb6dad50f92a6bce7a494a06f8da33350bca41d5e7ead5a76219f5bbcf579e89be34525628bdc6c81b266db697ea2b1d6bf023759c294fd375329