|
|
|
@ -1,29 +1,28 @@
|
|
|
|
%bcond_with bootstrap
|
|
|
|
%bcond_with bootstrap
|
|
|
|
|
|
|
|
|
|
|
|
Name: byte-buddy
|
|
|
|
Name: byte-buddy
|
|
|
|
Version: 1.14.2
|
|
|
|
Version: 1.10.20
|
|
|
|
Release: 8%{?dist}
|
|
|
|
Release: 7%{?dist}
|
|
|
|
Summary: Runtime code generation for the Java virtual machine
|
|
|
|
Summary: Runtime code generation for the Java virtual machine
|
|
|
|
License: Apache-2.0
|
|
|
|
License: ASL 2.0
|
|
|
|
URL: http://bytebuddy.net/
|
|
|
|
URL: http://bytebuddy.net/
|
|
|
|
Source0: https://github.com/raphw/byte-buddy/archive/refs/tags/byte-buddy-%{version}.tar.gz
|
|
|
|
# ./generate-tarball.sh
|
|
|
|
|
|
|
|
Source0: %{name}-%{version}.tar.gz
|
|
|
|
|
|
|
|
|
|
|
|
# Patch the build to avoid bundling inside shaded jars
|
|
|
|
# Patch the build to avoid bundling inside shaded jars
|
|
|
|
Patch1: 0001-Avoid-bundling-asm.patch
|
|
|
|
Patch1: 0001-Avoid-bundling-asm.patch
|
|
|
|
Patch2: 0002-Remove-dependencies.patch
|
|
|
|
Patch2: 0002-Remove-dependency-on-jna.patch
|
|
|
|
Patch3: 0003-Fix-broken-modular-jars.patch
|
|
|
|
Patch3: 0003-Remove-Java-14-tests.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BuildRequires: maven-local
|
|
|
|
%if %{with bootstrap}
|
|
|
|
%if %{with bootstrap}
|
|
|
|
BuildRequires: javapackages-bootstrap
|
|
|
|
BuildRequires: javapackages-bootstrap
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
BuildRequires: maven-local
|
|
|
|
|
|
|
|
BuildRequires: mvn(codes.rafael.modulemaker:modulemaker-maven-plugin)
|
|
|
|
|
|
|
|
BuildRequires: mvn(junit:junit)
|
|
|
|
BuildRequires: mvn(junit:junit)
|
|
|
|
BuildRequires: mvn(net.bytebuddy:byte-buddy)
|
|
|
|
BuildRequires: mvn(net.bytebuddy:byte-buddy)
|
|
|
|
BuildRequires: mvn(net.bytebuddy:byte-buddy-dep)
|
|
|
|
BuildRequires: mvn(net.bytebuddy:byte-buddy-dep)
|
|
|
|
BuildRequires: mvn(org.apache.maven:maven-compat)
|
|
|
|
BuildRequires: mvn(org.apache.maven:maven-compat)
|
|
|
|
BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
|
|
|
|
BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
|
|
|
|
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
|
|
|
|
|
|
|
BuildRequires: mvn(org.mockito:mockito-core)
|
|
|
|
BuildRequires: mvn(org.mockito:mockito-core)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm-analysis)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm-analysis)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm-util)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm-util)
|
|
|
|
@ -38,10 +37,8 @@ BuildRequires: mvn(org.eclipse.aether:aether-util)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
|
|
|
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
BuildRequires: jurand
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BuildArch: noarch
|
|
|
|
BuildArch: noarch
|
|
|
|
ExclusiveArch: %{java_arches} noarch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
%description
|
|
|
|
Byte Buddy is a code generation library for creating Java classes during the
|
|
|
|
Byte Buddy is a code generation library for creating Java classes during the
|
|
|
|
@ -78,16 +75,18 @@ This package contains API documentation for %{name}.
|
|
|
|
%prep
|
|
|
|
%prep
|
|
|
|
%setup -q -n %{name}-%{name}-%{version}
|
|
|
|
%setup -q -n %{name}-%{name}-%{version}
|
|
|
|
|
|
|
|
|
|
|
|
%patch 1 -p1
|
|
|
|
%patch -P 1 -p1
|
|
|
|
%patch 2 -p1
|
|
|
|
%patch -P 2 -p1
|
|
|
|
%patch 3 -p1
|
|
|
|
%patch -P 3 -p1
|
|
|
|
|
|
|
|
|
|
|
|
find -name '*.class' -delete
|
|
|
|
rm byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineAttachmentTest.java
|
|
|
|
|
|
|
|
|
|
|
|
rm byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineAttachmentTest.java\
|
|
|
|
# Cause pre-compiled stuff to be re-compiled
|
|
|
|
byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineForOpenJ9Test.java\
|
|
|
|
mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/build/*.java \
|
|
|
|
byte-buddy-agent/src/test/java/net/bytebuddy/test/utility/JnaRule.java\
|
|
|
|
byte-buddy-dep/src/main/java/net/bytebuddy/build
|
|
|
|
;
|
|
|
|
mkdir -p byte-buddy-dep/src/test/java/net/bytebuddy/test/precompiled/
|
|
|
|
|
|
|
|
mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/*.java \
|
|
|
|
|
|
|
|
byte-buddy-dep/src/test/java/net/bytebuddy/test/precompiled/
|
|
|
|
|
|
|
|
|
|
|
|
# Don't ship android or benchmark modules
|
|
|
|
# Don't ship android or benchmark modules
|
|
|
|
%pom_disable_module byte-buddy-android
|
|
|
|
%pom_disable_module byte-buddy-android
|
|
|
|
@ -104,8 +103,8 @@ rm byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineAttachmentTe
|
|
|
|
%pom_remove_plugin :coveralls-maven-plugin
|
|
|
|
%pom_remove_plugin :coveralls-maven-plugin
|
|
|
|
%pom_remove_plugin :spotbugs-maven-plugin
|
|
|
|
%pom_remove_plugin :spotbugs-maven-plugin
|
|
|
|
%pom_remove_plugin :jitwatch-jarscan-maven-plugin
|
|
|
|
%pom_remove_plugin :jitwatch-jarscan-maven-plugin
|
|
|
|
|
|
|
|
%pom_remove_plugin :clirr-maven-plugin
|
|
|
|
%pom_remove_plugin :maven-release-plugin
|
|
|
|
%pom_remove_plugin :maven-release-plugin
|
|
|
|
%pom_remove_plugin :nexus-staging-maven-plugin
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Avoid circural dependency
|
|
|
|
# Avoid circural dependency
|
|
|
|
%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep
|
|
|
|
%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep
|
|
|
|
@ -114,26 +113,25 @@ rm byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineAttachmentTe
|
|
|
|
%pom_xpath_set "pom:createSourcesJar" "false" byte-buddy
|
|
|
|
%pom_xpath_set "pom:createSourcesJar" "false" byte-buddy
|
|
|
|
|
|
|
|
|
|
|
|
# Drop build dep on findbugs annotations, used only by the above check plugins
|
|
|
|
# Drop build dep on findbugs annotations, used only by the above check plugins
|
|
|
|
%pom_remove_dep -r :findbugs-annotations
|
|
|
|
%pom_remove_dep :findbugs-annotations
|
|
|
|
%java_remove_annotations byte-buddy-agent byte-buddy-dep byte-buddy-maven-plugin -n SuppressFBWarnings
|
|
|
|
sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Plugin for generating Java 9 module-info file is not in Fedora
|
|
|
|
|
|
|
|
%pom_remove_plugin -r :modulemaker-maven-plugin
|
|
|
|
|
|
|
|
|
|
|
|
%pom_remove_dep org.ow2.asm:asm-deprecated
|
|
|
|
%pom_remove_dep org.ow2.asm:asm-deprecated
|
|
|
|
|
|
|
|
|
|
|
|
%pom_remove_plugin -r :maven-shade-plugin
|
|
|
|
%pom_remove_plugin :maven-shade-plugin byte-buddy
|
|
|
|
%pom_remove_dep -r net.java.dev.jna:jna
|
|
|
|
%pom_remove_plugin :maven-shade-plugin byte-buddy-benchmark
|
|
|
|
%pom_remove_dep -r net.java.dev.jna:jna-platform
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%mvn_package :byte-buddy-parent __noinstall
|
|
|
|
%pom_remove_dep :jna byte-buddy-agent
|
|
|
|
|
|
|
|
%pom_remove_dep :jna-platform byte-buddy-agent
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
%build
|
|
|
|
# Ignore test failures, there seems to be something different about the
|
|
|
|
# Ignore test failures, there seems to be something different about the
|
|
|
|
# bytecode of our recompiled test resources, expect 6 test failures in
|
|
|
|
# bytecode of our recompiled test resources, expect 6 test failures in
|
|
|
|
# the byte-buddy-dep module
|
|
|
|
# the byte-buddy-dep module
|
|
|
|
|
|
|
|
%mvn_build -s -- -P'java8,!checks' -Dsourcecode.test.version=1.8 -Dmaven.test.failure.ignore=true
|
|
|
|
# NOTE you can obtain valid profiles for precompilation by:
|
|
|
|
|
|
|
|
# xmllint --xpath '//*[local-name()="profile"]/*[local-name()="id"]/text()' byte-buddy-dep/pom.xml | grep 'precompile$' | grep -v 'no-precompile$' | sed 's/\(.*\)/-P\1/'
|
|
|
|
|
|
|
|
profiles='-Pjava-8-precompile -Pjava-8-parameters-precompile -Pjava-11-precompile -Pjava-16-precompile -Pjava-17-precompile'
|
|
|
|
|
|
|
|
%mvn_build -s -- -P'java8,!checks' "${profiles}" -Dsourcecode.main.version=8 -Dsourcecode.test.version=8 -Dmaven.test.failure.ignore=true
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
%install
|
|
|
|
%mvn_install
|
|
|
|
%mvn_install
|
|
|
|
@ -147,61 +145,28 @@ profiles='-Pjava-8-precompile -Pjava-8-parameters-precompile -Pjava-11-precompil
|
|
|
|
|
|
|
|
|
|
|
|
%files maven-plugin -f .mfiles-%{name}-maven-plugin
|
|
|
|
%files maven-plugin -f .mfiles-%{name}-maven-plugin
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files parent -f .mfiles-%{name}-parent
|
|
|
|
|
|
|
|
%license LICENSE NOTICE
|
|
|
|
|
|
|
|
|
|
|
|
%files javadoc -f .mfiles-javadoc
|
|
|
|
%files javadoc -f .mfiles-javadoc
|
|
|
|
%license LICENSE NOTICE
|
|
|
|
%license LICENSE NOTICE
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.14.2-8
|
|
|
|
* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1.10.20-7
|
|
|
|
- Port to OpenJDK 21
|
|
|
|
- Fix patch usage
|
|
|
|
- Resolves: RHEL-52717
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1.14.2-8
|
|
|
|
|
|
|
|
- Bump release for Aug 2024 java mass rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.14.2-7
|
|
|
|
|
|
|
|
- Bump release for June 2024 mass rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-6
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-5
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.14.2-4
|
|
|
|
|
|
|
|
- Convert License tag to SPDX format
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.14.2-3
|
|
|
|
|
|
|
|
- Build with Jurand instead of deprecated javapackages-extra
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-2
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Feb 23 2023 Marian Koncek <mkoncek@redhat.com> - 1.14.2-1
|
|
|
|
|
|
|
|
- Update to upstream version 1.14.2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Feb 21 2023 Marian Koncek <mkoncek@redhat.com> - 1.12.10-4
|
|
|
|
|
|
|
|
- Enable modulemaker-maven-plugin
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.10-3
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.10-2
|
|
|
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon May 09 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.12.10-1
|
|
|
|
|
|
|
|
- Update to upstream version 1.12.10
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.12.0-3
|
|
|
|
* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 1.10.20-6
|
|
|
|
- Rebuilt for java-17-openjdk as system jdk
|
|
|
|
- Rebuild with regenerated Requires on Java
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
|
|
|
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.20-5
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Nov 09 2021 Marian Koncek <mkoncek@redhat.com> - 1.12.0-1
|
|
|
|
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-4
|
|
|
|
- Update to upstream version 1.12.0
|
|
|
|
- Rebuild to workaround DistroBaker issue
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.20-3
|
|
|
|
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-3
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
- Bootstrap Maven for CentOS Stream 9
|
|
|
|
|
|
|
|
|
|
|
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-2
|
|
|
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-2
|
|
|
|
- Bootstrap build
|
|
|
|
- Bootstrap build
|
|
|
|
|
