From 29eb35a278e71882e79c4575afc249371f3eb736 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Fri, 27 Apr 2018 16:45:10 +0200 Subject: [PATCH 01/43] Update to latest upstream 4.0.2 release. --- .gitignore | 1 + byteman.spec | 35 +++++++++++++++---- ...submit_integration_test_verification.patch | 14 ++++++++ sources | 2 +- 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 remove_submit_integration_test_verification.patch diff --git a/.gitignore b/.gitignore index c2e1295..bc090c9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /byteman-3.0.4/ /3.0.6.tar.gz /byteman-3.0.6/ +/4.0.2.tar.gz diff --git a/byteman.spec b/byteman.spec index 76f86e5..6851995 100644 --- a/byteman.spec +++ b/byteman.spec @@ -5,21 +5,24 @@ %global bindir %{homedir}/bin Name: byteman -Version: 3.0.6 -Release: 5%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman -# wget -O 3.0.6.tar.gz https://github.com/bytemanproject/byteman/archive/3.0.6.tar.gz +# wget -O 4.0.2.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.2.tar.gz Source0: https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz BuildArch: noarch +# Byteman 4.0.2 requires JDK 9+ to build. Require JDK 10 explicitly. +BuildRequires: java-10-openjdk-devel BuildRequires: maven-local BuildRequires: maven-shade-plugin BuildRequires: maven-source-plugin BuildRequires: maven-plugin-plugin BuildRequires: maven-plugin-bundle +BuildRequires: maven-assembly-plugin BuildRequires: maven-failsafe-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-surefire-plugin @@ -35,8 +38,11 @@ BuildRequires: testng # JBoss modules byteman plugin requires it BuildRequires: mvn(org.jboss.modules:jboss-modules) -Provides: bundled(objectweb-asm) = 0:5.0.4-2 -Provides: bundled(java_cup) = 1:0.11b-3 +Provides: bundled(objectweb-asm) = 6.1.1 +Provides: bundled(java_cup) = 1:0.11b-8 + +# Related pieces removed via pom_xpath_remove macros +Patch1: remove_submit_integration_test_verification.patch %description Byteman is a tool which simplifies tracing and testing of Java programs. @@ -69,6 +75,17 @@ This package contains the Byteman rule check maven plugin. # 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 +sed -i "s|net.sf.squirrel-sql.thirdparty-non-maven|java_cup|" tests/pom.xml +sed -i "s|java-cup|java_cup|" tests/pom.xml + +# Remove Submit integration test invocations (agent) +%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 + +# 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 +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='submit.TestSubmit.compiled']" tests # Remove scope=system and systemPath for com.sun:tools %pom_xpath_remove "pom:profiles/pom:profile/pom:dependencies/pom:dependency[pom:artifactId='tools']/pom:scope" install @@ -77,7 +94,6 @@ sed -i "s|java-cup|java_cup|" agent/pom.xml %pom_xpath_remove "pom:profiles/pom:profile/pom:dependencies/pom:dependency[pom:artifactId='tools']/pom:systemPath" contrib/bmunit # Some tests fail intermittently during builds. Disable them. -%pom_disable_module tests contrib/jboss-modules-system %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:executions" contrib/bmunit %pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" 'true' contrib/bmunit @@ -89,6 +105,7 @@ sed -i "s|java-cup|java_cup|" agent/pom.xml %mvn_package ":byteman-rulecheck-maven-plugin" rulecheck-maven-plugin %build +export JAVA_HOME=/usr/lib/jvm/java-10-openjdk %mvn_build %install @@ -127,7 +144,7 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %files -f .mfiles %{homedir}/* %{_bindir}/* -%doc README docs/ProgrammersGuide.pdf +%doc README %license docs/copyright.txt %files javadoc -f .mfiles-javadoc @@ -137,6 +154,10 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %license docs/copyright.txt %changelog +* Fri Apr 27 2018 Severin Gehwolf - 4.0.2-1 +- Update to latest upstream 4.0.2 release. +- Adds support for modular JDKs. + * Wed Feb 07 2018 Fedora Release Engineering - 3.0.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/remove_submit_integration_test_verification.patch b/remove_submit_integration_test_verification.patch new file mode 100644 index 0000000..dae9507 --- /dev/null +++ b/remove_submit_integration_test_verification.patch @@ -0,0 +1,14 @@ +diff --git a/byteman-4.0.2/agent/verification.xml b/byteman-4.0.2/agent/verification.xml +index f530cfe..52ece06 100644 +--- a/byteman-4.0.2/agent/verification.xml ++++ b/byteman-4.0.2/agent/verification.xml +@@ -171,9 +171,5 @@ + target/failsafe-reports/org.jboss.byteman.tests.misc.TestThrowBinding.txt + + +- +- target/failsafe-reports/org.jboss.byteman.tests.submit.TestSubmit.txt +- +- + + diff --git a/sources b/sources index de5d31f..e276057 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -945cf839a10ce71fdf21fb9992555bcb 3.0.6.tar.gz +SHA512 (4.0.2.tar.gz) = 50e85cf73d1f820ed42ba43672504edb5057ed8ddcd9d14a2b8c6b92fbf39d382937675ce9e10b3b1336359971909d9f246bd8be5ed08666da14ee3c57abd5f8 From b16bdaa1c68ea2b0c98c0db0fd8d3dff74dfe9a9 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 3 Jul 2018 11:11:41 +0200 Subject: [PATCH 02/43] Update to latest upstream 4.0.3 release. --- .gitignore | 1 + byteman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bc090c9..c6f0cb2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /3.0.6.tar.gz /byteman-3.0.6/ /4.0.2.tar.gz +/4.0.3.tar.gz diff --git a/byteman.spec b/byteman.spec index 6851995..5f1c4de 100644 --- a/byteman.spec +++ b/byteman.spec @@ -5,17 +5,17 @@ %global bindir %{homedir}/bin Name: byteman -Version: 4.0.2 +Version: 4.0.3 Release: 1%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman -# wget -O 4.0.2.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.2.tar.gz +# wget -O 4.0.3.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.3.tar.gz Source0: https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz BuildArch: noarch -# Byteman 4.0.2 requires JDK 9+ to build. Require JDK 10 explicitly. +# Byteman 4.x requires JDK 9+ to build. Require JDK 10 explicitly. BuildRequires: java-10-openjdk-devel BuildRequires: maven-local BuildRequires: maven-shade-plugin @@ -154,6 +154,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %license docs/copyright.txt %changelog +* Tue Jul 03 2018 Severin Gehwolf - 4.0.3-1 +- Update to latest upstream 4.0.3 release. + * Fri Apr 27 2018 Severin Gehwolf - 4.0.2-1 - Update to latest upstream 4.0.2 release. - Adds support for modular JDKs. diff --git a/sources b/sources index e276057..dca51e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.2.tar.gz) = 50e85cf73d1f820ed42ba43672504edb5057ed8ddcd9d14a2b8c6b92fbf39d382937675ce9e10b3b1336359971909d9f246bd8be5ed08666da14ee3c57abd5f8 +SHA512 (4.0.3.tar.gz) = 9d8692e3464fde26cd28bbc6a268d8e9125104c792a577f13183159fb3d42cc9bdc5c157c42f67735c882dcdd24f6b9e3251c18761097ba4534eb0c075d87709 From bfb4d668ca56d70d8aa76ae089ac686d72ba3b4c Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Thu, 5 Jul 2018 17:06:28 +0200 Subject: [PATCH 03/43] Use Xmvn for javadoc generation. --- byteman.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/byteman.spec b/byteman.spec index 5f1c4de..334b5af 100644 --- a/byteman.spec +++ b/byteman.spec @@ -6,7 +6,7 @@ Name: byteman Version: 4.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman @@ -69,8 +69,6 @@ This package contains the Byteman rule check maven plugin. %prep %setup -q -n byteman-%{version} -# Fix doclint problem -%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration" "-Xdoclint:none" # Fix the gid:aid for java_cup sed -i "s|net.sf.squirrel-sql.thirdparty-non-maven|java_cup|" agent/pom.xml @@ -101,6 +99,10 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml %pom_disable_module download %pom_disable_module docs +# 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 + # Put maven plugin into a separate package %mvn_package ":byteman-rulecheck-maven-plugin" rulecheck-maven-plugin @@ -154,6 +156,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %license docs/copyright.txt %changelog +* Thu Jul 05 2018 Severin Gehwolf - 4.0.3-2 +- Don't use maven-javadoc-plugin. Use XMvn instead. + * Tue Jul 03 2018 Severin Gehwolf - 4.0.3-1 - Update to latest upstream 4.0.3 release. From d197d727fe4d8fd81aea13693e5ebc18f7374283 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 11 Jul 2018 10:32:11 +0200 Subject: [PATCH 04/43] Update to upstream 4.0.4 release. - Split subpackages requiring junit at runtime: byteman-dtest, byteman-bmunit - Fix filtering of asm requirements. They shouldn't be there since asm gets bundled. - java-headless >= 1:1.9 would get generated, but byteman 4.x runs on JDK 6+. Require >= JDK 8 - Properly install structure for jboss-modules-plugin to work: bminstall -m --- .gitignore | 1 + byteman.spec | 75 ++++++++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 69 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c6f0cb2..a40962f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /byteman-3.0.6/ /4.0.2.tar.gz /4.0.3.tar.gz +/4.0.4.tar.gz diff --git a/byteman.spec b/byteman.spec index 334b5af..56e74e5 100644 --- a/byteman.spec +++ b/byteman.spec @@ -1,16 +1,25 @@ -%global javacup_or_asm java_cup:java_cup|org.ow2.asm:asm-all -%global __requires_exclude ^.*mvn\\(%{javacup_or_asm}\\)$ +# Note to the interested reader: +# fedpkg mockbuild --without tests +# will make mvn_build macro skip tests. +# See: https://github.com/fedora-java/javapackages/issues/62 + +%global javacup_or_asm java_cup:java_cup|org\\.ow2\\.asm:asm.* +# Don't have generated mvn()-style requires for java_cup or asm +%global mvn_javacup_or_asm_matcher .*mvn\\(%{javacup_or_asm}\\) +# Don't have generated requires for java-headless >= 1:1.9 +%global java_headless_matcher java-headless >= 1:(1\\.9|9) +%global __requires_exclude ^%{mvn_javacup_or_asm_matcher}|%{java_headless_matcher}$ %global homedir %{_datadir}/%{name} %global bindir %{homedir}/bin Name: byteman -Version: 4.0.3 -Release: 2%{?dist} +Version: 4.0.4 +Release: 1%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman -# wget -O 4.0.3.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.3.tar.gz +# wget -O 4.0.4.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.4.tar.gz Source0: https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz BuildArch: noarch @@ -38,8 +47,11 @@ BuildRequires: testng # JBoss modules byteman plugin requires it BuildRequires: mvn(org.jboss.modules:jboss-modules) -Provides: bundled(objectweb-asm) = 6.1.1 +Provides: bundled(objectweb-asm) = 6.2 Provides: bundled(java_cup) = 1:0.11b-8 +# 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 @@ -67,6 +79,21 @@ Summary: Maven plugin for checking Byteman rules. %description rulecheck-maven-plugin This package contains the Byteman rule check maven plugin. +%package bmunit +Summary: TestNG and JUnit integration for Byteman. + +%description bmunit +The Byteman bmunit jar provides integration of Byteman into +TestNG and JUnit tests. + +%package dtest +Summary: Remote byteman instrumented testing. + +%description dtest +The Byteman dtest jar supports instrumentation of test code executed on +remote server hosts and validation of assertions describing the expected +operation of the instrumented methods. + %prep %setup -q -n byteman-%{version} @@ -103,8 +130,12 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml %pom_remove_plugin -r :maven-javadoc-plugin %pom_xpath_remove 'pom:execution[pom:id="make-javadoc-assembly"]' byteman -# Put maven plugin into a separate package +# Put byteman-rulecheck-maven-plugin into a separate package %mvn_package ":byteman-rulecheck-maven-plugin" rulecheck-maven-plugin +# Put byteman-bmunit/byteman-dtest into a separate packages since they +# runtime require junit +%mvn_package ":byteman-bmunit" bmunit +%mvn_package ":byteman-dtest" dtest %build export JAVA_HOME=/usr/lib/jvm/java-10-openjdk @@ -141,10 +172,21 @@ for m in bmunit dtest install sample submit; do ln -s %{_javadir}/byteman/byteman-${m}.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman-${m}.jar done +# Create contrib/jboss-module-system structure since bminstall expects it +# for the -m option. +install -d -m 755 $RPM_BUILD_ROOT%{homedir}/contrib +install -d -m 755 $RPM_BUILD_ROOT%{homedir}/contrib/jboss-modules-system +ln -s %{_javadir}/byteman/byteman-jboss-modules-plugin.jar $RPM_BUILD_ROOT%{homedir}/contrib/jboss-modules-system/byteman-jboss-modules-plugin.jar + ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %files -f .mfiles -%{homedir}/* +%{homedir}/lib/byteman.jar +%{homedir}/lib/byteman-install.jar +%{homedir}/lib/byteman-sample.jar +%{homedir}/lib/byteman-submit.jar +%{homedir}/contrib/* +%{bindir}/* %{_bindir}/* %doc README %license docs/copyright.txt @@ -155,7 +197,24 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %files rulecheck-maven-plugin -f .mfiles-rulecheck-maven-plugin %license docs/copyright.txt +%files bmunit -f .mfiles-bmunit +%license docs/copyright.txt +%{homedir}/lib/byteman-bmunit.jar + +%files dtest -f .mfiles-dtest +%license docs/copyright.txt +%{homedir}/lib/byteman-dtest.jar + %changelog +* Tue Jul 10 2018 Severin Gehwolf - 4.0.4-1 +- Update to latest upstream 4.0.4 release. +- Split junit-dependent packages into sub-packages: + byteman-dtest, byteman-bmunit +- Fix automatically generated requirements: + - ASM is BR-only and bundled. + - 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 - 4.0.3-2 - Don't use maven-javadoc-plugin. Use XMvn instead. diff --git a/sources b/sources index dca51e6..812b9a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.3.tar.gz) = 9d8692e3464fde26cd28bbc6a268d8e9125104c792a577f13183159fb3d42cc9bdc5c157c42f67735c882dcdd24f6b9e3251c18761097ba4534eb0c075d87709 +SHA512 (4.0.4.tar.gz) = 1d6b45dfa535a6c2a4615db679c1dcc51cfd84923ac2c1ba97716572af2baece0b39119aff7b3266e9d1838dc8b47f678b7efc5bbaf9500329728e982dd7774c From 86377359cb863878b58c608928b5bb4da5fe6dc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:27:12 +0000 Subject: [PATCH 05/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- byteman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/byteman.spec b/byteman.spec index 56e74e5..1a865ec 100644 --- a/byteman.spec +++ b/byteman.spec @@ -15,7 +15,7 @@ Name: byteman Version: 4.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman @@ -206,6 +206,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 4.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Severin Gehwolf - 4.0.4-1 - Update to latest upstream 4.0.4 release. - Split junit-dependent packages into sub-packages: From 6393d2ea80421f02f67ebbffe723f722808eaa60 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 21 Nov 2018 20:06:58 +0100 Subject: [PATCH 06/43] Update to latest upstream 4.0.5 release. --- .gitignore | 1 + byteman.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a40962f..8b2baed 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /4.0.2.tar.gz /4.0.3.tar.gz /4.0.4.tar.gz +/4.0.5.tar.gz diff --git a/byteman.spec b/byteman.spec index 1a865ec..2ac8281 100644 --- a/byteman.spec +++ b/byteman.spec @@ -14,18 +14,18 @@ %global bindir %{homedir}/bin Name: byteman -Version: 4.0.4 -Release: 2%{?dist} +Version: 4.0.5 +Release: 1%{?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.5.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.5.tar.gz Source0: https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz BuildArch: noarch # Byteman 4.x requires JDK 9+ to build. Require JDK 10 explicitly. -BuildRequires: java-10-openjdk-devel +BuildRequires: java-11-openjdk-devel BuildRequires: maven-local BuildRequires: maven-shade-plugin BuildRequires: maven-source-plugin @@ -47,7 +47,7 @@ BuildRequires: testng # JBoss modules byteman plugin requires it BuildRequires: mvn(org.jboss.modules:jboss-modules) -Provides: bundled(objectweb-asm) = 6.2 +Provides: bundled(objectweb-asm) = 7.0 Provides: bundled(java_cup) = 1:0.11b-8 # We are filtering java-headless >= 1:1.9 requirement. Add # JDK 8 requirement here explicitly which shouldn't match the filter. @@ -138,7 +138,7 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml %mvn_package ":byteman-dtest" dtest %build -export JAVA_HOME=/usr/lib/jvm/java-10-openjdk +export JAVA_HOME=/usr/lib/jvm/java-11-openjdk %mvn_build %install @@ -206,6 +206,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Wed Nov 21 2018 Severin Gehwolf - 4.0.5-1 +- Update to latest upstream 4.0.5 release. + * Thu Jul 12 2018 Fedora Release Engineering - 4.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 812b9a2..a32d102 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.4.tar.gz) = 1d6b45dfa535a6c2a4615db679c1dcc51cfd84923ac2c1ba97716572af2baece0b39119aff7b3266e9d1838dc8b47f678b7efc5bbaf9500329728e982dd7774c +SHA512 (4.0.5.tar.gz) = 2a9bd3d19ccfe2208c791422fc7bb89c2c322779c5ce4b917b50a9ec131ed23ca78f374e6e3c457774a06934446019a92ad4aea6402757ab6a82e8d6dd3afae7 From f74fa510677ca5f586ee1ef823f8629d51856f05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 15:04:50 +0000 Subject: [PATCH 07/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- byteman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/byteman.spec b/byteman.spec index 2ac8281..cef7105 100644 --- a/byteman.spec +++ b/byteman.spec @@ -15,7 +15,7 @@ Name: byteman Version: 4.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman @@ -206,6 +206,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 4.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Nov 21 2018 Severin Gehwolf - 4.0.5-1 - Update to latest upstream 4.0.5 release. From d145b9e4af8952b1a63432ec67d7109161f83617 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Mon, 6 May 2019 11:06:25 +0200 Subject: [PATCH 08/43] Use XMvn javadoc so as to fix FTBFS --- byteman.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/byteman.spec b/byteman.spec index cef7105..969f43e 100644 --- a/byteman.spec +++ b/byteman.spec @@ -15,7 +15,7 @@ Name: byteman Version: 4.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman @@ -139,7 +139,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,6 +210,10 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Mon May 06 2019 Severin Gehwolf - 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 - 4.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 7e2daf708c3e84c9e9855640beb7d1d284ac59cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:44:30 +0000 Subject: [PATCH 09/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- byteman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/byteman.spec b/byteman.spec index 969f43e..ab0ec35 100644 --- a/byteman.spec +++ b/byteman.spec @@ -15,7 +15,7 @@ Name: byteman Version: 4.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman @@ -210,6 +210,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 4.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon May 06 2019 Severin Gehwolf - 4.0.5-3 - Use XMvn javadoc so as to work-around maven-javadoc-plugin issue. - Fixes FTBFS. From 337efe8a9e309abafa10e5540ae4fc993eac3bed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 13:28:21 +0000 Subject: [PATCH 10/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- byteman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/byteman.spec b/byteman.spec index ab0ec35..b24a821 100644 --- a/byteman.spec +++ b/byteman.spec @@ -15,7 +15,7 @@ Name: byteman Version: 4.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman @@ -210,6 +210,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 4.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 4.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7328eeb7ee1d076096b0b3b8b9ca80df72117fb2 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 28 Jan 2020 18:29:04 +0100 Subject: [PATCH 11/43] Remove jarjar BR which is not needed Fixes FTBFS. --- byteman.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/byteman.spec b/byteman.spec index b24a821..3aa12ce 100644 --- a/byteman.spec +++ b/byteman.spec @@ -40,7 +40,6 @@ BuildRequires: maven-surefire-provider-junit BuildRequires: maven-verifier-plugin BuildRequires: maven-dependency-plugin BuildRequires: java_cup -BuildRequires: jarjar BuildRequires: objectweb-asm BuildRequires: junit BuildRequires: testng @@ -210,6 +209,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Tue Jan 28 2020 Severin Gehwolf - 4.0.5-5 +- Drop not needed BR jarjar. Fixes FTBFS. + * Tue Jan 28 2020 Fedora Release Engineering - 4.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2a0f245e821b5fa63032b0159c7a259c59e98bba Mon Sep 17 00:00:00 2001 From: Jayashree Huttanagoudar Date: Tue, 3 Mar 2020 15:42:48 +0530 Subject: [PATCH 12/43] Upgraded to latest upstream version 4.0.11 --- byteman.spec | 15 ++++++++++++--- sources | 2 +- tests_pom_xml.patch | 22 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 tests_pom_xml.patch diff --git a/byteman.spec b/byteman.spec index 3aa12ce..c270436 100644 --- a/byteman.spec +++ b/byteman.spec @@ -14,12 +14,12 @@ %global bindir %{homedir}/bin Name: byteman -Version: 4.0.5 -Release: 5%{?dist} +Version: 4.0.11 +Release: 1%{?dist} Summary: Java agent-based bytecode injection tool License: LGPLv2+ URL: http://www.jboss.org/byteman -# wget -O 4.0.5.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.5.tar.gz +# wget -O 4.0.11.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.11.tar.gz Source0: https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz BuildArch: noarch @@ -37,11 +37,13 @@ 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: objectweb-asm BuildRequires: junit +BuildRequires: junit5 BuildRequires: testng # JBoss modules byteman plugin requires it BuildRequires: mvn(org.jboss.modules:jboss-modules) @@ -54,6 +56,7 @@ Requires: java-headless >= 1:1.8 # Related pieces removed via pom_xpath_remove macros Patch1: remove_submit_integration_test_verification.patch +Patch2: tests_pom_xml.patch %description Byteman is a tool which simplifies tracing and testing of Java programs. @@ -106,6 +109,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 @@ -209,6 +213,11 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog +* Tue Mar 03 2020 Jayashree Huttanagoudar - 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 - 4.0.5-5 - Drop not needed BR jarjar. Fixes FTBFS. diff --git a/sources b/sources index a32d102..3e309e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.5.tar.gz) = 2a9bd3d19ccfe2208c791422fc7bb89c2c322779c5ce4b917b50a9ec131ed23ca78f374e6e3c457774a06934446019a92ad4aea6402757ab6a82e8d6dd3afae7 +SHA512 (4.0.11.tar.gz) = 05e82df5e6747934c3b80932534118c25571482c4dd0f0be0468a683e6185ca4ae039f7bdabc0151067c2c61cf450b19636c50840ae6749df461dc0a1f305f69 diff --git a/tests_pom_xml.patch b/tests_pom_xml.patch new file mode 100644 index 0000000..4b76997 --- /dev/null +++ b/tests_pom_xml.patch @@ -0,0 +1,22 @@ +diff --git a/byteman-4.0.11/tests/pom.xml b/byteman-4.0.11/tests/pom.xml +index 60e4e1a..1a2abed 100644 +--- a/byteman-4.0.11/tests/pom.xml ++++ b/byteman-4.0.11/tests/pom.xml +@@ -1166,7 +1166,7 @@ + + org/jboss/byteman/tests/bugfixes/TestTraceOpenAndWrite.class + +- -javaagent:${project.build.directory}/byteman-${project.version}.jar=script:${project.build.testOutputDirectory}/scripts/bugfixes/TestTraceOpenAndWrite.btm ++ -javaagent:${project.build.directory}/../../byteman/target/byteman-${project.version}.jar=script:${project.build.directory}/../../agent/src/test/resources/scripts/bugfixes/TestTraceOpenAndWrite.btm + + +