From a07d793dcf921c28b2c01ffbc03ad1e8b69c7ae283f3feb61ef080c7454ef5bb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 5 May 2023 07:37:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/byte-buddy?expand=0&rev=3 --- byte-buddy-1.14.4.jar | 3 - byte-buddy-1.14.4.pom | 383 ----------------------------- byte-buddy-maven-plugin-1.14.4.jar | 3 - byte-buddy-maven-plugin-1.14.4.pom | 216 ---------------- byte-buddy.spec | 83 +++---- 5 files changed, 34 insertions(+), 654 deletions(-) delete mode 100644 byte-buddy-1.14.4.jar delete mode 100644 byte-buddy-1.14.4.pom delete mode 100644 byte-buddy-maven-plugin-1.14.4.jar delete mode 100644 byte-buddy-maven-plugin-1.14.4.pom diff --git a/byte-buddy-1.14.4.jar b/byte-buddy-1.14.4.jar deleted file mode 100644 index 4b083fe..0000000 --- a/byte-buddy-1.14.4.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ae2b39ac230be9e3e09ce020406c017ff8ceba06eaf078c62a88c218a0ff2b4 -size 4191680 diff --git a/byte-buddy-1.14.4.pom b/byte-buddy-1.14.4.pom deleted file mode 100644 index ed1b085..0000000 --- a/byte-buddy-1.14.4.pom +++ /dev/null @@ -1,383 +0,0 @@ - - - - byte-buddy-parent - net.bytebuddy - 1.14.4 - - 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-maven-plugin-1.14.4.jar b/byte-buddy-maven-plugin-1.14.4.jar deleted file mode 100644 index fcfee54..0000000 --- a/byte-buddy-maven-plugin-1.14.4.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acdae6ef4609d3fbe7de4dfa8a5fe39a23386056ab67c16ead74e71519ddf477 -size 52145 diff --git a/byte-buddy-maven-plugin-1.14.4.pom b/byte-buddy-maven-plugin-1.14.4.pom deleted file mode 100644 index 9c1f0f3..0000000 --- a/byte-buddy-maven-plugin-1.14.4.pom +++ /dev/null @@ -1,216 +0,0 @@ - - - 4.0.0 - - - net.bytebuddy - byte-buddy-parent - 1.14.4 - - - 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.spec b/byte-buddy.spec index 4aecbc5..5428612 100644 --- a/byte-buddy.spec +++ b/byte-buddy.spec @@ -24,11 +24,10 @@ %bcond_with bootstrap %endif %if %{with bootstrap} -%global name %{base_name}-%{flavor} +Name: %{base_name}-bootstrap %else -%global name %{base_name} +Name: %{base_name} %endif -Name: %{name} Version: 1.14.4 Release: 0 Summary: Runtime code generation for the Java virtual machine @@ -36,25 +35,31 @@ 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} -BuildRequires: %{base_name}-bootstrap -BuildRequires: mvn(cglib:cglib-nodep) +BuildRequires: maven-local BuildRequires: mvn(codes.rafael.modulemaker:modulemaker-maven-plugin) +BuildRequires: mvn(com.google.code.findbugs:jsr305) 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:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) 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) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) >= 3.3.0 +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.eclipse.aether:aether-api) +BuildRequires: mvn(org.eclipse.aether:aether-util) +BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.ow2.asm:asm-commons) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +%if %{without bootstrap} +BuildRequires: %{base_name}-bootstrap +Obsoletes: %{base_name}-bootstrap +Conflicts: %{base_name}-bootstrap +%else +Conflicts: %{base_name} %endif %description @@ -77,56 +82,36 @@ API documentation for %{name}. %endif %prep +%setup -q -n %{base_name}-%{base_name}-%{version} + +%pom_disable_module %{base_name}-android +%pom_disable_module %{base_name}-android-test +%pom_disable_module %{base_name}-benchmark +%pom_disable_module %{base_name}-gradle-plugin %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} - -%pom_disable_module %{name}-android -%pom_disable_module %{name}-android-test -%pom_disable_module %{name}-benchmark -%pom_disable_module %{name}-gradle-plugin +%pom_disable_module %{base_name}-agent +%pom_remove_plugin :%{base_name}-maven-plugin %{base_name}-dep +%endif %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 +%pom_change_dep -r com.google.code.findbugs:findbugs-annotations \ + net.sourceforge.findbugs:annotations %build -%if %{without bootstrap} -%{mvn_build} -f -- -Dsource=8 +%{mvn_build} -f \ +%if %{with bootstrap} + -j \ %endif + -- -Dsource=8 %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