From 1bc22c089eb159f9e5548f1326917fa0a63c6976136f1a005de7b7a24a53c22d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 Dec 2021 07:41:51 +0000 Subject: [PATCH] Accepting request 940561 from home:david.anes:branches:Java:packages Update to 3.28.0-GA OBS-URL: https://build.opensuse.org/request/show/940561 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javassist?expand=0&rev=32 --- javassist-java8-compat.patch | 33 ++++++----- javassist-osgi.patch | 106 ++++++++++++++++++----------------- javassist.changes | 7 +++ javassist.spec | 8 +-- rel_3_23_1_ga.tar.gz | 3 - rel_3_28_0_ga.tar.gz | 3 + 6 files changed, 88 insertions(+), 72 deletions(-) delete mode 100644 rel_3_23_1_ga.tar.gz create mode 100644 rel_3_28_0_ga.tar.gz diff --git a/javassist-java8-compat.patch b/javassist-java8-compat.patch index 528f62f..7f21aa5 100644 --- a/javassist-java8-compat.patch +++ b/javassist-java8-compat.patch @@ -1,7 +1,8 @@ -diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/Loader.java javassist-rel_3_23_1_ga.new/src/main/javassist/Loader.java ---- javassist-rel_3_23_1_ga/src/main/javassist/Loader.java 2018-07-01 19:27:13.000000000 +0200 -+++ javassist-rel_3_23_1_ga.new/src/main/javassist/Loader.java 2019-04-15 10:53:53.377698340 +0200 -@@ -379,9 +379,6 @@ +Index: javassist-rel_3_28_0_ga/src/main/javassist/Loader.java +=================================================================== +--- javassist-rel_3_28_0_ga.orig/src/main/javassist/Loader.java ++++ javassist-rel_3_28_0_ga/src/main/javassist/Loader.java +@@ -421,9 +421,6 @@ public class Loader extends ClassLoader } private boolean isDefinedPackage(String name) { @@ -11,10 +12,11 @@ diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/Loader.java javassist-re return getPackage(name) == null; } -diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/DefineClassHelper.java javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/DefineClassHelper.java ---- javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/DefineClassHelper.java 2018-07-01 19:27:13.000000000 +0200 -+++ javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/DefineClassHelper.java 2019-04-15 10:53:53.381698361 +0200 -@@ -253,23 +253,5 @@ +Index: javassist-rel_3_28_0_ga/src/main/javassist/util/proxy/DefineClassHelper.java +=================================================================== +--- javassist-rel_3_28_0_ga.orig/src/main/javassist/util/proxy/DefineClassHelper.java ++++ javassist-rel_3_28_0_ga/src/main/javassist/util/proxy/DefineClassHelper.java +@@ -317,23 +317,5 @@ public class DefineClassHelper { } } @@ -38,15 +40,20 @@ diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/DefineClassHe - private DefineClassHelper() {} } -diff -urEbwB javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/FactoryHelper.java javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/FactoryHelper.java ---- javassist-rel_3_23_1_ga/src/main/javassist/util/proxy/FactoryHelper.java 2018-07-01 19:27:13.000000000 +0200 -+++ javassist-rel_3_23_1_ga.new/src/main/javassist/util/proxy/FactoryHelper.java 2019-04-15 10:56:19.942478868 +0200 -@@ -123,8 +123,6 @@ +Index: javassist-rel_3_28_0_ga/src/main/javassist/util/proxy/FactoryHelper.java +=================================================================== +--- javassist-rel_3_28_0_ga.orig/src/main/javassist/util/proxy/FactoryHelper.java ++++ javassist-rel_3_28_0_ga/src/main/javassist/util/proxy/FactoryHelper.java +@@ -148,11 +148,7 @@ public class FactoryHelper { { try { byte[] b = toBytecode(cf); - if (ProxyFactory.onlyPublicMethods) - return DefineClassHelper.toPublicClass(cf.getName(), b); - return DefineClassHelper.toClass(cf.getName(), loader, domain, b); +- else +- return DefineClassHelper.toClass(cf.getName(), neighbor, +- loader, domain, b); ++ return DefineClassHelper.toClass(cf.getName(), neighbor, loader, domain, b); } catch (IOException e) { + throw new CannotCompileException(e); diff --git a/javassist-osgi.patch b/javassist-osgi.patch index 930ed79..3c16e05 100644 --- a/javassist-osgi.patch +++ b/javassist-osgi.patch @@ -1,53 +1,55 @@ ---- javassist-rel_3_23_1_ga/src/main/META-INF/MANIFEST.MF 2018-07-01 19:27:13.000000000 +0200 -+++ javassist-rel_3_23_1_ga/src/main/META-INF/MANIFEST.MF 2020-03-25 14:51:53.954402117 +0100 -@@ -2,3 +2,50 @@ - Specification-Vendor: Shigeru Chiba, www.javassist.org - Specification-Version: 3.23.1-GA +Index: javassist-rel_3_28_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 +@@ -3,3 +3,50 @@ Specification-Vendor: Shigeru Chiba, www + Specification-Version: 3.28.0-GA Main-Class: javassist.CtClass -+Bundle-Description: Javassist (JAVA programming ASSISTant) -+ makes Java bytecode manipulation simple. It is a class -+ library for editing bytecodes in Java. -+Bundle-License: http://www.mozilla.org/MPL/MPL-1.1.html, -+ http://www.gnu.org/licenses/lgpl-2.1.html, -+ http://www.apache.org/licenses/ -+Bundle-ManifestVersion: 2 -+Bundle-Name: Javassist -+Bundle-SymbolicName: javassist -+Bundle-Vendor: Shigeru Chiba, www.javassist.org -+Bundle-Version: 3.23.1.GA -+Export-Package: javassist;version="3.23.1.GA"; -+ uses:="javassist.bytecode,javassist.compiler, -+ javassist.compiler.ast,javassist.convert,javassist.expr", -+ javassist.bytecode;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode.annotation", -+ javassist.bytecode.analysis;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode,javassist.bytecode.stackmap", -+ javassist.bytecode.annotation;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode", -+ javassist.bytecode.stackmap;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode", -+ javassist.compiler;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode,javassist.compiler.ast", -+ javassist.compiler.ast;version="3.23.1.GA"; -+ uses:="javassist,javassist.compiler", -+ javassist.convert;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode", -+ javassist.expr;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode", -+ javassist.runtime;version="3.23.1.GA", -+ javassist.scopedpool;version="3.23.1.GA"; -+ uses:=javassist, -+ javassist.tools;version="3.23.1.GA"; -+ uses:=javassist, -+ javassist.tools.reflect;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode", -+ javassist.tools.rmi;version="3.23.1.GA"; -+ uses:="javassist,javassist.tools.web", -+ javassist.tools.web;version="3.23.1.GA"; -+ uses:=javassist, -+ javassist.util;version="3.23.1.GA"; -+ uses:=javassist, -+ javassist.util.proxy;version="3.23.1.GA"; -+ uses:="javassist,javassist.bytecode" -+Require-Capability: osgi.ee; -+ filter:="(&(osgi.ee=JavaSE)(version=1.6))" + Automatic-Module-Name: org.javassist ++ Bundle-Description: Javassist (JAVA programming ASSISTant) ++ makes Java bytecode manipulation simple. It is a class ++ library for editing bytecodes in Java. ++ Bundle-License: http://www.mozilla.org/MPL/MPL-1.1.html, ++ http://www.gnu.org/licenses/lgpl-2.1.html, ++ http://www.apache.org/licenses/ ++ Bundle-ManifestVersion: 2 ++ 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"; ++ uses:="javassist.bytecode,javassist.compiler, ++ javassist.compiler.ast,javassist.convert,javassist.expr", ++ javassist.bytecode;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode.annotation", ++ javassist.bytecode.analysis;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode,javassist.bytecode.stackmap", ++ javassist.bytecode.annotation;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode", ++ javassist.bytecode.stackmap;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode", ++ javassist.compiler;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode,javassist.compiler.ast", ++ javassist.compiler.ast;version="3.28.0.GA"; ++ uses:="javassist,javassist.compiler", ++ javassist.convert;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode", ++ javassist.expr;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode", ++ javassist.runtime;version="3.28.0.GA", ++ javassist.scopedpool;version="3.28.0.GA"; ++ uses:=javassist, ++ javassist.tools;version="3.28.0.GA"; ++ uses:=javassist, ++ javassist.tools.reflect;version="3.28.0.GA"; ++ uses:="javassist,javassist.bytecode", ++ javassist.tools.rmi;version="3.28.0.GA"; ++ uses:="javassist,javassist.tools.web", ++ javassist.tools.web;version="3.28.0.GA"; ++ uses:=javassist, ++ javassist.util;version="3.28.0.GA"; ++ uses:=javassist, ++ javassist.util.proxy;version="3.28.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 9c9d9ab..1e1e822 100644 --- a/javassist.changes +++ b/javassist.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 10 18:51:02 UTC 2021 - David Anes + +- Rebased osgi patch: javassist-osgi.patch +- Rebased java8 compat patch: javassist-java8-compat.patch +- Requires Java API >= 1.7 + ------------------------------------------------------------------- Wed Mar 25 14:07:34 UTC 2020 - Fridrich Strba diff --git a/javassist.spec b/javassist.spec index 5ea70a7..8ba23f4 100644 --- a/javassist.spec +++ b/javassist.spec @@ -1,7 +1,7 @@ # # spec file for package javassist # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 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_23_1_ga +%define tar_version rel_3_28_0_ga Name: javassist -Version: 3.23.1 +Version: 3.28.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.6 -Dant.build.javac.target=1.6 dist +ant -Dant.build.javac.source=1.7 -Dant.build.javac.target=1.7 dist %install # jars diff --git a/rel_3_23_1_ga.tar.gz b/rel_3_23_1_ga.tar.gz deleted file mode 100644 index 63f5a1f..0000000 --- a/rel_3_23_1_ga.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:feb2630414c4b66c500b2f75867519bbaa68d303bc9db12fbddcca2717db0ada -size 1263745 diff --git a/rel_3_28_0_ga.tar.gz b/rel_3_28_0_ga.tar.gz new file mode 100644 index 0000000..10c4c1d --- /dev/null +++ b/rel_3_28_0_ga.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22ce9eb801e42aa6c985787901cdd0a4a54e7ccc61f9d6ea8b9e1fda0d8b12a0 +size 1300405