diff --git a/.gitignore b/.gitignore index 7e8b725..acc83fa 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /4.0.5.tar.gz /4.0.15.tar.gz /4.0.16.tar.gz +/4.0.26.tar.gz diff --git a/byteman.spec b/byteman.spec index 19f1ccb..6cbe24c 100644 --- a/byteman.spec +++ b/byteman.spec @@ -14,10 +14,11 @@ %global bindir %{homedir}/bin Name: byteman -Version: 4.0.16 -Release: 6%{?dist} +Version: 4.0.26 +Release: 1%{?dist} Summary: Java agent-based bytecode injection tool -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: http://www.jboss.org/byteman # 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 @@ -26,12 +27,12 @@ BuildArch: noarch ExclusiveArch: %{java_arches} noarch # Byteman 4.x requires JDK 9+ to build. Require JDK 10 explicitly. -BuildRequires: java-11-openjdk-devel -BuildRequires: maven-local +BuildRequires: java-25-devel >= 1:11 +BuildRequires: maven-local-openjdk25 BuildRequires: maven-shade-plugin BuildRequires: maven-source-plugin BuildRequires: maven-plugin-plugin -BuildRequires: maven-plugin-bundle +BuildRequires: maven-bundle-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-failsafe-plugin BuildRequires: maven-jar-plugin @@ -51,7 +52,7 @@ Provides: bundled(objectweb-asm) = 9.1 Provides: bundled(java_cup) = 1:0.11b-17 # 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 +Requires: java-25-headless >= 1:1.8 # Related pieces removed via pom_xpath_remove macros Patch1: remove_submit_integration_test_verification.patch @@ -107,8 +108,8 @@ 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 -%patch2 -p2 +%patch -P1 -p2 +%patch -P2 -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 @@ -124,12 +125,17 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml %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 +# source/target 1.6 is not supported by 17; default is now 1.8 +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" pom.xml +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" pom.xml + # Don't build download, docs modules %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_remove_plugin -r :central-publishing-maven-plugin %pom_remove_dep 'org.apache.maven:maven-project' contrib/rulecheck-maven-plugin %pom_xpath_remove 'pom:execution[pom:id="make-javadoc-assembly"]' byteman @@ -144,12 +150,12 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml %mvn_package ":byteman-dtest" dtest %build -export JAVA_HOME=/usr/lib/jvm/java-11-openjdk +export JAVA_HOME=/usr/lib/jvm/java-openjdk # 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 +%mvn_build --xmvn-javadoc -f %install %mvn_install @@ -216,180 +222,4 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar %{homedir}/lib/byteman-dtest.jar %changelog -* Wed Jul 20 2022 Fedora Release Engineering - 4.0.16-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 4.0.16-5 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 4.0.16-4 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 4.0.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 4.0.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 18 2021 Severin Gehwolf - 4.0.16-1 -- Update to latest upstream 4.0.16 release. -- Drop not-needed jboss-modules BR. - -* Mon May 31 2021 Severin Gehwolf - 4.0.15-2 -- Re-enable tests during build. - -* Mon May 31 2021 Severin Gehwolf - 4.0.15-1 -- Update to latest upstream 4.0.15 release. -- Drop tests_pom_xml.patch now included upstream. - -* Tue Jan 26 2021 Fedora Release Engineering - 4.0.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 4.0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 4.0.11-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* 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. - -* 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 - -* 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 - -* 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 - -* 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. - -* 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. - -* Wed Feb 07 2018 Fedora Release Engineering - 3.0.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Dec 09 2016 Severin Gehwolf - 3.0.6-2 -- Add BRs, maven-plugin-bundle, maven-source-plugin and - maven-plugin-plugin, fixing FTBFS. -- Resolves: RHBZ#1402998 - -* Mon Jun 13 2016 Severin Gehwolf - 3.0.6-1 -- Update to latest upstream release. - -* Mon Mar 14 2016 Severin Gehwolf - 3.0.4-2 -- Enable some tests during build -- Fix generated requires by filtering requires for bundled libs. -- Split maven plugin into separate package. - -* Thu Feb 18 2016 Severin Gehwolf - 3.0.4-1 -- Update to latest upstream 3.0.4 release. - -* Wed Feb 03 2016 Fedora Release Engineering - 2.1.4.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Aug 06 2015 gil cattaneo 2.1.4.1-7 -- Fix FTBFS rhbz#1239392 -- Remove duplicate files -- Introduce license macro - -* Wed Jun 17 2015 Fedora Release Engineering - 2.1.4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 27 2015 Michal Srb - 2.1.4.1-5 -- Fix FTBFS -- Rebuild to generate new metadata - -* Sat Jun 07 2014 Fedora Release Engineering - 2.1.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Apr 18 2014 Marek Goldmann - 2.1.4.1-3 -- Rebuilding for objectweb-asm update, RHBZ#1083570 - -* Fri Mar 28 2014 Michael Simacek - 2.1.4.1-2 -- Use Requires: java-headless rebuild (#1067528) - -* Fri Feb 14 2014 Marek Goldmann - 2.1.4.1-1 -- Upstream release 2.1.4.1 - -* Sat Aug 03 2013 Fedora Release Engineering - 2.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 04 2013 Marek Goldmann - 2.1.2-1 -- Upstream release 2.1.2 - -* Wed Jun 5 2013 Mikolaj Izdebski - 2.0.4-5 -- Remove tools.jar from dependencyManagement - -* Wed May 29 2013 Marek Goldmann - 2.0.4-4 -- New guidelines - -* Thu Apr 25 2013 Marek Goldmann - 2.0.4-3 -- Fixes to the launch scripts - -* Wed Apr 24 2013 Marek Goldmann - 2.0.4-2 -- Added bmsubmit, bminstall and bmjava scripts, RHBZ#951560 - -* Thu Feb 21 2013 Marek Goldmann - 2.0.4-1 -- Upstream release 2.0.4 -- Switched to Maven -- Bundling java_cup and objectweb-asm (fpc#226) - -* Wed Feb 13 2013 Fedora Release Engineering - 1.5.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.5.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Sep 20 2011 Marek Goldmann 1.5.2-3 -- Removed binary files from src.rpm - -* Mon Sep 19 2011 Marek Goldmann 1.5.2-2 -- Cleaned spec file - -* Wed Jul 27 2011 Marek Goldmann 1.5.2-1 -- Upstream release: 1.5.2 - -* Thu Jul 21 2011 Marek Goldmann 1.5.1-1 -- Initial packaging - +%autochangelog diff --git a/sources b/sources index 4f2eee1..1a074db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (4.0.16.tar.gz) = e0ec3932b698d07e0543988a944ccdf36533147e056218e0cc92d0ed9695dfaa5066482f493607b16732fcf3c6f5107eefdd7930f6877b747cb21bfecdb737dd +SHA512 (4.0.26.tar.gz) = 06c8bf688d237d8dbac1e4558a8e2916f1212d2746d81a64e8bc44f9074f5b1c205bb98ac3a8e835f0c8b225df665e40c93c8b60ff5ff77f6ce8272c25679d76