[Git][java-team/cglib][master] 8 commits: New upstream version 3.3.0
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Mon May 30 14:05:20 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / cglib
Commits:
b6a05fff by Emmanuel Bourg at 2020-08-06T10:17:08+02:00
New upstream version 3.3.0
- - - - -
4e768378 by Emmanuel Bourg at 2020-08-06T10:17:09+02:00
Update upstream source from tag 'upstream/3.3.0'
Update to upstream version '3.3.0'
with Debian dir b49eaa77a0f48f24d2b947cdaabb2b340d0e469b
- - - - -
59b8e1ec by Emmanuel Bourg at 2022-05-30T14:56:55+02:00
New upstream release (3.3.0)
- - - - -
a843ad27 by Emmanuel Bourg at 2022-05-30T14:57:01+02:00
Standards-Version updated to 4.6.1
- - - - -
939d06f7 by Emmanuel Bourg at 2022-05-30T14:57:11+02:00
Switch to debhelper level 13
- - - - -
93db8086 by Emmanuel Bourg at 2022-05-30T14:59:16+02:00
Removed the -java-doc package
- - - - -
0512acbe by Emmanuel Bourg at 2022-05-30T15:04:36+02:00
Fixed some of the test failures with OpenJDK 17 (Closes: #1011566)
- - - - -
c3ba91cf by Emmanuel Bourg at 2022-05-30T15:04:59+02:00
Upload to unstable
- - - - -
28 changed files:
- cglib-integration-test/pom.xml
- cglib-jmh/pom.xml
- cglib-nodep/pom.xml
- cglib-sample/pom.xml
- cglib/pom.xml
- cglib/src/main/java/net/sf/cglib/beans/BeanCopier.java
- cglib/src/main/java/net/sf/cglib/beans/BeanGenerator.java
- cglib/src/main/java/net/sf/cglib/beans/BeanMapEmitter.java
- cglib/src/main/java/net/sf/cglib/beans/BulkBeanEmitter.java
- cglib/src/main/java/net/sf/cglib/beans/ImmutableBean.java
- cglib/src/main/java/net/sf/cglib/core/CodeEmitter.java
- cglib/src/main/java/net/sf/cglib/core/KeyFactory.java
- cglib/src/main/java/net/sf/cglib/proxy/Enhancer.java
- cglib/src/main/java/net/sf/cglib/proxy/InterfaceMaker.java
- cglib/src/main/java/net/sf/cglib/proxy/MixinEmitter.java
- cglib/src/main/java/net/sf/cglib/reflect/ConstructorDelegate.java
- cglib/src/main/java/net/sf/cglib/reflect/FastClassEmitter.java
- cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java
- cglib/src/main/java/net/sf/cglib/reflect/MulticastDelegate.java
- cglib/src/main/java/net/sf/cglib/util/ParallelSorterEmitter.java
- cglib/src/main/java/net/sf/cglib/util/StringSwitcher.java
- debian/changelog
- − debian/compat
- debian/control
- − debian/libcglib-java-doc.doc-base
- − debian/libcglib-java-doc.install
- debian/maven.properties
- pom.xml
Changes:
=====================================
cglib-integration-test/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.12</version>
+ <version>3.3.0</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib-jmh/pom.xml
=====================================
@@ -7,7 +7,7 @@
<parent>
<artifactId>cglib-parent</artifactId>
<groupId>cglib</groupId>
- <version>3.2.12</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
=====================================
cglib-nodep/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.12</version>
+ <version>3.3.0</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib-sample/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.12</version>
+ <version>3.3.0</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib/pom.xml
=====================================
@@ -9,7 +9,7 @@
<parent>
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.12</version>
+ <version>3.3.0</version>
</parent>
<!-- ====================================================================== -->
=====================================
cglib/src/main/java/net/sf/cglib/beans/BeanCopier.java
=====================================
@@ -99,7 +99,7 @@ abstract public class BeanCopier
Type sourceType = Type.getType(source);
Type targetType = Type.getType(target);
ClassEmitter ce = new ClassEmitter(v);
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
BEAN_COPIER,
=====================================
cglib/src/main/java/net/sf/cglib/beans/BeanGenerator.java
=====================================
@@ -102,7 +102,7 @@ public class BeanGenerator extends AbstractClassGenerator
types[i] = (Type)props.get(names[i]);
}
ClassEmitter ce = new ClassEmitter(v);
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
superclass != null ? Type.getType(superclass) : Constants.TYPE_OBJECT,
=====================================
cglib/src/main/java/net/sf/cglib/beans/BeanMapEmitter.java
=====================================
@@ -45,7 +45,7 @@ class BeanMapEmitter extends ClassEmitter {
public BeanMapEmitter(ClassVisitor v, String className, Class type, int require) {
super(v);
- begin_class(Constants.V1_2, Constants.ACC_PUBLIC, className, BEAN_MAP, null, Constants.SOURCE_FILE);
+ begin_class(Constants.V1_8, Constants.ACC_PUBLIC, className, BEAN_MAP, null, Constants.SOURCE_FILE);
EmitUtils.null_constructor(this);
EmitUtils.factory_method(this, NEW_INSTANCE);
generateConstructor();
=====================================
cglib/src/main/java/net/sf/cglib/beans/BulkBeanEmitter.java
=====================================
@@ -47,7 +47,7 @@ class BulkBeanEmitter extends ClassEmitter {
Method[] setters = new Method[setterNames.length];
validate(target, getterNames, setterNames, types, getters, setters);
- begin_class(Constants.V1_2, Constants.ACC_PUBLIC, className, BULK_BEAN, null, Constants.SOURCE_FILE);
+ begin_class(Constants.V1_8, Constants.ACC_PUBLIC, className, BULK_BEAN, null, Constants.SOURCE_FILE);
EmitUtils.null_constructor(this);
generateGet(target, getters);
generateSet(target, setters);
=====================================
cglib/src/main/java/net/sf/cglib/beans/ImmutableBean.java
=====================================
@@ -73,7 +73,7 @@ public class ImmutableBean
public void generateClass(ClassVisitor v) {
Type targetType = Type.getType(target);
ClassEmitter ce = new ClassEmitter(v);
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
targetType,
=====================================
cglib/src/main/java/net/sf/cglib/core/CodeEmitter.java
=====================================
@@ -476,7 +476,7 @@ public class CodeEmitter extends LocalVariablesSorter {
}
public void super_invoke(Signature sig) {
- emit_invoke(Constants.INVOKESPECIAL, ce.getSuperType(), sig);
+ emit_invoke(Constants.INVOKESPECIAL, ce.getSuperType(), sig, false);
}
public void invoke_constructor(Type type) {
@@ -491,7 +491,7 @@ public class CodeEmitter extends LocalVariablesSorter {
invoke_constructor(ce.getClassType());
}
- private void emit_invoke(int opcode, Type type, Signature sig) {
+ private void emit_invoke(int opcode, Type type, Signature sig, boolean isInterface) {
if (sig.getName().equals(Constants.CONSTRUCTOR_NAME) &&
((opcode == Constants.INVOKEVIRTUAL) ||
(opcode == Constants.INVOKESTATIC))) {
@@ -501,19 +501,24 @@ public class CodeEmitter extends LocalVariablesSorter {
type.getInternalName(),
sig.getName(),
sig.getDescriptor(),
- opcode == Opcodes.INVOKEINTERFACE);
+ isInterface);
}
public void invoke_interface(Type owner, Signature sig) {
- emit_invoke(Constants.INVOKEINTERFACE, owner, sig);
+ emit_invoke(Constants.INVOKEINTERFACE, owner, sig, true);
}
public void invoke_virtual(Type owner, Signature sig) {
- emit_invoke(Constants.INVOKEVIRTUAL, owner, sig);
+ emit_invoke(Constants.INVOKEVIRTUAL, owner, sig, false);
}
+ @Deprecated
public void invoke_static(Type owner, Signature sig) {
- emit_invoke(Constants.INVOKESTATIC, owner, sig);
+ invoke_static(owner, sig, false);
+ }
+
+ public void invoke_static(Type owner, Signature sig, boolean isInterface) {
+ emit_invoke(Constants.INVOKESTATIC, owner, sig, isInterface);
}
public void invoke_virtual_this(Signature sig) {
@@ -525,7 +530,7 @@ public class CodeEmitter extends LocalVariablesSorter {
}
public void invoke_constructor(Type type, Signature sig) {
- emit_invoke(Constants.INVOKESPECIAL, type, sig);
+ emit_invoke(Constants.INVOKESPECIAL, type, sig, false);
}
public void invoke_constructor_this(Signature sig) {
@@ -850,7 +855,7 @@ public class CodeEmitter extends LocalVariablesSorter {
if (sig.getName().equals(Constants.CONSTRUCTOR_NAME)) {
invoke_constructor(type, sig);
} else if (TypeUtils.isStatic(method.getModifiers())) {
- invoke_static(type, sig);
+ invoke_static(type, sig, TypeUtils.isInterface(classInfo.getModifiers()));
} else if (TypeUtils.isInterface(classInfo.getModifiers())) {
invoke_interface(type, sig);
} else {
=====================================
cglib/src/main/java/net/sf/cglib/core/KeyFactory.java
=====================================
@@ -246,7 +246,7 @@ abstract public class KeyFactory {
}
Type[] parameterTypes = TypeUtils.getTypes(newInstance.getParameterTypes());
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
KEY_FACTORY,
=====================================
cglib/src/main/java/net/sf/cglib/proxy/Enhancer.java
=====================================
@@ -591,7 +591,7 @@ public class Enhancer extends AbstractClassGenerator
ClassEmitter e = new ClassEmitter(v);
if (currentData == null) {
- e.begin_class(Constants.V1_2,
+ e.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
Type.getType(sc),
@@ -600,7 +600,7 @@ public class Enhancer extends AbstractClassGenerator
TypeUtils.getTypes(interfaces)),
Constants.SOURCE_FILE);
} else {
- e.begin_class(Constants.V1_2,
+ e.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
null,
=====================================
cglib/src/main/java/net/sf/cglib/proxy/InterfaceMaker.java
=====================================
@@ -100,8 +100,8 @@ public class InterfaceMaker extends AbstractClassGenerator
public void generateClass(ClassVisitor v) throws Exception {
ClassEmitter ce = new ClassEmitter(v);
- ce.begin_class(Constants.V1_2,
- Constants.ACC_PUBLIC | Constants.ACC_INTERFACE,
+ ce.begin_class(Constants.V1_8,
+ Constants.ACC_PUBLIC | Constants.ACC_INTERFACE | Constants.ACC_ABSTRACT,
getClassName(),
null,
null,
=====================================
cglib/src/main/java/net/sf/cglib/proxy/MixinEmitter.java
=====================================
@@ -37,7 +37,7 @@ class MixinEmitter extends ClassEmitter {
public MixinEmitter(ClassVisitor v, String className, Class[] classes, int[] route) {
super(v);
- begin_class(Constants.V1_2,
+ begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
className,
MIXIN,
=====================================
cglib/src/main/java/net/sf/cglib/reflect/ConstructorDelegate.java
=====================================
@@ -92,7 +92,7 @@ abstract public class ConstructorDelegate {
}
ClassEmitter ce = new ClassEmitter(v);
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
CONSTRUCTOR_DELEGATE,
=====================================
cglib/src/main/java/net/sf/cglib/reflect/FastClassEmitter.java
=====================================
@@ -53,7 +53,7 @@ class FastClassEmitter extends ClassEmitter {
super(v);
Type base = Type.getType(type);
- begin_class(Constants.V1_2, Constants.ACC_PUBLIC, className, FAST_CLASS, null, Constants.SOURCE_FILE);
+ begin_class(Constants.V1_8, Constants.ACC_PUBLIC, className, FAST_CLASS, null, Constants.SOURCE_FILE);
// constructor
CodeEmitter e = begin_method(Constants.ACC_PUBLIC, CSTRUCT_CLASS, null);
=====================================
cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java
=====================================
@@ -218,7 +218,7 @@ abstract public class MethodDelegate {
ClassEmitter ce = new ClassEmitter(v);
CodeEmitter e;
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
METHOD_DELEGATE,
=====================================
cglib/src/main/java/net/sf/cglib/reflect/MulticastDelegate.java
=====================================
@@ -102,7 +102,7 @@ abstract public class MulticastDelegate implements Cloneable {
final MethodInfo method = ReflectUtils.getMethodInfo(ReflectUtils.findInterfaceMethod(iface));
ClassEmitter ce = new ClassEmitter(cv);
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
MULTICAST_DELEGATE,
=====================================
cglib/src/main/java/net/sf/cglib/util/ParallelSorterEmitter.java
=====================================
@@ -33,7 +33,7 @@ class ParallelSorterEmitter extends ClassEmitter {
public ParallelSorterEmitter(ClassVisitor v, String className, Object[] arrays) {
super(v);
- begin_class(Constants.V1_2, Constants.ACC_PUBLIC, className, PARALLEL_SORTER, null, Constants.SOURCE_FILE);
+ begin_class(Constants.V1_8, Constants.ACC_PUBLIC, className, PARALLEL_SORTER, null, Constants.SOURCE_FILE);
EmitUtils.null_constructor(this);
EmitUtils.factory_method(this, NEW_INSTANCE);
generateConstructor(arrays);
=====================================
cglib/src/main/java/net/sf/cglib/util/StringSwitcher.java
=====================================
@@ -118,7 +118,7 @@ abstract public class StringSwitcher {
public void generateClass(ClassVisitor v) throws Exception {
ClassEmitter ce = new ClassEmitter(v);
- ce.begin_class(Constants.V1_2,
+ ce.begin_class(Constants.V1_8,
Constants.ACC_PUBLIC,
getClassName(),
STRING_SWITCHER,
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+cglib (3.3.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fixed some of the test failures with OpenJDK 17 (Closes: #1011566)
+ * Standards-Version updated to 4.6.1
+ * Switch to debhelper level 13
+ * Removed the -java-doc package
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 30 May 2022 15:04:55 +0200
+
cglib (3.2.12-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -5,14 +5,13 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
ant,
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
junit4,
libasm-java (>= 7.0),
libjarjar-maven-plugin-java,
- libmaven-javadoc-plugin-java,
maven-debian-helper (>= 2.0.4)
-Standards-Version: 4.4.0
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/cglib.git
Vcs-Browser: https://salsa.debian.org/java-team/cglib
Homepage: http://cglib.sourceforge.net
@@ -38,15 +37,3 @@ Description: Code generation library for Java (without dependencies)
run-time.
.
This package contains the cglib-nodep artifact.
-
-Package: libcglib-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: libcglib-java
-Description: Code generation library for Java (documentation)
- cglib is a powerful, high performance and quality code generation
- library. It is used to extend Java classes and implement interfaces at
- run-time.
- .
- This package includes the documentation.
=====================================
debian/libcglib-java-doc.doc-base deleted
=====================================
@@ -1,8 +0,0 @@
-Document: libcglib-java
-Title: API Javadoc for CGLIB
-Abstract: This is the API Javadoc provided for the libcglib-java library..
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libcglib-java/api/index.html
-Files: /usr/share/doc/libcglib-java/api/*
=====================================
debian/libcglib-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-target/site/apidocs/* /usr/share/doc/libcglib-java/api/
=====================================
debian/maven.properties
=====================================
@@ -1 +1,3 @@
maven.test.failure.ignore=true
+
+argLine=--add-opens java.base/java.lang=ALL-UNNAMED
=====================================
pom.xml
=====================================
@@ -14,7 +14,7 @@
<!-- ====================================================================== -->
<groupId>cglib</groupId>
<artifactId>cglib-parent</artifactId>
- <version>3.2.12</version>
+ <version>3.3.0</version>
<packaging>pom</packaging>
<name>Code Generation Library</name>
View it on GitLab: https://salsa.debian.org/java-team/cglib/-/compare/2a2bdea92261a84b2517d0885bbfea42f834630e...c3ba91cff2668e533e7bacfd42b3faaa8224302a
--
View it on GitLab: https://salsa.debian.org/java-team/cglib/-/compare/2a2bdea92261a84b2517d0885bbfea42f834630e...c3ba91cff2668e533e7bacfd42b3faaa8224302a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220530/c8729cd2/attachment.htm>
More information about the pkg-java-commits
mailing list