From 4451e39718892ba617d9d7be18e4d10aeed5c143998254d187b51133e57d95c6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 17 Apr 2023 06:02:17 +0000 Subject: [PATCH] Accepting request 1079678 from home:urbic:branches:Java:packages - Update to v1.14.4 * Changes of v1.14.4 + Include instrumented type and auxiliary types in TypePool that is passed to TypeWriter. - Remove patch: * 00-asm5.patch - not needed due to update of objectweb-asm OBS-URL: https://build.opensuse.org/request/show/1079678 OBS-URL: https://build.opensuse.org/package/show/Java:packages/byte-buddy?expand=0&rev=2 --- 00-asm5.patch | 58 ------------------- byte-buddy-1.14.3.jar | 3 - byte-buddy-1.14.3.tar.gz | 3 - byte-buddy-1.14.4.jar | 3 + ...-buddy-1.14.3.pom => byte-buddy-1.14.4.pom | 2 +- byte-buddy-1.14.4.tar.gz | 3 + byte-buddy-maven-plugin-1.14.3.jar | 3 - byte-buddy-maven-plugin-1.14.4.jar | 3 + ....pom => byte-buddy-maven-plugin-1.14.4.pom | 2 +- byte-buddy.changes | 14 +++++ byte-buddy.spec | 4 +- 11 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 00-asm5.patch delete mode 100644 byte-buddy-1.14.3.jar delete mode 100644 byte-buddy-1.14.3.tar.gz create mode 100644 byte-buddy-1.14.4.jar rename byte-buddy-1.14.3.pom => byte-buddy-1.14.4.pom (97%) create mode 100644 byte-buddy-1.14.4.tar.gz delete mode 100644 byte-buddy-maven-plugin-1.14.3.jar create mode 100644 byte-buddy-maven-plugin-1.14.4.jar rename byte-buddy-maven-plugin-1.14.3.pom => byte-buddy-maven-plugin-1.14.4.pom (99%) diff --git a/00-asm5.patch b/00-asm5.patch deleted file mode 100644 index f7fac8b..0000000 --- a/00-asm5.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -up byte-buddy-byte-buddy-1.14.3/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java.p00 byte-buddy-byte-buddy-1.14.3/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java ---- byte-buddy-byte-buddy-1.14.3/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java.p00 2023-04-02 19:44:27.558417800 +0300 -+++ byte-buddy-byte-buddy-1.14.3/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java 2023-04-02 19:49:42.414681807 +0300 -@@ -143,12 +143,12 @@ public class ClassFileVersion implements - /** - * The class file version of Java 20. - */ -- public static final ClassFileVersion JAVA_V20 = new ClassFileVersion(Opcodes.V20); -+ //public static final ClassFileVersion JAVA_V20 = new ClassFileVersion(Opcodes.V20); - - /** - * The class file version of Java 21. - */ -- public static final ClassFileVersion JAVA_V21 = new ClassFileVersion(Opcodes.V21); -+ //public static final ClassFileVersion JAVA_V21 = new ClassFileVersion(Opcodes.V21); - - /** - * A version locator for the executing JVM. -@@ -240,10 +240,10 @@ public class ClassFileVersion implements - return JAVA_V18; - } else if (javaVersionString.equals("1.19") || javaVersionString.equals("19")) { - return JAVA_V19; -- } else if (javaVersionString.equals("1.20") || javaVersionString.equals("20")) { -- return JAVA_V20; -- } else if (javaVersionString.equals("1.21") || javaVersionString.equals("21")) { -- return JAVA_V21; -+ //} else if (javaVersionString.equals("1.20") || javaVersionString.equals("20")) { -+ // return JAVA_V20; -+ //} else if (javaVersionString.equals("1.21") || javaVersionString.equals("21")) { -+ // return JAVA_V21; - } else { - if (OpenedClassReader.EXPERIMENTAL) { - try { -@@ -307,10 +307,10 @@ public class ClassFileVersion implements - return JAVA_V18; - case 19: - return JAVA_V19; -- case 20: -- return JAVA_V20; -- case 21: -- return JAVA_V21; -+ //case 20: -+ // return JAVA_V20; -+ //case 21: -+ // return JAVA_V21; - default: - if (OpenedClassReader.EXPERIMENTAL && javaVersion > 0) { - return new ClassFileVersion(BASE_VERSION + javaVersion); -@@ -326,7 +326,8 @@ public class ClassFileVersion implements - * @return The latest officially supported Java version. - */ - public static ClassFileVersion latest() { -- return ClassFileVersion.JAVA_V21; -+ //return ClassFileVersion.JAVA_V21; -+ return ClassFileVersion.JAVA_V19; - } - - /** diff --git a/byte-buddy-1.14.3.jar b/byte-buddy-1.14.3.jar deleted file mode 100644 index 11ebc64..0000000 --- a/byte-buddy-1.14.3.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1db7ee74714ed852a2bd23c33d066e8a4f6031411cbd0ce75daa58b7670894ad -size 4190940 diff --git a/byte-buddy-1.14.3.tar.gz b/byte-buddy-1.14.3.tar.gz deleted file mode 100644 index 8a0ea23..0000000 --- a/byte-buddy-1.14.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55925840aee37353bdcad86de37106e32e760d3863cbbe8c1c9e743a94e4a3c5 -size 1996005 diff --git a/byte-buddy-1.14.4.jar b/byte-buddy-1.14.4.jar new file mode 100644 index 0000000..4b083fe --- /dev/null +++ b/byte-buddy-1.14.4.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ae2b39ac230be9e3e09ce020406c017ff8ceba06eaf078c62a88c218a0ff2b4 +size 4191680 diff --git a/byte-buddy-1.14.3.pom b/byte-buddy-1.14.4.pom similarity index 97% rename from byte-buddy-1.14.3.pom rename to byte-buddy-1.14.4.pom index b352a03..ed1b085 100644 --- a/byte-buddy-1.14.3.pom +++ b/byte-buddy-1.14.4.pom @@ -3,7 +3,7 @@ byte-buddy-parent net.bytebuddy - 1.14.3 + 1.14.4 4.0.0 byte-buddy diff --git a/byte-buddy-1.14.4.tar.gz b/byte-buddy-1.14.4.tar.gz new file mode 100644 index 0000000..78eb783 --- /dev/null +++ b/byte-buddy-1.14.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78ea2a45811426d0ec24acdbf54798949edd75a21b1d295102d48a7c877bc185 +size 1996693 diff --git a/byte-buddy-maven-plugin-1.14.3.jar b/byte-buddy-maven-plugin-1.14.3.jar deleted file mode 100644 index c13cf93..0000000 --- a/byte-buddy-maven-plugin-1.14.3.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d52c7d65b9fdac180f90612c377a39fc9b81e1d48f02aced9fbdcdfeda57659 -size 52145 diff --git a/byte-buddy-maven-plugin-1.14.4.jar b/byte-buddy-maven-plugin-1.14.4.jar new file mode 100644 index 0000000..fcfee54 --- /dev/null +++ b/byte-buddy-maven-plugin-1.14.4.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acdae6ef4609d3fbe7de4dfa8a5fe39a23386056ab67c16ead74e71519ddf477 +size 52145 diff --git a/byte-buddy-maven-plugin-1.14.3.pom b/byte-buddy-maven-plugin-1.14.4.pom similarity index 99% rename from byte-buddy-maven-plugin-1.14.3.pom rename to byte-buddy-maven-plugin-1.14.4.pom index 423b7af..9c1f0f3 100644 --- a/byte-buddy-maven-plugin-1.14.3.pom +++ b/byte-buddy-maven-plugin-1.14.4.pom @@ -5,7 +5,7 @@ net.bytebuddy byte-buddy-parent - 1.14.3 + 1.14.4 byte-buddy-maven-plugin diff --git a/byte-buddy.changes b/byte-buddy.changes index 4b1d03e..6ac9a11 100644 --- a/byte-buddy.changes +++ b/byte-buddy.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Apr 13 16:47:24 UTC 2023 - Anton Shvetz + +- Update to v1.14.4 + * Changes of v1.14.4 + + Include instrumented type and auxiliary types in TypePool + that is passed to TypeWriter. + +------------------------------------------------------------------- +Mon Apr 3 12:37:18 UTC 2023 - Anton Shvetz + +- Remove patch: + * 00-asm5.patch - not needed due to update of objectweb-asm + ------------------------------------------------------------------- Sun Apr 2 18:09:26 UTC 2023 - Anton Shvetz diff --git a/byte-buddy.spec b/byte-buddy.spec index 218b11e..4aecbc5 100644 --- a/byte-buddy.spec +++ b/byte-buddy.spec @@ -29,7 +29,7 @@ %global name %{base_name} %endif Name: %{name} -Version: 1.14.3 +Version: 1.14.4 Release: 0 Summary: Runtime code generation for the Java virtual machine License: Apache-2.0 @@ -43,7 +43,6 @@ Source4: https://repo1.maven.org/maven2/net/bytebuddy/%{base_name}/%{vers BuildRequires: maven-local BuildArch: noarch %if %{without bootstrap} -Patch0: 00-asm5.patch BuildRequires: %{base_name}-bootstrap BuildRequires: mvn(cglib:cglib-nodep) BuildRequires: mvn(codes.rafael.modulemaker:modulemaker-maven-plugin) @@ -89,7 +88,6 @@ cp %{SOURCE2} %{SOURCE4} . %{base_name}-maven-plugin-%{version}.pom %else %setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 %pom_disable_module %{name}-android %pom_disable_module %{name}-android-test