From fe88f72a6852263b6f561c7b6c184da8437c0652 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 31 Aug 2020 17:06:44 +0200 Subject: [PATCH] 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