pool/javassist
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 940656 from Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/940656
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javassist?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2021-12-16 20:19:02 +00:00 committed by Git OBS Bridge
commit 219a402c50
6 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
javassist-java8-compat.patch
View File

@ -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 Index: javassist-rel_3_28_0_ga/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 --- javassist-rel_3_28_0_ga.orig/src/main/javassist/Loader.java
@@ -379,9 +379,6 @@ +++ 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) { 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; 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 Index: javassist-rel_3_28_0_ga/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 --- javassist-rel_3_28_0_ga.orig/src/main/javassist/util/proxy/DefineClassHelper.java
@@ -253,23 +253,5 @@ +++ 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() {} 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 Index: javassist-rel_3_28_0_ga/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 --- javassist-rel_3_28_0_ga.orig/src/main/javassist/util/proxy/FactoryHelper.java
@@ -123,8 +123,6 @@ +++ javassist-rel_3_28_0_ga/src/main/javassist/util/proxy/FactoryHelper.java
@@ -148,11 +148,7 @@ public class FactoryHelper {
{ {
try { try {
byte[] b = toBytecode(cf); byte[] b = toBytecode(cf);
- if (ProxyFactory.onlyPublicMethods) - if (ProxyFactory.onlyPublicMethods)
- return DefineClassHelper.toPublicClass(cf.getName(), b); - 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) { catch (IOException e) {
throw new CannotCompileException(e);

106
javassist-osgi.patch
View File

@ -1,53 +1,55 @@
--- javassist-rel_3_23_1_ga/src/main/META-INF/MANIFEST.MF 2018-07-01 19:27:13.000000000 +0200 Index: javassist-rel_3_28_0_ga/src/main/META-INF/MANIFEST.MF
+++ javassist-rel_3_23_1_ga/src/main/META-INF/MANIFEST.MF 2020-03-25 14:51:53.954402117 +0100 ===================================================================
@@ -2,3 +2,50 @@ --- javassist-rel_3_28_0_ga.orig/src/main/META-INF/MANIFEST.MF
Specification-Vendor: Shigeru Chiba, www.javassist.org +++ javassist-rel_3_28_0_ga/src/main/META-INF/MANIFEST.MF
Specification-Version: 3.23.1-GA @@ -3,3 +3,50 @@ Specification-Vendor: Shigeru Chiba, www
Specification-Version: 3.28.0-GA
Main-Class: javassist.CtClass Main-Class: javassist.CtClass
+Bundle-Description: Javassist (JAVA programming ASSISTant) Automatic-Module-Name: org.javassist
+ makes Java bytecode manipulation simple. It is a class + Bundle-Description: Javassist (JAVA programming ASSISTant)
+ library for editing bytecodes in Java. + makes Java bytecode manipulation simple. It is a class
+Bundle-License: http://www.mozilla.org/MPL/MPL-1.1.html, + library for editing bytecodes in Java.
+ http://www.gnu.org/licenses/lgpl-2.1.html, + Bundle-License: http://www.mozilla.org/MPL/MPL-1.1.html,
+ http://www.apache.org/licenses/ + http://www.gnu.org/licenses/lgpl-2.1.html,
+Bundle-ManifestVersion: 2 + http://www.apache.org/licenses/
+Bundle-Name: Javassist + Bundle-ManifestVersion: 2
+Bundle-SymbolicName: javassist + Bundle-Name: Javassist
+Bundle-Vendor: Shigeru Chiba, www.javassist.org + Bundle-SymbolicName: javassist
+Bundle-Version: 3.23.1.GA + Bundle-Vendor: Shigeru Chiba, www.javassist.org
+Export-Package: javassist;version="3.23.1.GA"; + Bundle-Version: 3.28.0.GA
+ uses:="javassist.bytecode,javassist.compiler, + Export-Package: javassist;version="3.28.0.GA";
+ javassist.compiler.ast,javassist.convert,javassist.expr", + uses:="javassist.bytecode,javassist.compiler,
+ javassist.bytecode;version="3.23.1.GA"; + javassist.compiler.ast,javassist.convert,javassist.expr",
+ uses:="javassist,javassist.bytecode.annotation", + javassist.bytecode;version="3.28.0.GA";
+ javassist.bytecode.analysis;version="3.23.1.GA"; + uses:="javassist,javassist.bytecode.annotation",
+ uses:="javassist,javassist.bytecode,javassist.bytecode.stackmap", + javassist.bytecode.analysis;version="3.28.0.GA";
+ javassist.bytecode.annotation;version="3.23.1.GA"; + uses:="javassist,javassist.bytecode,javassist.bytecode.stackmap",
+ uses:="javassist,javassist.bytecode", + javassist.bytecode.annotation;version="3.28.0.GA";
+ javassist.bytecode.stackmap;version="3.23.1.GA"; + uses:="javassist,javassist.bytecode",
+ uses:="javassist,javassist.bytecode", + javassist.bytecode.stackmap;version="3.28.0.GA";
+ javassist.compiler;version="3.23.1.GA"; + uses:="javassist,javassist.bytecode",
+ uses:="javassist,javassist.bytecode,javassist.compiler.ast", + javassist.compiler;version="3.28.0.GA";
+ javassist.compiler.ast;version="3.23.1.GA"; + uses:="javassist,javassist.bytecode,javassist.compiler.ast",
+ uses:="javassist,javassist.compiler", + javassist.compiler.ast;version="3.28.0.GA";
+ javassist.convert;version="3.23.1.GA"; + uses:="javassist,javassist.compiler",
+ uses:="javassist,javassist.bytecode", + javassist.convert;version="3.28.0.GA";
+ javassist.expr;version="3.23.1.GA"; + uses:="javassist,javassist.bytecode",
+ uses:="javassist,javassist.bytecode", + javassist.expr;version="3.28.0.GA";
+ javassist.runtime;version="3.23.1.GA", + uses:="javassist,javassist.bytecode",
+ javassist.scopedpool;version="3.23.1.GA"; + javassist.runtime;version="3.28.0.GA",
+ uses:=javassist, + javassist.scopedpool;version="3.28.0.GA";
+ javassist.tools;version="3.23.1.GA"; + uses:=javassist,
+ uses:=javassist, + javassist.tools;version="3.28.0.GA";
+ javassist.tools.reflect;version="3.23.1.GA"; + uses:=javassist,
+ uses:="javassist,javassist.bytecode", + javassist.tools.reflect;version="3.28.0.GA";
+ javassist.tools.rmi;version="3.23.1.GA"; + uses:="javassist,javassist.bytecode",
+ uses:="javassist,javassist.tools.web", + javassist.tools.rmi;version="3.28.0.GA";
+ javassist.tools.web;version="3.23.1.GA"; + uses:="javassist,javassist.tools.web",
+ uses:=javassist, + javassist.tools.web;version="3.28.0.GA";
+ javassist.util;version="3.23.1.GA"; + uses:=javassist,
+ uses:=javassist, + javassist.util;version="3.28.0.GA";
+ javassist.util.proxy;version="3.23.1.GA"; + uses:=javassist,
+ uses:="javassist,javassist.bytecode" + javassist.util.proxy;version="3.28.0.GA";
+Require-Capability: osgi.ee; + uses:="javassist,javassist.bytecode"
+ filter:="(&(osgi.ee=JavaSE)(version=1.6))" + Require-Capability: osgi.ee;
+ filter:="(&(osgi.ee=JavaSE)(version=1.7))"

7
javassist.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 10 18:51:02 UTC 2021 - David Anes <david.anes@suse.com>
- 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 <fstrba@suse.com> Wed Mar 25 14:07:34 UTC 2020 - Fridrich Strba <fstrba@suse.com>

8
javassist.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package javassist # spec file for package javassist
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# Copyright (c) 2000-2005, JPackage Project # Copyright (c) 2000-2005, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # 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 Name: javassist
Version: 3.23.1 Version: 3.28.0
Release: 0 Release: 0
Summary: Java Programming Assistant: bytecode manipulation Summary: Java Programming Assistant: bytecode manipulation
License: LGPL-2.1-or-later OR MPL-1.1 License: LGPL-2.1-or-later OR MPL-1.1
@ -85,7 +85,7 @@ for j in $(find . -name "*.jar"); do
done done
%build %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 %install
# jars # jars

3
rel_3_23_1_ga.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:feb2630414c4b66c500b2f75867519bbaa68d303bc9db12fbddcca2717db0ada
size 1263745

3
rel_3_28_0_ga.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22ce9eb801e42aa6c985787901cdd0a4a54e7ccc61f9d6ea8b9e1fda0d8b12a0
size 1300405