From 3fcc569b67e51ac7c7adcf649f97cfef0e190c0a72601a1bb2635feac5f9a067 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 3 Apr 2023 09:09:31 +0000 Subject: [PATCH] Accepting request 1076761 from home:urbic:java Add forgotten entry to byte-buddy.changes OBS-URL: https://build.opensuse.org/request/show/1076761 OBS-URL: https://build.opensuse.org/package/show/Java:packages/byte-buddy?expand=0&rev=1 --- .gitattributes | 23 ++ .gitignore | 1 + 00-asm5.patch | 58 +++++ _multibuild | 3 + byte-buddy-1.14.3.jar | 3 + byte-buddy-1.14.3.pom | 383 +++++++++++++++++++++++++++++ byte-buddy-1.14.3.tar.gz | 3 + byte-buddy-maven-plugin-1.14.3.jar | 3 + byte-buddy-maven-plugin-1.14.3.pom | 216 ++++++++++++++++ byte-buddy.changes | 29 +++ byte-buddy.spec | 138 +++++++++++ 11 files changed, 860 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 00-asm5.patch create mode 100644 _multibuild create mode 100644 byte-buddy-1.14.3.jar create mode 100644 byte-buddy-1.14.3.pom create mode 100644 byte-buddy-1.14.3.tar.gz create mode 100644 byte-buddy-maven-plugin-1.14.3.jar create mode 100644 byte-buddy-maven-plugin-1.14.3.pom create mode 100644 byte-buddy.changes create mode 100644 byte-buddy.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/00-asm5.patch b/00-asm5.patch new file mode 100644 index 0000000..f7fac8b --- /dev/null +++ b/00-asm5.patch @@ -0,0 +1,58 @@ +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/_multibuild b/_multibuild new file mode 100644 index 0000000..655ec81 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + bootstrap + diff --git a/byte-buddy-1.14.3.jar b/byte-buddy-1.14.3.jar new file mode 100644 index 0000000..11ebc64 --- /dev/null +++ b/byte-buddy-1.14.3.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1db7ee74714ed852a2bd23c33d066e8a4f6031411cbd0ce75daa58b7670894ad +size 4190940 diff --git a/byte-buddy-1.14.3.pom b/byte-buddy-1.14.3.pom new file mode 100644 index 0000000..b352a03 --- /dev/null +++ b/byte-buddy-1.14.3.pom @@ -0,0 +1,383 @@ + + + + byte-buddy-parent + net.bytebuddy + 1.14.3 + + 4.0.0 + byte-buddy + Byte Buddy (without dependencies) + Byte Buddy is a Java library for creating Java classes at run time. + This artifact is a build of Byte Buddy with all ASM dependencies repackaged into its own name space. + + + + true + src/main/resources + + + + + + maven-javadoc-plugin + ${version.plugin.javadoc} + + true + + ${project.groupId}:byte-buddy-dep + + + + + + + + org.pitest + pitest-maven + ${version.plugin.pitest} + + true + + + + com.github.spotbugs + spotbugs-maven-plugin + ${version.plugin.spotbugs} + + true + + + + maven-jar-plugin + ${version.plugin.jar} + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + ${version.plugin.bundle} + + + process-classes + + manifest + + + + true + ${packages.list.external} + + + + + + + codes.rafael.modulemaker + modulemaker-maven-plugin + ${version.plugin.modulemaker} + + + prepare-package + + make-module + + + ${modulemaker.skip} + ${project.groupId} + ${project.version} + true + ${packages.list.external},${packages.list.internal} + ${packages.list.external} + java.instrument, + java.management, + jdk.unsupported, + net.bytebuddy.agent, + com.sun.jna, + com.sun.jna.platform + + + + + + org.ow2.asm + asm + ${version.asm} + + + + + + + + extras + + + + maven-source-plugin + 3.2.1 + + + + jar + + + true + + + + + true + + + + + + + shade-current + + + + maven-shade-plugin + 3.3.0 + + + package + + shade + + + false + true + true + true + + + org.objectweb.asm + net.bytebuddy.jar.asm + + + + + net.bytebuddy:byte-buddy-dep:* + + META-INF/MANIFEST.MF + META-INF/maven/** + + + + org.ow2.asm:* + + META-INF/MANIFEST.MF + **/module-info.class + **/LICENSE + **/NOTICE + + + + org.ow2.asm:asm-commons + + org/objectweb/asm/commons/AnnotationRemapper.** + org/objectweb/asm/commons/ClassRemapper.** + org/objectweb/asm/commons/FieldRemapper.** + org/objectweb/asm/commons/MethodRemapper.** + org/objectweb/asm/commons/ModuleHashesAttribute.** + org/objectweb/asm/commons/ModuleRemapper.** + org/objectweb/asm/commons/RecordComponentRemapper.** + org/objectweb/asm/commons/Remapper.** + org/objectweb/asm/commons/SignatureRemapper.** + org/objectweb/asm/commons/SimpleRemapper.** + + + + + + net.bytebuddy.build.Plugin$Engine$Default + + + sources-jar + + + + META-INF/LICENSE + + + + + + + + org.ow2.asm + asm + 9.5 + compile + + + org.ow2.asm + asm-commons + 9.5 + compile + + + + + + + + shade-legacy + + + + maven-shade-plugin + ${version.plugin.shade} + + + package + + shade + + + false + true + ${bytebuddy.extras} + true + + + ${shade.source} + ${shade.target} + + + + + net.bytebuddy:byte-buddy-dep:* + + META-INF/MANIFEST.MF + + + + org.ow2.asm:* + + META-INF/MANIFEST.MF + **/module-info.class + **/LICENSE + **/NOTICE + + + + org.ow2.asm:asm-commons + + org/objectweb/asm/commons/AnnotationRemapper.** + org/objectweb/asm/commons/ClassRemapper.** + org/objectweb/asm/commons/FieldRemapper.** + org/objectweb/asm/commons/MethodRemapper.** + org/objectweb/asm/commons/ModuleHashesAttribute.** + org/objectweb/asm/commons/ModuleRemapper.** + org/objectweb/asm/commons/RecordComponentRemapper.** + org/objectweb/asm/commons/Remapper.** + org/objectweb/asm/commons/SignatureRemapper.** + org/objectweb/asm/commons/SimpleRemapper.** + + + + + + net.bytebuddy.build.Plugin$Engine$Default + + + META-INF/LICENSE + + + + + + + + org.ow2.asm + asm + ${version.asm} + + + org.ow2.asm + asm-commons + ${version.asm} + + + + + + + + + + net.java.dev.jna + jna + 5.12.1 + provided + + + net.java.dev.jna + jna-platform + 5.12.1 + provided + + + com.google.code.findbugs + findbugs-annotations + 3.0.1 + provided + + + com.google.code.findbugs + jsr305 + 3.0.2 + provided + + + + true + net.bytebuddy, + net.bytebuddy.agent.builder, + net.bytebuddy.asm, + net.bytebuddy.build, + net.bytebuddy.description, + net.bytebuddy.description.annotation, + net.bytebuddy.description.enumeration, + net.bytebuddy.description.field, + net.bytebuddy.description.method, + net.bytebuddy.description.modifier, + net.bytebuddy.description.type, + net.bytebuddy.dynamic, + net.bytebuddy.dynamic.loading, + net.bytebuddy.dynamic.scaffold, + net.bytebuddy.dynamic.scaffold.inline, + net.bytebuddy.dynamic.scaffold.subclass, + net.bytebuddy.implementation, + net.bytebuddy.implementation.attribute, + net.bytebuddy.implementation.auxiliary, + net.bytebuddy.implementation.bind, + net.bytebuddy.implementation.bind.annotation, + net.bytebuddy.implementation.bytecode, + net.bytebuddy.implementation.bytecode.assign, + net.bytebuddy.implementation.bytecode.assign.primitive, + net.bytebuddy.implementation.bytecode.assign.reference, + net.bytebuddy.implementation.bytecode.collection, + net.bytebuddy.implementation.bytecode.constant, + net.bytebuddy.implementation.bytecode.member, + net.bytebuddy.matcher, + net.bytebuddy.pool, + net.bytebuddy.utility, + net.bytebuddy.utility.nullability, + net.bytebuddy.utility.privilege, + net.bytebuddy.utility.visitor, + ${shade.target}, + ${shade.target}.signature, + ${shade.target}.commons + org.objectweb.asm + net.bytebuddy.jar.asm + net.bytebuddy.utility.dispatcher + + diff --git a/byte-buddy-1.14.3.tar.gz b/byte-buddy-1.14.3.tar.gz new file mode 100644 index 0000000..8a0ea23 --- /dev/null +++ b/byte-buddy-1.14.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55925840aee37353bdcad86de37106e32e760d3863cbbe8c1c9e743a94e4a3c5 +size 1996005 diff --git a/byte-buddy-maven-plugin-1.14.3.jar b/byte-buddy-maven-plugin-1.14.3.jar new file mode 100644 index 0000000..c13cf93 --- /dev/null +++ b/byte-buddy-maven-plugin-1.14.3.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d52c7d65b9fdac180f90612c377a39fc9b81e1d48f02aced9fbdcdfeda57659 +size 52145 diff --git a/byte-buddy-maven-plugin-1.14.3.pom b/byte-buddy-maven-plugin-1.14.3.pom new file mode 100644 index 0000000..423b7af --- /dev/null +++ b/byte-buddy-maven-plugin-1.14.3.pom @@ -0,0 +1,216 @@ + + + 4.0.0 + + + net.bytebuddy + byte-buddy-parent + 1.14.3 + + + byte-buddy-maven-plugin + maven-plugin + + Byte Buddy Maven plugin + A plugin for post-processing class files via Byte Buddy in a Maven build. + + + 3.2.5 + 3.5.2 + 1.1.0 + 0.0.7 + 3.3.0 + 1.7.36 + 3.7.0 + 3.4.2 + 2.11.0 + 1.21 + 31.1-jre + true + + + + + ${project.groupId} + byte-buddy + + + org.apache.maven + maven-plugin-api + ${version.maven} + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${version.maven.annotation} + provided + + + org.eclipse.aether + aether-api + ${version.maven.aether} + + + org.apache.maven + maven-core + ${version.maven} + provided + + + org.eclipse.aether + aether-util + ${version.maven.aether} + + + org.sonatype.plexus + plexus-build-api + ${version.maven.plexus-build-api} + + + junit + junit + ${version.junit} + test + + + org.mockito + mockito-core + ${version.mockito} + test + + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + + + + + org.apache.maven + maven-compat + ${version.maven} + test + + + org.apache.maven.plugin-testing + maven-plugin-testing-harness + ${version.maven.test} + test + + + org.slf4j + slf4j-nop + ${version.slf4j} + test + + + + + + + org.codehaus.plexus + plexus-archiver + ${version.maven.plexus-archiver} + + + org.codehaus.plexus + plexus-utils + ${version.maven.plexus-util} + + + commons-io + commons-io + ${version.commons-io} + + + org.apache.commons + commons-compress + ${version.commons-compress} + + + com.google.guava + guava + ${version.guava} + + + + + + + + src/main/resources + + + .. + META-INF + true + + LICENSE + NOTICE + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.plugin.javadoc} + + + + https://javadoc.io/doc/net.bytebuddy/byte-buddy/${project.version} + ${project.basedir}/../byte-buddy/target/apidocs + + + + https://javadoc.io/doc/org.apache.maven/maven-core/${version.maven} + https://javadoc.io/doc/org.apache.maven.plugin-tools/maven-plugin-annotations/${version.maven.annotation} + https://javadoc.io/doc/org.eclipse.aether/aether-api/${version.maven.aether} + https://javadoc.io/doc/org.sonatype.plexus/plexus-build-api/${version.maven.plexus-build-api} + + + + + + + + + + + java6-compatibility + + false + 1.6 + + + 2.1.1 + 3.3.1 + 2.5 + 1.12 + 20.0 + + + + + java7-compatibility + + false + 1.7 + + + 2.11 + 3.3.1 + 2.6 + 1.20 + 16.0.1 + 20.0 + + + + + diff --git a/byte-buddy.changes b/byte-buddy.changes new file mode 100644 index 0000000..4b1d03e --- /dev/null +++ b/byte-buddy.changes @@ -0,0 +1,29 @@ +------------------------------------------------------------------- +Sun Apr 2 18:09:26 UTC 2023 - Anton Shvetz + +- Update to v1.14.3 + * Changes of v1.14.3 + + Make MethodGraph.Compiler failsafe when processing incomplete + methods. + + Update ASM. + +------------------------------------------------------------------- +Mon Mar 20 13:10:06 UTC 2023 - Anton Shvetz + +- Update to v1.14.2 + * Changes of v1.14.2 + + Fix offset mapping for local variable array remapping in + Advice. + + Add possibility to specify an index for skipOn and repeatOn + which resolves the checked value from a returned array. + * Changes of 1.14.1 + + Add extended scope for Maven Byte Buddy plugin to include all + non-test-dependencies. + +------------------------------------------------------------------- +Wed Mar 8 04:33:02 UTC 2023 - Anton Shvetz + +- Initial packaging with v1.14.0 +- Add patch: + * 00-asm5.patch + ~ asm5 does not support the Opcodes.V20 constant diff --git a/byte-buddy.spec b/byte-buddy.spec new file mode 100644 index 0000000..218b11e --- /dev/null +++ b/byte-buddy.spec @@ -0,0 +1,138 @@ +# +# spec file for package byte-buddy +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global base_name byte-buddy +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "bootstrap" +%bcond_without bootstrap +%else +%bcond_with bootstrap +%endif +%if %{with bootstrap} +%global name %{base_name}-%{flavor} +%else +%global name %{base_name} +%endif +Name: %{name} +Version: 1.14.3 +Release: 0 +Summary: Runtime code generation for the Java virtual machine +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://bytebuddy.net/ +Source0: https://github.com/raphw/%{base_name}/archive/refs/tags/%{base_name}-%{version}.tar.gz +Source1: https://repo1.maven.org/maven2/net/bytebuddy/%{base_name}-maven-plugin/%{version}/%{base_name}-maven-plugin-%{version}.jar +Source2: https://repo1.maven.org/maven2/net/bytebuddy/%{base_name}-maven-plugin/%{version}/%{base_name}-maven-plugin-%{version}.pom +Source3: https://repo1.maven.org/maven2/net/bytebuddy/%{base_name}/%{version}/%{base_name}-%{version}.jar +Source4: https://repo1.maven.org/maven2/net/bytebuddy/%{base_name}/%{version}/%{base_name}-%{version}.pom +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) +BuildRequires: mvn(net.java.dev.jna:jna) +BuildRequires: mvn(net.java.dev.jna:jna-platform) +BuildRequires: mvn(net.sourceforge.findbugs:annotations) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.javassist:javassist) +BuildRequires: mvn(org.openjdk.jmh:jmh-core) +BuildRequires: mvn(org.openjdk.jmh:jmh-generator-annprocess) +%endif + +%description +Byte Buddy is a code generation and manipulation library for creating and +modifying Java classes during the runtime of a Java application and without the +help of a compiler. Other than the code generation utilities that ship with the +Java Class Library, Byte Buddy allows the creation of arbitrary classes and is +not limited to implementing interfaces for the creation of runtime proxies. +Furthermore, Byte Buddy offers a convenient API for changing classes either +manually, using a Java agent or during a build. + +%if %{without bootstrap} +%package javadoc +Summary: API documentation for %{name} +Group: Documentation/HTML + +%description javadoc +API documentation for %{name}. + +%endif + +%prep +%if %{with bootstrap} +cp %{SOURCE2} %{SOURCE4} . +%pom_xpath_set 'pom:project/pom:artifactId' '%{base_name}-maven-plugin-bootstrap' \ + %{base_name}-maven-plugin-%{version}.pom +%pom_xpath_set 'pom:project/pom:artifactId' '%{base_name}-bootstrap' \ + %{base_name}-%{version}.pom + +%pom_xpath_set 'pom:dependency/pom:artifactId[text()="%{base_name}"]' '%{base_name}-bootstrap' \ + %{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 +%pom_disable_module %{name}-benchmark +%pom_disable_module %{name}-gradle-plugin + +%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin +%pom_remove_plugin com.mycila:license-maven-plugin + +%pom_remove_dep com.google.code.findbugs:findbugs-annotations +%pom_add_dep net.sourceforge.findbugs:annotations +%pom_add_dep net.sourceforge.findbugs:annotations byte-buddy-dep + +%pom_xpath_set 'pom:plugin/pom:artifactId[text()="byte-buddy-maven-plugin"]' \ + '%{base_name}-maven-plugin-bootstrap' %{base_name}-dep +%pom_xpath_set 'pom:transformation/pom:artifactId[text()="byte-buddy"]' \ + '%{base_name}-bootstrap' %{base_name}-dep + +%pom_xpath_remove 'pom:forShade' %{base_name} + +%endif + +%build +%if %{without bootstrap} +%{mvn_build} -f -- -Dsource=8 +%endif + +%install +%if %{with bootstrap} +%{mvn_artifact} --skip-dependencies %{base_name}-maven-plugin-%{version}.pom %{SOURCE1} +%{mvn_artifact} --skip-dependencies %{base_name}-%{version}.pom %{SOURCE3} +%endif +%mvn_install + +%files -f .mfiles +%if %{without bootstrap} +%license LICENSE NOTICE +%doc README.md +%endif + +%if %{without bootstrap} +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE +%endif + +%changelog