diff --git a/javassist-osgi.patch b/javassist-osgi.patch index 3c16e05..6f67fd3 100644 --- a/javassist-osgi.patch +++ b/javassist-osgi.patch @@ -1,9 +1,9 @@ -Index: javassist-rel_3_28_0_ga/src/main/META-INF/MANIFEST.MF +Index: javassist-rel_3_29_0_ga/src/main/META-INF/MANIFEST.MF =================================================================== ---- javassist-rel_3_28_0_ga.orig/src/main/META-INF/MANIFEST.MF -+++ javassist-rel_3_28_0_ga/src/main/META-INF/MANIFEST.MF +--- javassist-rel_3_29_0_ga.orig/src/main/META-INF/MANIFEST.MF ++++ javassist-rel_3_29_0_ga/src/main/META-INF/MANIFEST.MF @@ -3,3 +3,50 @@ Specification-Vendor: Shigeru Chiba, www - Specification-Version: 3.28.0-GA + Specification-Version: 3.29.0-GA Main-Class: javassist.CtClass Automatic-Module-Name: org.javassist + Bundle-Description: Javassist (JAVA programming ASSISTant) @@ -16,40 +16,40 @@ Index: javassist-rel_3_28_0_ga/src/main/META-INF/MANIFEST.MF + Bundle-Name: Javassist + Bundle-SymbolicName: javassist + Bundle-Vendor: Shigeru Chiba, www.javassist.org -+ Bundle-Version: 3.28.0.GA -+ Export-Package: javassist;version="3.28.0.GA"; ++ Bundle-Version: 3.19.0.GA ++ Export-Package: javassist;version="3.19.0.GA"; + uses:="javassist.bytecode,javassist.compiler, + javassist.compiler.ast,javassist.convert,javassist.expr", -+ javassist.bytecode;version="3.28.0.GA"; ++ javassist.bytecode;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode.annotation", -+ javassist.bytecode.analysis;version="3.28.0.GA"; ++ javassist.bytecode.analysis;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode,javassist.bytecode.stackmap", -+ javassist.bytecode.annotation;version="3.28.0.GA"; ++ javassist.bytecode.annotation;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.bytecode.stackmap;version="3.28.0.GA"; ++ javassist.bytecode.stackmap;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.compiler;version="3.28.0.GA"; ++ javassist.compiler;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode,javassist.compiler.ast", -+ javassist.compiler.ast;version="3.28.0.GA"; ++ javassist.compiler.ast;version="3.19.0.GA"; + uses:="javassist,javassist.compiler", -+ javassist.convert;version="3.28.0.GA"; ++ javassist.convert;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.expr;version="3.28.0.GA"; ++ javassist.expr;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.runtime;version="3.28.0.GA", -+ javassist.scopedpool;version="3.28.0.GA"; ++ javassist.runtime;version="3.19.0.GA", ++ javassist.scopedpool;version="3.19.0.GA"; + uses:=javassist, -+ javassist.tools;version="3.28.0.GA"; ++ javassist.tools;version="3.19.0.GA"; + uses:=javassist, -+ javassist.tools.reflect;version="3.28.0.GA"; ++ javassist.tools.reflect;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode", -+ javassist.tools.rmi;version="3.28.0.GA"; ++ javassist.tools.rmi;version="3.19.0.GA"; + uses:="javassist,javassist.tools.web", -+ javassist.tools.web;version="3.28.0.GA"; ++ javassist.tools.web;version="3.19.0.GA"; + uses:=javassist, -+ javassist.util;version="3.28.0.GA"; ++ javassist.util;version="3.19.0.GA"; + uses:=javassist, -+ javassist.util.proxy;version="3.28.0.GA"; ++ javassist.util.proxy;version="3.19.0.GA"; + uses:="javassist,javassist.bytecode" + Require-Capability: osgi.ee; + filter:="(&(osgi.ee=JavaSE)(version=1.7))" diff --git a/javassist.changes b/javassist.changes index 1e1e822..fd3aff4 100644 --- a/javassist.changes +++ b/javassist.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Mon May 23 13:16:59 UTC 2022 - David Anes + +- Requires java >= 1.8 + +- Rebased patches: + * javassist-osgi.patch + +- Version update to 3.29.0: + * removes an unused import declaration as PR 384 mentions. + * Merge pull request #382 from tim-hoffman/PR_RemoveStringBuffer + * Merge pull request #383 from tim-hoffman/PR_ArrayCopyPerformance + * uncomments test code suggested by PR405 + * cancels PR#391, which does not pass all the tests + * fixes a wrong indentation + * Merge pull request #391 from derklaro/fix-method-naming-syntax + * does refactoring + * fixes a bug in SignatureAttribute.renameClass(). + * fixs a compilation problem although one test still fails. + * Merge pull request #299 from pietrobraione/master + * Merge branch 'master' into master + * Merge pull request #278 from ximsfei/master + * Merge pull request #390 from derklaro/master + * changes test code because package + java.rmi.activation.ActivationGroupDesc does not exist any + longer. + * deletes src/test/test2/*.class + * Merge pull request #399 from carldea/master + * Merge pull request #409 from aschleck/patch-1 + * Remove redundant type check + * Using TCK Tested JDK builds of OpenJDK + * Merge pull request #395 from aburaksahin/master + * Fix for NullPointerException on detach() + * Only wrap the method name if the method doesn't come from the + same decl class + * Lower requirement for an extra type in constructor to Java 7- + * Replace array copy loop with System.arraycopy + * Replace remaining StringBuffer uses with StringBuilder + * Replace StringBuffer with StringBuilder and other minor String + optimizations + * fixes GitHub Issue 378 (wrong link for apache license) + * updates javassist.Loader to exclude jdk.internal. + * Fixes to support the full syntax of possible signatures + * Fix renaming of classes in presence of generic signatures and + nested classes. + * add unit test + * fixes a bug of ClassFile#renameClass(), some imports could not + be successfully renamed + ------------------------------------------------------------------- Fri Dec 10 18:51:02 UTC 2021 - David Anes diff --git a/javassist.spec b/javassist.spec index 8ba23f4..a462e84 100644 --- a/javassist.spec +++ b/javassist.spec @@ -1,7 +1,7 @@ # # spec file for package javassist # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2000-2005, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -17,9 +17,9 @@ # -%define tar_version rel_3_28_0_ga +%define tar_version rel_3_29_0_ga Name: javassist -Version: 3.28.0 +Version: 3.29.0 Release: 0 Summary: Java Programming Assistant: bytecode manipulation License: LGPL-2.1-or-later OR MPL-1.1 @@ -85,7 +85,7 @@ for j in $(find . -name "*.jar"); do done %build -ant -Dant.build.javac.source=1.7 -Dant.build.javac.target=1.7 dist +ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 dist %install # jars diff --git a/rel_3_28_0_ga.tar.gz b/rel_3_28_0_ga.tar.gz deleted file mode 100644 index 10c4c1d..0000000 --- a/rel_3_28_0_ga.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22ce9eb801e42aa6c985787901cdd0a4a54e7ccc61f9d6ea8b9e1fda0d8b12a0 -size 1300405 diff --git a/rel_3_29_0_ga.tar.gz b/rel_3_29_0_ga.tar.gz new file mode 100644 index 0000000..f527510 --- /dev/null +++ b/rel_3_29_0_ga.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f29d1aeeff5729d9b168ba126515008b4dd983ee8e93b670cffb38f53952b8ab +size 1290728