.byteman.metadata

@@ -1 +1 @@
-4572a27f156b3cba082db187c7712059e99cfd5c SOURCES/4.0.4.tar.gz
+28d6224afa24e7847f677865e362d83eb8843873 4.0.16.tar.gz

.gitignore

@@ -1 +1,13 @@
-SOURCES/4.0.4.tar.gz
+/byteman-1.5.2-full-clean.tar.gz
+/byteman-2.0.4.tar.xz
+/2.1.2.tar.gz
+/373601b4e608ea622b2fec947824b99cd0edb124.tar.gz
+/3.0.4.tar.gz
+/byteman-3.0.4/
+/3.0.6.tar.gz
+/byteman-3.0.6/
+/4.0.2.tar.gz
+/4.0.3.tar.gz
+/4.0.4.tar.gz
+/4.0.5.tar.gz
+/4.0.16.tar.gz

byteman.spec

@@ -14,17 +14,17 @@
 %global bindir %{homedir}/bin
 
 Name:             byteman
-Version:          4.0.4
+Version:          4.0.16
 Release:          2%{?dist}
 Summary:          Java agent-based bytecode injection tool
 License:          LGPLv2+
 URL:              http://www.jboss.org/byteman
-# wget -O 4.0.4.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.4.tar.gz
+# wget -O 4.0.16.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.16.tar.gz
 Source0:          https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz
 
 BuildArch:        noarch
 
-# Byteman 4.x requires JDK 9+ to build. Require JDK 11 explicitly.
+# Byteman 4.x requires JDK 9+ to build. Require JDK 10 explicitly.
 BuildRequires:    java-11-openjdk-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-shade-plugin
@@ -37,24 +37,24 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-surefire-provider-testng
 BuildRequires:    maven-surefire-provider-junit
+BuildRequires:    maven-surefire-provider-junit5
 BuildRequires:    maven-verifier-plugin
 BuildRequires:    maven-dependency-plugin
 BuildRequires:    java_cup
-BuildRequires:    jarjar
 BuildRequires:    objectweb-asm
 BuildRequires:    junit
+BuildRequires:    junit5
 BuildRequires:    testng
-# JBoss modules byteman plugin requires it
-BuildRequires:    mvn(org.jboss.modules:jboss-modules)
 
-Provides:         bundled(objectweb-asm) = 6.2
-Provides:         bundled(java_cup) = 1:0.11b-8
+Provides:         bundled(objectweb-asm) = 9.1
+Provides:         bundled(java_cup) = 1:0.11b-19
 # We are filtering java-headless >= 1:1.9 requirement. Add
 # JDK 8 requirement here explicitly which shouldn't match the filter.
 Requires:         java-headless >= 1:1.8
 
 # Related pieces removed via pom_xpath_remove macros
 Patch1:           remove_submit_integration_test_verification.patch
+Patch2:           testng7_port.patch
 
 %description
 Byteman is a tool which simplifies tracing and testing of Java programs.
@@ -97,10 +97,6 @@ operation of the instrumented methods.
 %prep
 %setup -q -n byteman-%{version}
 
-# Don't use javadoc plugin, use XMvn for javadocs
-%pom_remove_plugin -r :maven-javadoc-plugin
-%pom_xpath_remove 'pom:execution[pom:id="make-javadoc-assembly"]' byteman
-
 # Fix the gid:aid for java_cup
 sed -i "s|net.sf.squirrel-sql.thirdparty-non-maven|java_cup|" agent/pom.xml
 sed -i "s|java-cup|java_cup|" agent/pom.xml
@@ -111,6 +107,7 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='submit.TestSubmit']" agent
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='submit.TestSubmit.compiled']" agent
 %patch1 -p2
+%patch2 -p2
 
 # Remove Submit integration test invocations (tests)
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='submit.TestSubmit']" tests
@@ -130,8 +127,16 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 %pom_disable_module download
 %pom_disable_module docs
 
-# Put maven plugin into a separate package
+# Don't use javadoc plugin, use XMvn for javadocs
+%pom_remove_plugin -r :maven-javadoc-plugin
+%pom_remove_dep 'org.apache.maven:maven-project' contrib/rulecheck-maven-plugin
+%pom_xpath_remove 'pom:execution[pom:id="make-javadoc-assembly"]' byteman
+
+# Put byteman-rulecheck-maven-plugin into a separate package
 %mvn_package ":byteman-rulecheck-maven-plugin" rulecheck-maven-plugin
