RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/byte-buddy#272085e9b0ab53d174d854bd0d424263a45dc832
This commit is contained in:
parent
e9b7670e12
commit
6ee17ea348
2
.gitignore
vendored
2
.gitignore
vendored
@ -0,0 +1,2 @@
|
|||||||
|
/*.src.rpm
|
||||||
|
/*.tar.gz
|
113
avoid-bundling-asm.patch
Normal file
113
avoid-bundling-asm.patch
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
--- byte-buddy/pom.xml.orig 2020-07-31 08:09:49.000000000 -0600
|
||||||
|
+++ byte-buddy/pom.xml 2020-08-14 13:55:09.300521492 -0600
|
||||||
|
@@ -26,8 +26,6 @@
|
||||||
|
-->
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
- <shade.source>org.objectweb.asm</shade.source>
|
||||||
|
- <shade.target>net.bytebuddy.jar.asm</shade.target>
|
||||||
|
<packages.list>
|
||||||
|
net.bytebuddy,
|
||||||
|
net.bytebuddy.agent.builder,
|
||||||
|
@@ -61,10 +59,7 @@
|
||||||
|
net.bytebuddy.pool,
|
||||||
|
net.bytebuddy.utility,
|
||||||
|
net.bytebuddy.utility.privilege,
|
||||||
|
- net.bytebuddy.utility.visitor,
|
||||||
|
- ${shade.target},
|
||||||
|
- ${shade.target}.signature,
|
||||||
|
- ${shade.target}.commons
|
||||||
|
+ net.bytebuddy.utility.visitor
|
||||||
|
</packages.list>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
@@ -77,7 +72,17 @@
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>byte-buddy-dep</artifactId>
|
||||||
|
- <version>${project.version}</version>
|
||||||
|
+ <version>${project.version}</version>
|
||||||
|
+ </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>org.ow2.asm</groupId>
|
||||||
|
+ <artifactId>asm</artifactId>
|
||||||
|
+ <version>${version.asm}</version>
|
||||||
|
+ </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>org.ow2.asm</groupId>
|
||||||
|
+ <artifactId>asm-commons</artifactId>
|
||||||
|
+ <version>${version.asm}</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
@@ -105,12 +110,6 @@
|
||||||
|
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||||
|
<createSourcesJar>${bytebuddy.extras}</createSourcesJar>
|
||||||
|
<shadeSourcesContent>true</shadeSourcesContent>
|
||||||
|
- <relocations>
|
||||||
|
- <relocation>
|
||||||
|
- <pattern>${shade.source}</pattern>
|
||||||
|
- <shadedPattern>${shade.target}</shadedPattern>
|
||||||
|
- </relocation>
|
||||||
|
- </relocations>
|
||||||
|
<filters>
|
||||||
|
<filter>
|
||||||
|
<artifact>net.bytebuddy:byte-buddy-dep:*</artifact>
|
||||||
|
@@ -118,30 +117,6 @@
|
||||||
|
<exclude>META-INF/MANIFEST.MF</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
|
- <filter>
|
||||||
|
- <artifact>org.ow2.asm:*</artifact>
|
||||||
|
- <excludes>
|
||||||
|
- <exclude>META-INF/MANIFEST.MF</exclude>
|
||||||
|
- <exclude>**/module-info.class</exclude>
|
||||||
|
- <exclude>**/LICENSE</exclude>
|
||||||
|
- <exclude>**/NOTICE</exclude>
|
||||||
|
- </excludes>
|
||||||
|
- </filter>
|
||||||
|
- <filter>
|
||||||
|
- <artifact>org.ow2.asm:asm-commons</artifact>
|
||||||
|
- <includes>
|
||||||
|
- <include>org/objectweb/asm/commons/AnnotationRemapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/ClassRemapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/FieldRemapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/MethodRemapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/ModuleHashesAttribute.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/ModuleRemapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/RecordComponentRemapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/Remapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/SignatureRemapper.**</include>
|
||||||
|
- <include>org/objectweb/asm/commons/SimpleRemapper.**</include>
|
||||||
|
- </includes>
|
||||||
|
- </filter>
|
||||||
|
</filters>
|
||||||
|
<transformers>
|
||||||
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||||
|
@@ -151,21 +126,14 @@
|
||||||
|
<resource>META-INF/LICENSE</resource>
|
||||||
|
</transformer>
|
||||||
|
</transformers>
|
||||||
|
+ <artifactSet>
|
||||||
|
+ <excludes>
|
||||||
|
+ <exclude>org.ow2.asm:*</exclude>
|
||||||
|
+ </excludes>
|
||||||
|
+ </artifactSet>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
- <dependencies>
|
||||||
|
- <dependency>
|
||||||
|
- <groupId>org.ow2.asm</groupId>
|
||||||
|
- <artifactId>asm</artifactId>
|
||||||
|
- <version>${version.asm}</version>
|
||||||
|
- </dependency>
|
||||||
|
- <dependency>
|
||||||
|
- <groupId>org.ow2.asm</groupId>
|
||||||
|
- <artifactId>asm-commons</artifactId>
|
||||||
|
- <version>${version.asm}</version>
|
||||||
|
- </dependency>
|
||||||
|
- </dependencies>
|
||||||
|
</plugin>
|
||||||
|
<!-- Disable pitest as it fails for empty modules -->
|
||||||
|
<plugin>
|
199
byte-buddy.spec
Normal file
199
byte-buddy.spec
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
# Byte Buddy requires itself to build, so set this flag
|
||||||
|
# to break the bootstrap cycle
|
||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
|
Name: byte-buddy
|
||||||
|
Version: 1.10.14
|
||||||
|
Release: 1%{?dist}
|
||||||
|
Summary: Runtime code generation for the Java virtual machine
|
||||||
|
License: ASL 2.0
|
||||||
|
URL: http://bytebuddy.net/
|
||||||
|
Source0: https://github.com/raphw/byte-buddy/archive/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
# Patch the build to avoid bundling inside shaded jars
|
||||||
|
Patch0: avoid-bundling-asm.patch
|
||||||
|
|
||||||
|
BuildRequires: maven-local
|
||||||
|
%if %{without bootstrap}
|
||||||
|
BuildRequires: mvn(junit:junit)
|
||||||
|
BuildRequires: mvn(net.bytebuddy:byte-buddy)
|
||||||
|
BuildRequires: mvn(net.bytebuddy:byte-buddy-dep)
|
||||||
|
BuildRequires: mvn(net.bytebuddy:byte-buddy-maven-plugin)
|
||||||
|
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||||
|
BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
|
||||||
|
BuildRequires: mvn(org.mockito:mockito-core)
|
||||||
|
BuildRequires: mvn(org.ow2.asm:asm-analysis)
|
||||||
|
BuildRequires: mvn(org.ow2.asm:asm-util)
|
||||||
|
%endif
|
||||||
|
BuildRequires: mvn(net.java.dev.jna:jna)
|
||||||
|
BuildRequires: mvn(net.java.dev.jna:jna-platform)
|
||||||
|
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.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||||
|
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||||
|
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)
|
||||||
|
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description
|
||||||
|
Byte Buddy is a code generation library for creating 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.
|
||||||
|
|
||||||
|
%package agent
|
||||||
|
Summary: Byte Buddy Java agent
|
||||||
|
|
||||||
|
%description agent
|
||||||
|
The Byte Buddy Java agent allows to access the JVM's HotSwap feature.
|
||||||
|
|
||||||
|
%package maven-plugin
|
||||||
|
Summary: Byte Buddy Maven plugin
|
||||||
|
|
||||||
|
%description maven-plugin
|
||||||
|
A plugin for post-processing class files via Byte Buddy in a Maven build.
|
||||||
|
|
||||||
|
%package parent
|
||||||
|
Summary: Byte Buddy parent POM
|
||||||
|
|
||||||
|
%description parent
|
||||||
|
The parent artifact contains configuration information that
|
||||||
|
concern all modules.
|
||||||
|
|
||||||
|
%package javadoc
|
||||||
|
Summary: Javadoc for %{name}
|
||||||
|
|
||||||
|
%description javadoc
|
||||||
|
This package contains API documentation for %{name}.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n %{name}-%{name}-%{version}
|
||||||
|
%patch0
|
||||||
|
|
||||||
|
# Remove pre-built jars
|
||||||
|
find -name *.jar -delete
|
||||||
|
find -name *.class -delete
|
||||||
|
|
||||||
|
# JDK 11 does not know about the Java record type
|
||||||
|
rm byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
|
||||||
|
|
||||||
|
# Cause pre-compiled stuff to be re-compiled
|
||||||
|
mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/build/*.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
|
||||||
|
%pom_disable_module byte-buddy-android
|
||||||
|
%pom_disable_module byte-buddy-android-test
|
||||||
|
%pom_disable_module byte-buddy-benchmark
|
||||||
|
|
||||||
|
# Don't ship gradle plugin
|
||||||
|
%pom_disable_module byte-buddy-gradle-plugin
|
||||||
|
|
||||||
|
# Remove check plugins unneeded by RPM builds
|
||||||
|
%pom_remove_plugin :jacoco-maven-plugin
|
||||||
|
%pom_remove_plugin :license-maven-plugin
|
||||||
|
%pom_remove_plugin :pitest-maven
|
||||||
|
%pom_remove_plugin :coveralls-maven-plugin
|
||||||
|
%pom_remove_plugin :spotbugs-maven-plugin
|
||||||
|
%pom_remove_plugin :jitwatch-jarscan-maven-plugin
|
||||||
|
%pom_remove_plugin :clirr-maven-plugin
|
||||||
|
%pom_remove_plugin :maven-release-plugin
|
||||||
|
|
||||||
|
# Not interested in shading sources (causes NPE on old versions of shade plugin)
|
||||||
|
%pom_xpath_set "pom:createSourcesJar" "false" byte-buddy
|
||||||
|
|
||||||
|
# Drop build dep on findbugs annotations, used only by the above check plugins
|
||||||
|
%pom_remove_dep :findbugs-annotations
|
||||||
|
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
|
||||||
|
|
||||||
|
%if %{with bootstrap}
|
||||||
|
# Remove circular self-dependency to allow bootstrapping
|
||||||
|
%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%build
|
||||||
|
%if %{with bootstrap}
|
||||||
|
# Cannot run the test suite in bootstrap mode due to circular dep
|
||||||
|
# on self and mockito
|
||||||
|
%mvn_build -s -f -- -P'java8,!checks'
|
||||||
|
%else
|
||||||
|
# Ignore test failures, there seems to be something different about the
|
||||||
|
# bytecode of our recompiled test resources, expect 6 test failures in
|
||||||
|
# the byte-buddy-dep module
|
||||||
|
%mvn_build -s -- -P'java8,!checks' -Dsourcecode.test.version=1.8 -Dmaven.test.failure.ignore=true
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%install
|
||||||
|
%mvn_install
|
||||||
|
|
||||||
|
%files -f .mfiles-%{name} -f .mfiles-%{name}-dep
|
||||||
|
%doc README.md release-notes.md
|
||||||
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
|
%files agent -f .mfiles-%{name}-agent
|
||||||
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
|
%files maven-plugin -f .mfiles-%{name}-maven-plugin
|
||||||
|
|
||||||
|
%files parent -f .mfiles-%{name}-parent
|
||||||
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
|
%files javadoc -f .mfiles-javadoc
|
||||||
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Fri Aug 14 2020 Jerry James <loganjerry@gmail.com> - 1.10.14-1
|
||||||
|
- Version 1.10.14
|
||||||
|
- Remove no longer needed no-unixsocket.patch
|
||||||
|
- Add workaround for compiling tests with JDK 11
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.9.5-8
|
||||||
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Dec 06 2018 Mat Booth <mat.booth@redhat.com> - 1.9.5-4
|
||||||
|
- Prevent NPE in maven-shade-plugin
|
||||||
|
|
||||||
|
* Wed Dec 05 2018 Mat Booth <mat.booth@redhat.com> - 1.9.5-3
|
||||||
|
- Enable test suites
|
||||||
|
|
||||||
|
* Tue Dec 04 2018 Mat Booth <mat.booth@redhat.com> - 1.9.5-2
|
||||||
|
- Full, non-bootstrap build
|
||||||
|
|
||||||
|
* Fri Nov 30 2018 Mat Booth <mat.booth@redhat.com> - 1.9.5-1
|
||||||
|
- Update to latest upstream release
|
||||||
|
- Add a bootstrap mode to break circular self-dependency
|
||||||
|
- Patch out use of optional external unixsocket library that is not present
|
||||||
|
in Fedora
|
||||||
|
- Patch to avoid bundling ASM inside the shaded jar
|
||||||
|
|
||||||
|
* Wed May 25 2016 gil cattaneo <puntogil@libero.it> 1.3.19-1
|
||||||
|
- update to 1.3.19
|
||||||
|
|
||||||
|
* Tue Dec 22 2015 gil cattaneo <puntogil@libero.it> 0.7.7-1
|
||||||
|
- initial rpm
|
||||||
|
|
Loading…
Reference in New Issue
Block a user