From 6053e08f02f41c69c846ac7d8798a2aa98e35448 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 02 2020 15:08:54 +0000 Subject: update to version 3.27.0 --- diff --git a/.gitignore b/.gitignore index 9892537..ea498fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ -javassist3.9.GA.zip -javassist-3.14.0-GA.zip -javassist-3.15.0-GA.zip +/results_* +/*.src.rpm + +/javassist3.9.GA.zip +/javassist-3.14.0-GA.zip +/javassist-3.15.0-GA.zip /javassist-3.16.1-GA.zip /rel_3_18_1_ga.tar.gz /rel_3_21_0_ga.tar.gz +/javassist-3.27.0.tar.gz diff --git a/0001-Remove-usage-of-junit.awtui-and-junit.swingui.patch b/0001-Remove-usage-of-junit.awtui-and-junit.swingui.patch deleted file mode 100644 index 1947278..0000000 --- a/0001-Remove-usage-of-junit.awtui-and-junit.swingui.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 665f967f23ffed9445e1a0d045ae3a9625db3e90 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 28 Apr 2014 16:25:41 +0200 -Subject: [PATCH] Remove usage of junit.awtui and junit.swingui - ---- - src/test/javassist/Bench.java | 5 ----- - src/test/javassist/bytecode/BytecodeTest.java | 6 ------ - src/test/javassist/compiler/CompTest.java | 6 ------ - 3 files changed, 17 deletions(-) - -diff --git a/src/test/javassist/Bench.java b/src/test/javassist/Bench.java -index 723fa19..b7b8b27 100644 ---- a/src/test/javassist/Bench.java -+++ b/src/test/javassist/Bench.java -@@ -153,11 +153,6 @@ public class Bench extends JvstTestRoot { - System.out.println("println: " + (t5 * 10) + " usec"); - } - -- public static void main(String[] args) { -- // junit.textui.TestRunner.run(suite()); -- junit.swingui.TestRunner.main(new String[] { "javassist.Bench" }); -- } -- - public static Test suite() { - TestSuite suite = new TestSuite("Benchmark Tests"); - suite.addTestSuite(Bench.class); -diff --git a/src/test/javassist/bytecode/BytecodeTest.java b/src/test/javassist/bytecode/BytecodeTest.java -index b918750..a53f030 100644 ---- a/src/test/javassist/bytecode/BytecodeTest.java -+++ b/src/test/javassist/bytecode/BytecodeTest.java -@@ -826,12 +826,6 @@ public class BytecodeTest extends TestCase { - assertEquals("(I)V", cPool2.getUtf8Info(cPool2.getMethodTypeInfo(mtIndex))); - } - -- public static void main(String[] args) { -- // junit.textui.TestRunner.run(suite()); -- junit.awtui.TestRunner.main(new String[] { -- "javassist.bytecode.BytecodeTest" }); -- } -- - public static Test suite() { - TestSuite suite = new TestSuite("Bytecode Tests"); - suite.addTestSuite(BytecodeTest.class); -diff --git a/src/test/javassist/compiler/CompTest.java b/src/test/javassist/compiler/CompTest.java -index 6a1d542..158552e 100644 ---- a/src/test/javassist/compiler/CompTest.java -+++ b/src/test/javassist/compiler/CompTest.java -@@ -113,12 +113,6 @@ public class CompTest extends TestCase { - assertEquals("(int,char[],String)", s); - } - -- public static void main(String[] args) { -- // junit.textui.TestRunner.run(suite()); -- junit.awtui.TestRunner.main(new String[] { -- "javassist.compiler.CompTest" }); -- } -- - public static Test suite() { - TestSuite suite = new TestSuite("Compiler Tests"); - suite.addTestSuite(CompTest.class); --- -1.9.0 - diff --git a/javassist.spec b/javassist.spec index bd6ac6e..5ba63c5 100644 --- a/javassist.spec +++ b/javassist.spec @@ -1,21 +1,20 @@ -%global upstream_version rel_%(sed s/\\\\./_/g <<<"%{version}")_ga - Name: javassist -Version: 3.21.0 -Release: 3%{?dist} -Summary: The Java Programming Assistant provides simple Java bytecode manipulation +Version: 3.27.0 +Release: 1%{?dist} +Summary: Java Programming Assistant for Java bytecode manipulation License: MPLv1.1 or LGPLv2+ or ASL 2.0 -URL: https://www.javassist.org/ -BuildArch: noarch -Source0: https://github.com/jboss-%{name}/%{name}/archive/%{upstream_version}.tar.gz +%global upstream_version rel_%(sed s/\\\\./_/g <<<"%{version}")_ga -Patch0: 0001-Remove-usage-of-junit.awtui-and-junit.swingui.patch +URL: https://www.javassist.org/ +Source0: https://github.com/jboss-%{name}/%{name}/archive/%{upstream_version}/%{name}-%{version}.tar.gz + +BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.hamcrest:hamcrest-all) %description Javassist enables Java programs to define a new class at runtime and to @@ -29,38 +28,54 @@ source text; Javassist compiles it on the fly. On the other hand, the bytecode-level API allows the users to directly edit a class file as other editors. + %package javadoc -Summary: Javadocs for javassist -Requires: jpackage-utils +Summary: Javadocs for javassist %description javadoc javassist development documentation. + %prep %setup -q -n %{name}-%{upstream_version} -find . -name \*.jar -type f -delete -mkdir runtest -%patch0 -p1 -%pom_xpath_remove "pom:profile[pom:id='default-tools']" -%pom_add_dep com.sun:tools -%mvn_file : %{name} +# remove unnecessary maven plugins +%pom_remove_plugin :maven-source-plugin + +# disable profiles that only add com.sun:tools dependency +%pom_xpath_remove "pom:profiles" + +# add compatibility alias for old maven artifact coordinates %mvn_alias : %{name}:%{name} +# add compatibility symlink for old classpath +%mvn_file : %{name} + + %build -# TODO: enable tests -%mvn_build -f +%mvn_build + +# remove bundled jar and class files *after* they were used for running tests +rm javassist.jar src/test/resources/*.jar +find src/test -name "*.class" -print -delete + %install %mvn_install + %files -f .mfiles -%doc License.html Readme.html +%license License.html +%doc Readme.html %files javadoc -f .mfiles-javadoc -%doc License.html +%license License.html + %changelog +* Wed Sep 02 2020 Fabio Valentini - 3.27.0-1 +- Update to version 3.27.0. + * Tue Jul 28 2020 Fedora Release Engineering - 3.21.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -175,3 +190,4 @@ mkdir runtest * Tue Dec 16 2008 Sandro Mathys - 3.9.0-1 - initial build + diff --git a/sources b/sources index 0154448..4056f81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rel_3_21_0_ga.tar.gz) = 5dd855be18629306348f5a3a2d738880e6b79ac7a570ff16ddd22a5b3d23581fea1bf54b099d88c543b7045e9ff69d1e5e8fc6a323faa3dc1aa2076b164e5323 +SHA512 (javassist-3.27.0.tar.gz) = 1057505fd3ada0ff578dc244a593941e78d5fbb9b42b8e1caf77534dd06846b0f38d709ce4ee68c0a3484a69a53045e79581d2d7e860fc1d4414bd370aa9b44d