From 747a34e1fd63d78af7b25e5781ca328915df57cb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 8 Jun 2021 20:17:56 +0200 Subject: [PATCH] Bootstrap Maven as non-modular packages Resolves: rhbz#1951482 --- .gitignore | 2 ++ 0001-Remove-unused-import.patch | 24 +++++++++++++++ cglib.spec | 54 ++++++++++++++++++++++++--------- sources | 2 +- 4 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 0001-Remove-unused-import.patch diff --git a/.gitignore b/.gitignore index 5711d27..4ae91f5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ cglib-src-2.2.jar /RELEASE_3_2_4.tar.gz /cglib-RELEASE_3_2_4 /RELEASE_3_2_9.tar.gz +/RELEASE_3_2_12.tar.gz +/RELEASE_3_3_0.tar.gz diff --git a/0001-Remove-unused-import.patch b/0001-Remove-unused-import.patch new file mode 100644 index 0000000..9dd3e83 --- /dev/null +++ b/0001-Remove-unused-import.patch @@ -0,0 +1,24 @@ +From 912eaec202f33f8a0a9832bb3551674b6788e7f0 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 5 Nov 2019 08:47:50 +0100 +Subject: [PATCH] Remove unused import + +--- + cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java b/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java +index e7de82b..1f1f744 100644 +--- a/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java ++++ b/cglib/src/main/java/net/sf/cglib/reflect/MethodDelegate.java +@@ -17,7 +17,6 @@ package net.sf.cglib.reflect; + + import java.lang.reflect.*; + import java.security.ProtectionDomain; +-import net.sf.cglib.*; + import net.sf.cglib.core.*; + import org.objectweb.asm.ClassVisitor; + import org.objectweb.asm.Type; +-- +2.21.0 + diff --git a/cglib.spec b/cglib.spec index 1294bc0..8c37699 100644 --- a/cglib.spec +++ b/cglib.spec @@ -1,22 +1,33 @@ -%global tarball_name RELEASE_3_2_9 +# Workaround for rhbz#1969370: __bootstrap macro is not defined in +# CentOS Stream, See https://bugzilla.redhat.com/1969370 +%global __bootstrap ~bootstrap + +%bcond_without bootstrap + +%global tarball_name RELEASE_%(echo '%{version}' | tr . _) Name: cglib -Version: 3.2.9 -Release: 10%{?dist} +Version: 3.3.0 +Release: 4%{?dist} Summary: Code Generation Library for Java # ASM MethodVisitor is based on ASM code and therefore # BSD-licensed. Everything else is ASL 2.0. License: ASL 2.0 and BSD URL: https://github.com/cglib/cglib -Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz BuildArch: noarch +Source0: https://github.com/cglib/cglib/archive/%{tarball_name}.tar.gz + +Patch0: 0001-Remove-unused-import.patch + BuildRequires: maven-local -BuildRequires: maven-plugin-bundle -BuildRequires: javapackages-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(junit:junit) +%endif %description cglib is a powerful, high performance and quality code generation library @@ -31,6 +42,7 @@ Documentation for the cglib code generation library. %prep %setup -q -n %{name}-%{tarball_name} +%patch0 -p1 # remove unnecessary dependency on parent POM %pom_remove_parent @@ -56,14 +68,12 @@ Documentation for the cglib code generation library. %pom_remove_plugin org.apache.maven.plugins:maven-jarsigner-plugin cglib-sample %pom_remove_plugin -r :maven-javadoc-plugin -%pom_xpath_inject "pom:dependency[pom:artifactId='ant']" "true" cglib - %mvn_alias :cglib "net.sf.cglib:cglib" "cglib:cglib-full" "cglib:cglib-nodep" "org.sonatype.sisu.inject:cglib" %build -# 5 upstream failures on Java 9 or above -# https://github.com/cglib/cglib/issues/119 -%mvn_build -- -Dmaven.test.failure.ignore=true -Dsource=1.8 +# 5 tests fail with OpenJDK 11 +# Forwarded upstream: https://github.com/cglib/cglib/issues/119 +%mvn_build -f %install %mvn_install @@ -75,8 +85,12 @@ Documentation for the cglib code generation library. %license LICENSE NOTICE %changelog -* Thu Apr 15 2021 Mohan Boddu - 3.2.9-10 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.3.0-4 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 3.3.0-3 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 3.2.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -97,9 +111,21 @@ Documentation for the cglib code generation library. * Tue Jan 28 2020 Fedora Release Engineering - 3.2.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-2 +- Mass rebuild for javapackages-tools 201902 + +* Thu Aug 15 2019 Marian Koncek - 3.3.0-1 +- Update to upstream version 3.3.0 + * Wed Jul 24 2019 Fedora Release Engineering - 3.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Thu Jun 27 2019 Marian Koncek - 3.2.12-1 +- Update to upstream version 3.2.12 + +* Fri May 24 2019 Mikolaj Izdebski - 3.2.9-3 +- Mass rebuild for javapackages-tools 201901 + * Thu Jan 31 2019 Fedora Release Engineering - 3.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 1c68b09..7957f99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (RELEASE_3_2_9.tar.gz) = 92eaf38cc5cc70932292a0e837eb4e547c4e9f10d6fd4634ee44f9fbdf03522071d6230fda35efc9eb4b4dd9f8925f3ba7f24e9379c83ef45b798e342d66db3c +SHA512 (RELEASE_3_3_0.tar.gz) = 635dcdb10a8fe83887a1dc8cf12844fe61b73a12fb530bf84d6ac53f75b0103820d76518cbc0d93d63dba86d13929f0df4dbae3b4943a402cf9f2af76f44161a