+
+# CNFE being thrown without this for bmunit5 in rawhide and with tests enabled
+%pom_add_dep "org.apache.commons:commons-lang3" contrib/bmunit5
 # Put byteman-bmunit/byteman-dtest into a separate packages since they
 # runtime require junit
 %mvn_package ":byteman-bmunit" bmunit
@@ -139,7 +144,11 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 
 %build
 export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
-%mvn_build
+# Use --xmvn-javadoc so as to avoid maven-javadoc-plugin issue
+# (fixed in 3.1.0, fedora has 3.0.1):
+# See https://issues.apache.org/jira/browse/MJAVADOC-555
+#     https://bugs.openjdk.java.net/browse/JDK-8212233
+%mvn_build --xmvn-javadoc
 
 %install
 %mvn_install
@@ -206,8 +215,52 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
 %{homedir}/lib/byteman-dtest.jar
 
 %changelog
-* Wed Jul 18 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.4-2
-- Rebuild with java-11-openjdk.
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.16-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Jun 18 2021 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.16-1
+- Update to latest upstream 4.0.16 release for JDK 17 support.
+- Drop not-needed jboss-modules BR.
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.11-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.0.11-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Mar 03 2020 Jayashree Huttanagoudar <jhuttana@redhat.com> - 4.0.11-1
+- Upgrated to latest upstream version 4.0.11
+- Added a patch to fix rpm build issue caused due to misconfiguration in upstream
+- Added required additional plugins required for build
+
+* Tue Jan 28 2020 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.5-5
+- Drop not needed BR jarjar. Fixes FTBFS.
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 06 2019 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.5-3
+- Use XMvn javadoc so as to work-around maven-javadoc-plugin issue.
+- Fixes FTBFS.
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Nov 21 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.5-1
+- Update to latest upstream 4.0.5 release.
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue Jul 10 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.4-1
 - Update to latest upstream 4.0.4 release.
@@ -218,17 +271,16 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
   - java-headless >= 1:1.9 would get generated, but byteman 4.x
     runs on JDK 8 too (would even work for JDK 6)
 
+* Thu Jul 05 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.3-2
+- Don't use maven-javadoc-plugin. Use XMvn instead.
+
 * Tue Jul 03 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.3-1
 - Update to latest upstream 4.0.3 release.
 
-* Mon Jul 02 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.2-1
+* Fri Apr 27 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.2-1
 - Update to latest upstream 4.0.2 release.
 - Adds support for modular JDKs.
 
-* Wed May 16 2018 Severin Gehwolf <sgehwolf@redhat.com> - 3.0.6-6
-- Add maven-javadoc-plugin as BR. Fix versions of bundled
-  libs.
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -0,0 +1 @@
+SHA512 (4.0.16.tar.gz) = e0ec3932b698d07e0543988a944ccdf36533147e056218e0cc92d0ed9695dfaa5066482f493607b16732fcf3c6f5107eefdd7930f6877b747cb21bfecdb737dd

testng7_port.patch

@@ -0,0 +1,22 @@
+diff --git a/byteman-4.0.15/contrib/bmunit/src/org/jboss/byteman/contrib/bmunit/BMNGListener.java b/byteman-4.0.15/contrib/bmunit/src/org/jboss/byteman/contrib/bmunit/BMNGListener.java
+index 2f784bc..9e4fec9 100644
+--- a/byteman-4.0.15/contrib/bmunit/src/org/jboss/byteman/contrib/bmunit/BMNGListener.java
++++ b/byteman-4.0.15/contrib/bmunit/src/org/jboss/byteman/contrib/bmunit/BMNGListener.java
+@@ -61,7 +61,7 @@ public class BMNGListener extends BMNGAbstractRunner implements IInvokedMethodLi
+     }
+ 
+     public void beforeInvocation(IInvokedMethod method, ITestResult testResult) {
+-        Method javaMethod = method.getTestMethod().getMethod();
++        Method javaMethod = method.getTestMethod().getConstructorOrMethod().getMethod();
+         Class clazz = javaMethod.getDeclaringClass();
+         if (!checkBMNGListener(clazz)) {
+             return;
+@@ -81,7 +81,7 @@ public class BMNGListener extends BMNGAbstractRunner implements IInvokedMethodLi
+     }
+ 
+     public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
+-        Method javaMethod = method.getTestMethod().getMethod();
++        Method javaMethod = method.getTestMethod().getConstructorOrMethod().getMethod();
+         Class clazz = javaMethod.getDeclaringClass();
+         if (!checkBMNGListener(clazz)) {
+             return;