From d5a970bcbe6734f4888512f5156f98c6f95f7479 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:56:26 +0000 Subject: [PATCH 001/121] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index efeaebb..693985b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := objectweb-asm SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3df513c6419ca454c814fd7a17000b6a67dec572 Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Thu, 15 Apr 2010 22:06:40 +0000 Subject: [PATCH 002/121] Upgrade to 3.2 (Part 1) --- asm-3.1.pom => asm-3.2.pom | 28 +- asm-MANIFEST.MF | 12 +- asm-all-3.1.pom => asm-all-3.2.pom | 30 +- asm-analysis-3.1.pom => asm-analysis-3.2.pom | 42 +-- asm-commons-3.1.pom => asm-commons-3.2.pom | 42 +-- asm-parent-3.1.pom => asm-parent-3.2.pom | 273 ++++++++++--------- asm-tree-3.1.pom => asm-tree-3.2.pom | 42 +-- asm-util-3.1.pom => asm-util-3.2.pom | 42 +-- asm-xml-3.1.pom => asm-xml-3.2.pom | 42 +-- objectweb-asm.spec | 25 +- 10 files changed, 298 insertions(+), 280 deletions(-) rename asm-3.1.pom => asm-3.2.pom (71%) rename asm-all-3.1.pom => asm-all-3.2.pom (63%) rename asm-analysis-3.1.pom => asm-analysis-3.2.pom (71%) rename asm-commons-3.1.pom => asm-commons-3.2.pom (71%) rename asm-parent-3.1.pom => asm-parent-3.2.pom (83%) rename asm-tree-3.1.pom => asm-tree-3.2.pom (70%) rename asm-util-3.1.pom => asm-util-3.2.pom (71%) rename asm-xml-3.1.pom => asm-xml-3.2.pom (71%) diff --git a/asm-3.1.pom b/asm-3.2.pom similarity index 71% rename from asm-3.1.pom rename to asm-3.2.pom index b891f13..c714db0 100644 --- a/asm-3.1.pom +++ b/asm-3.2.pom @@ -1,14 +1,14 @@ - - 4.0.0 - - - asm-parent - org.objectweb.asm - 3.1 - - - ASM Core - asm - jar - - + + 4.0.0 + + + asm-parent + asm + 3.2 + + + ASM Core + asm + jar + + diff --git a/asm-MANIFEST.MF b/asm-MANIFEST.MF index c67eecd..3d50d2b 100644 --- a/asm-MANIFEST.MF +++ b/asm-MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-SymbolicName: org.objectweb.asm Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-Version: 3.1.0.v200803061910 +Bundle-Version: 3.2.0 Bundle-Vendor: %providerName -Export-Package: org.objectweb.asm;version="3.1.0",org.objectweb.asm.co - mmons;version="3.1.0",org.objectweb.asm.signature;version="3.1.0",org - .objectweb.asm.tree;version="3.1.0",org.objectweb.asm.tree.analysis;v - ersion="3.1.0",org.objectweb.asm.util;version="3.1.0",org.objectweb.a - sm.xml;version="3.1.0" +Export-Package: org.objectweb.asm;version="3.2.0",org.objectweb.asm.co + mmons;version="3.2.0",org.objectweb.asm.signature;version="3.2.0",org + .objectweb.asm.tree;version="3.2.0",org.objectweb.asm.tree.analysis;v + ersion="3.2.0",org.objectweb.asm.util;version="3.2.0",org.objectweb.a + sm.xml;version="3.2.0" diff --git a/asm-all-3.1.pom b/asm-all-3.2.pom similarity index 63% rename from asm-all-3.1.pom rename to asm-all-3.2.pom index 0a8a915..9899a54 100644 --- a/asm-all-3.1.pom +++ b/asm-all-3.2.pom @@ -1,15 +1,15 @@ - - 4.0.0 - - - org.objectweb.asm - asm-parent - 3.1 - - - ASM All - org.objectweb.asm - asm-all - jar - - + + 4.0.0 + + + asm + asm-parent + 3.2 + + + ASM All + asm + asm-all + jar + + diff --git a/asm-analysis-3.1.pom b/asm-analysis-3.2.pom similarity index 71% rename from asm-analysis-3.1.pom rename to asm-analysis-3.2.pom index da47441..b393338 100644 --- a/asm-analysis-3.1.pom +++ b/asm-analysis-3.2.pom @@ -1,21 +1,21 @@ - - 4.0.0 - - - asm-parent - org.objectweb.asm - 3.1 - - - ASM Analysis - asm-analysis - jar - - - - asm-tree - org.objectweb.asm - - - - + + 4.0.0 + + + asm-parent + asm + 3.2 + + + ASM Analysis + asm-analysis + jar + + + + asm-tree + asm + + + + diff --git a/asm-commons-3.1.pom b/asm-commons-3.2.pom similarity index 71% rename from asm-commons-3.1.pom rename to asm-commons-3.2.pom index b61b395..8517715 100644 --- a/asm-commons-3.1.pom +++ b/asm-commons-3.2.pom @@ -1,21 +1,21 @@ - - 4.0.0 - - - asm-parent - org.objectweb.asm - 3.1 - - - ASM Commons - asm-commons - jar - - - - asm-tree - org.objectweb.asm - - - - + + 4.0.0 + + + asm-parent + asm + 3.2 + + + ASM Commons + asm-commons + jar + + + + asm-tree + asm + + + + diff --git a/asm-parent-3.1.pom b/asm-parent-3.2.pom similarity index 83% rename from asm-parent-3.1.pom rename to asm-parent-3.2.pom index 158cc25..740b1d8 100644 --- a/asm-parent-3.1.pom +++ b/asm-parent-3.2.pom @@ -1,129 +1,144 @@ - - 4.0.0 - - asm-parent - org.objectweb.asm - 3.1 - pom - - ASM - A very small and fast Java bytecode manipulation framework - http://asm.objectweb.org/ - - - ObjectWeb - http://www.objectweb.org/ - - 2000 - - - - Eric Bruneton - ebruneton - Eric.Bruneton@rd.francetelecom.com - - Creator - Java Developer - - - - Eugene Kuleshov - eu - eu@javatx.org - - Java Developer - - - - - - scm:cvs:pserver:anonymous@cvs.forge.objectweb.org:/cvsroot/asm:asm - scm:cvs:ext:${maven.username}@cvs.forge.objectweb.org:/cvsroot/asm:asm - http://cvs.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/asm/ - - - - http://forge.objectweb.org/tracker/?group_id=23 - - - - - - - asm - ${project.groupId} - ${project.version} - - - - asm-tree - ${project.groupId} - ${project.version} - - - - asm-analysis - ${project.groupId} - ${project.version} - - - - asm-commons - ${project.groupId} - ${project.version} - - - - asm-util - ${project.groupId} - ${project.version} - - - - asm-xml - ${project.groupId} - ${project.version} - - - - - - - - ASM Users List - sympa@ow2.org?subject=subscribe%20asm - sympa@ow2.org?subject=unsubscribe%20asm - asm@ow2.org - http://www.ow2.org/wws/arc/asm - - - ASM Team List - sympa@ow2.org?subject=subscribe%20asm-team - sympa@ow2.org?subject=unsubscribe%20asm-team - asm-team@ow2.org - http://www.ow2.org/wws/arc/asm-team - - - - - http://mojo.codehaus.org/my-project - - objectweb - false - ObjectWeb Maven 2.0 Repository - dav:https://maven.forge.objectweb.org:8002/maven2/ - default - - - objectweb.snapshots - false - ObjectWeb Maven 2.0 Snapshot Repository - dav:https://maven.forge.objectweb.org:8002/maven2-snapshot/ - default - - - - + + 4.0.0 + + asm-parent + asm + 3.2 + pom + + ASM + A very small and fast Java bytecode manipulation framework + http://asm.objectweb.org/ + + + ObjectWeb + http://www.objectweb.org/ + + 2000 + + + + BSD + http://asm.objectweb.org/license.html + + + + + + Eric Bruneton + ebruneton + ebruneton@free.fr + + Creator + Java Developer + + + + Eugene Kuleshov + eu + eu@javatx.org + + Java Developer + + + + Remi Forax + forax + forax@univ-mlv.fr + + Java Developer + + + + + + scm:svn:svn://svn.forge.objectweb.org/svnroot/asm/tags/ASM_3_2 + scm:svn:svn+ssh://${maven.username}@svn.forge.objectweb.org/svnroot/asm/tags/ASM_3_2 + http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/tags/ASM_3_2/ + + + + http://forge.objectweb.org/tracker/?group_id=23 + + + + + + + asm + ${project.groupId} + ${project.version} + + + + asm-tree + ${project.groupId} + ${project.version} + + + + asm-analysis + ${project.groupId} + ${project.version} + + + + asm-commons + ${project.groupId} + ${project.version} + + + + asm-util + ${project.groupId} + ${project.version} + + + + asm-xml + ${project.groupId} + ${project.version} + + + + + + + + ASM Users List + sympa@ow2.org?subject=subscribe%20asm + sympa@ow2.org?subject=unsubscribe%20asm + asm@ow2.org + http://www.ow2.org/wws/arc/asm + + + ASM Team List + sympa@ow2.org?subject=subscribe%20asm-team + sympa@ow2.org?subject=unsubscribe%20asm-team + asm-team@ow2.org + http://www.ow2.org/wws/arc/asm-team + + + + + http://mojo.codehaus.org/my-project + + objectweb + false + ObjectWeb Maven 2.0 Repository + dav:https://maven.forge.objectweb.org:8002/maven2/ + default + + + objectweb.snapshots + false + ObjectWeb Maven 2.0 Snapshot Repository + dav:https://maven.forge.objectweb.org:8002/maven2-snapshot/ + default + + + + diff --git a/asm-tree-3.1.pom b/asm-tree-3.2.pom similarity index 70% rename from asm-tree-3.1.pom rename to asm-tree-3.2.pom index 0f43483..9f45452 100644 --- a/asm-tree-3.1.pom +++ b/asm-tree-3.2.pom @@ -1,21 +1,21 @@ - - 4.0.0 - - - asm-parent - org.objectweb.asm - 3.1 - - - ASM Tree - asm-tree - jar - - - - asm - org.objectweb.asm - - - - + + 4.0.0 + + + asm-parent + asm + 3.2 + + + ASM Tree + asm-tree + jar + + + + asm + asm + + + + diff --git a/asm-util-3.1.pom b/asm-util-3.2.pom similarity index 71% rename from asm-util-3.1.pom rename to asm-util-3.2.pom index 79cf437..e302b0f 100644 --- a/asm-util-3.1.pom +++ b/asm-util-3.2.pom @@ -1,21 +1,21 @@ - - 4.0.0 - - - asm-parent - org.objectweb.asm - 3.1 - - - ASM Util - asm-util - jar - - - - asm-tree - org.objectweb.asm - - - - + + 4.0.0 + + + asm-parent + asm + 3.2 + + + ASM Util + asm-util + jar + + + + asm-tree + asm + + + + diff --git a/asm-xml-3.1.pom b/asm-xml-3.2.pom similarity index 71% rename from asm-xml-3.1.pom rename to asm-xml-3.2.pom index 552433d..0f3de1f 100644 --- a/asm-xml-3.1.pom +++ b/asm-xml-3.2.pom @@ -1,21 +1,21 @@ - - 4.0.0 - - - asm-parent - org.objectweb.asm - 3.1 - - - ASM XML - asm-xml - jar - - - - asm-util - org.objectweb.asm - - - - + + 4.0.0 + + + asm-parent + asm + 3.2 + + + ASM XML + asm-xml + jar + + + + asm-util + asm + + + + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4666875..6e240e2 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -31,22 +31,22 @@ %define section free Name: objectweb-asm -Version: 3.1 -Release: 7.1%{?dist} +Version: 3.2 +Release: 1%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD URL: http://asm.objectweb.org/ Group: Development/Libraries/Java -Source0: http://download.forge.objectweb.org/asm/asm-3.1.tar.gz -Source1: http://repo1.maven.org/maven2/asm/asm/3.1/asm-3.1.pom -Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.1/asm-analysis-3.1.pom -Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.1/asm-commons-3.1.pom -Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.1/asm-tree-3.1.pom -Source5: http://repo1.maven.org/maven2/asm/asm-util/3.1/asm-util-3.1.pom -Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.1/asm-xml-3.1.pom -Source7: http://repo1.maven.org/maven2/asm/asm-all/3.1/asm-all-3.1.pom -Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.1/asm-parent-3.1.pom +Source0: http://download.forge.objectweb.org/asm/asm-3.2.tar.gz +Source1: http://repo1.maven.org/maven2/asm/asm/3.2/asm-3.2.pom +Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.2/asm-analysis-3.2.pom +Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.2/asm-commons-3.2.pom +Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.2/asm-tree-3.2.pom +Source5: http://repo1.maven.org/maven2/asm/asm-util/3.2/asm-util-3.2.pom +Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.2/asm-xml-3.2.pom +Source7: http://repo1.maven.org/maven2/asm/asm-all/3.2/asm-all-3.2.pom +Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.2/asm-parent-3.2.pom Source9: asm-MANIFEST.MF Patch0: objectweb-asm-no-classpath-in-manifest.patch # Needed by asm-xml.jar @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog +* Thu Apr 15 2010 Fernando Nasser 0:3.2.1 +- Upgrade to 3.2 + * Sat Jul 25 2009 Fedora Release Engineering - 0:3.1-7.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 5b896e1fa9e44db10c4674cddbfe57ecac6910cc Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Mon, 19 Apr 2010 13:53:45 +0000 Subject: [PATCH 003/121] Upgrade to 3.2 (part 2 - new sources) --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index b574c1f..28ae703 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -asm-3.1.tar.gz +asm-3.2.tar.gz diff --git a/sources b/sources index 467ae70..2f3802e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -961fe444550b328dff3cc9c8224349fd asm-3.1.tar.gz +a2220390f526a6f1879eb0ad7ee3eed4 asm-3.2.tar.gz From 24514d28fb8a981601a14151841da2e941b12b8f Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Mon, 19 Apr 2010 14:58:38 +0000 Subject: [PATCH 004/121] Adjust patch offset and path --- objectweb-asm-no-classpath-in-manifest.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/objectweb-asm-no-classpath-in-manifest.patch b/objectweb-asm-no-classpath-in-manifest.patch index 6f8c50c..04b0970 100644 --- a/objectweb-asm-no-classpath-in-manifest.patch +++ b/objectweb-asm-no-classpath-in-manifest.patch @@ -1,6 +1,6 @@ ---- asm-3.1/archive/asm-xml.xml.orig 2008-10-20 15:35:03.716137723 -0400 -+++ asm-3.1/archive/asm-xml.xml 2008-10-20 15:35:12.071115378 -0400 -@@ -10,7 +10,6 @@ +--- asm-3.2/archive/asm-xml.xml.orig 2008-10-20 15:35:03.716137723 -0400 ++++ asm-3.2/archive/asm-xml.xml 2008-10-20 15:35:12.071115378 -0400 +@@ -13,7 +13,6 @@ From 7fd50aaa3b860c0d24af0131816698970d2c0302 Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Mon, 19 Apr 2010 15:27:30 +0000 Subject: [PATCH 005/121] fix patch eol issues --- objectweb-asm-no-classpath-in-manifest.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/objectweb-asm-no-classpath-in-manifest.patch b/objectweb-asm-no-classpath-in-manifest.patch index 04b0970..105ca9c 100644 --- a/objectweb-asm-no-classpath-in-manifest.patch +++ b/objectweb-asm-no-classpath-in-manifest.patch @@ -1,10 +1,10 @@ ---- asm-3.2/archive/asm-xml.xml.orig 2008-10-20 15:35:03.716137723 -0400 -+++ asm-3.2/archive/asm-xml.xml 2008-10-20 15:35:12.071115378 -0400 -@@ -13,7 +13,6 @@ - - - -- - - - +--- asm-3.2/archive/asm-xml.xml.orig 2010-04-19 11:25:13.000000000 -0400 ++++ asm-3.2/archive/asm-xml.xml 2010-04-19 11:25:21.000000000 -0400 +@@ -10,7 +10,6 @@ + + + +- + + + From cbd2d7333a8ec84ef73b4edf29d7736ca44bacb1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 13 Jul 2010 16:21:32 +0000 Subject: [PATCH 006/121] - Change depmap parent id to asm (bug #606659) --- objectweb-asm.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 6e240e2..4ea0f2b 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -32,7 +32,7 @@ Name: objectweb-asm Version: 3.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -107,21 +107,21 @@ ln -sf ${jar} ${jar/-%{version}/}; done) # pom install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm.pom -%add_to_maven_depmap org.objectweb.asm asm %{version} JPP/objectweb-asm asm +%add_to_maven_depmap asm asm %{version} JPP/objectweb-asm asm install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-analysis.pom -%add_to_maven_depmap org.objectweb.asm asm-analysis %{version} JPP/objectweb-asm asm-analysis +%add_to_maven_depmap asm asm-analysis %{version} JPP/objectweb-asm asm-analysis install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-commons.pom -%add_to_maven_depmap org.objectweb.asm asm-commons %{version} JPP/objectweb-asm asm-commons +%add_to_maven_depmap asm asm-commons %{version} JPP/objectweb-asm asm-commons install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-tree.pom -%add_to_maven_depmap org.objectweb.asm asm-tree %{version} JPP/objectweb-asm asm-tree +%add_to_maven_depmap asm asm-tree %{version} JPP/objectweb-asm asm-tree install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-util.pom -%add_to_maven_depmap org.objectweb.asm asm-util %{version} JPP/objectweb-asm asm-util +%add_to_maven_depmap asm asm-util %{version} JPP/objectweb-asm asm-util install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-xml.pom -%add_to_maven_depmap org.objectweb.asm asm-xml %{version} JPP/objectweb-asm asm-xml +%add_to_maven_depmap asm asm-xml %{version} JPP/objectweb-asm asm-xml install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-all.pom -%add_to_maven_depmap org.objectweb.asm asm-all %{version} JPP/objectweb-asm asm-all +%add_to_maven_depmap asm asm-all %{version} JPP/objectweb-asm asm-all install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-parent.pom -%add_to_maven_depmap org.objectweb.asm asm-parent %{version} JPP/objectweb-asm asm-parent +%add_to_maven_depmap asm asm-parent %{version} JPP/objectweb-asm asm-parent # javadoc install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog +* Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 +- Change depmap parent id to asm (bug #606659) + * Thu Apr 15 2010 Fernando Nasser 0:3.2.1 - Upgrade to 3.2 From 4390e4a5c34f63bd98a47dbc4508d3e2db3ba787 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 04:41:41 +0000 Subject: [PATCH 007/121] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 693985b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: objectweb-asm -# $Id$ -NAME := objectweb-asm -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From ceed012e0b45ecfa598c30e94bdc515fa130f04e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 19:32:53 -0600 Subject: [PATCH 008/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4ea0f2b..70ab453 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -32,7 +32,7 @@ Name: objectweb-asm Version: 3.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 - Change depmap parent id to asm (bug #606659) From c1801b5ac5cca318d2cd17d1ba358229c992ffef Mon Sep 17 00:00:00 2001 From: Chris Aniszczyk Date: Mon, 4 Apr 2011 14:18:06 -0500 Subject: [PATCH 009/121] - Upgrade to 3.3.1 --- .gitignore | 2 +- asm-3.2.pom => asm-3.3.1.pom | 2 +- asm-MANIFEST.MF | 12 ++++----- asm-all-3.2.pom => asm-all-3.3.1.pom | 2 +- ...analysis-3.2.pom => asm-analysis-3.3.1.pom | 2 +- asm-commons-3.2.pom => asm-commons-3.3.1.pom | 2 +- asm-parent-3.2.pom => asm-parent-3.3.1.pom | 8 +++--- asm-tree-3.2.pom => asm-tree-3.3.1.pom | 2 +- asm-util-3.2.pom => asm-util-3.3.1.pom | 2 +- asm-xml-3.2.pom => asm-xml-3.3.1.pom | 2 +- objectweb-asm.spec | 25 +++++++++++-------- sources | 2 +- 12 files changed, 33 insertions(+), 30 deletions(-) rename asm-3.2.pom => asm-3.3.1.pom (89%) rename asm-all-3.2.pom => asm-all-3.3.1.pom (90%) rename asm-analysis-3.2.pom => asm-analysis-3.3.1.pom (93%) rename asm-commons-3.2.pom => asm-commons-3.3.1.pom (93%) rename asm-parent-3.2.pom => asm-parent-3.3.1.pom (96%) rename asm-tree-3.2.pom => asm-tree-3.3.1.pom (92%) rename asm-util-3.2.pom => asm-util-3.3.1.pom (92%) rename asm-xml-3.2.pom => asm-xml-3.3.1.pom (92%) diff --git a/.gitignore b/.gitignore index 28ae703..1c0ce92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -asm-3.2.tar.gz +asm-*.tar.gz diff --git a/asm-3.2.pom b/asm-3.3.1.pom similarity index 89% rename from asm-3.2.pom rename to asm-3.3.1.pom index c714db0..4b4cea6 100644 --- a/asm-3.2.pom +++ b/asm-3.3.1.pom @@ -4,7 +4,7 @@ asm-parent asm - 3.2 + 3.3.1 ASM Core diff --git a/asm-MANIFEST.MF b/asm-MANIFEST.MF index 3d50d2b..8396138 100644 --- a/asm-MANIFEST.MF +++ b/asm-MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-SymbolicName: org.objectweb.asm Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-Version: 3.2.0 +Bundle-Version: 3.3.1 Bundle-Vendor: %providerName -Export-Package: org.objectweb.asm;version="3.2.0",org.objectweb.asm.co - mmons;version="3.2.0",org.objectweb.asm.signature;version="3.2.0",org - .objectweb.asm.tree;version="3.2.0",org.objectweb.asm.tree.analysis;v - ersion="3.2.0",org.objectweb.asm.util;version="3.2.0",org.objectweb.a - sm.xml;version="3.2.0" +Export-Package: org.objectweb.asm;version="3.3.1",org.objectweb.asm.co + mmons;version="3.3.1",org.objectweb.asm.signature;version="3.3.1",org + .objectweb.asm.tree;version="3.3.1",org.objectweb.asm.tree.analysis;v + ersion="3.3.1",org.objectweb.asm.util;version="3.3.1",org.objectweb.a + sm.xml;version="3.3.1" diff --git a/asm-all-3.2.pom b/asm-all-3.3.1.pom similarity index 90% rename from asm-all-3.2.pom rename to asm-all-3.3.1.pom index 9899a54..cbcb71f 100644 --- a/asm-all-3.2.pom +++ b/asm-all-3.3.1.pom @@ -4,7 +4,7 @@ asm asm-parent - 3.2 + 3.3.1 ASM All diff --git a/asm-analysis-3.2.pom b/asm-analysis-3.3.1.pom similarity index 93% rename from asm-analysis-3.2.pom rename to asm-analysis-3.3.1.pom index b393338..f6b7a51 100644 --- a/asm-analysis-3.2.pom +++ b/asm-analysis-3.3.1.pom @@ -4,7 +4,7 @@ asm-parent asm - 3.2 + 3.3.1 ASM Analysis diff --git a/asm-commons-3.2.pom b/asm-commons-3.3.1.pom similarity index 93% rename from asm-commons-3.2.pom rename to asm-commons-3.3.1.pom index 8517715..d0ffe75 100644 --- a/asm-commons-3.2.pom +++ b/asm-commons-3.3.1.pom @@ -4,7 +4,7 @@ asm-parent asm - 3.2 + 3.3.1 ASM Commons diff --git a/asm-parent-3.2.pom b/asm-parent-3.3.1.pom similarity index 96% rename from asm-parent-3.2.pom rename to asm-parent-3.3.1.pom index 740b1d8..0b6914c 100644 --- a/asm-parent-3.2.pom +++ b/asm-parent-3.3.1.pom @@ -6,7 +6,7 @@ asm-parent asm - 3.2 + 3.3.1 pom ASM @@ -55,9 +55,9 @@ - scm:svn:svn://svn.forge.objectweb.org/svnroot/asm/tags/ASM_3_2 - scm:svn:svn+ssh://${maven.username}@svn.forge.objectweb.org/svnroot/asm/tags/ASM_3_2 - http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/tags/ASM_3_2/ + scm:svn:svn://svn.forge.objectweb.org/svnroot/asm/trunk + scm:svn:svn+ssh://${maven.username}@svn.forge.objectweb.org/svnroot/asm/trunk + http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/ diff --git a/asm-tree-3.2.pom b/asm-tree-3.3.1.pom similarity index 92% rename from asm-tree-3.2.pom rename to asm-tree-3.3.1.pom index 9f45452..da8012c 100644 --- a/asm-tree-3.2.pom +++ b/asm-tree-3.3.1.pom @@ -4,7 +4,7 @@ asm-parent asm - 3.2 + 3.3.1 ASM Tree diff --git a/asm-util-3.2.pom b/asm-util-3.3.1.pom similarity index 92% rename from asm-util-3.2.pom rename to asm-util-3.3.1.pom index e302b0f..51abac2 100644 --- a/asm-util-3.2.pom +++ b/asm-util-3.3.1.pom @@ -4,7 +4,7 @@ asm-parent asm - 3.2 + 3.3.1 ASM Util diff --git a/asm-xml-3.2.pom b/asm-xml-3.3.1.pom similarity index 92% rename from asm-xml-3.2.pom rename to asm-xml-3.3.1.pom index 0f3de1f..ab5c335 100644 --- a/asm-xml-3.2.pom +++ b/asm-xml-3.3.1.pom @@ -4,7 +4,7 @@ asm-parent asm - 3.2 + 3.3.1 ASM XML diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 70ab453..22e6070 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -31,22 +31,22 @@ %define section free Name: objectweb-asm -Version: 3.2 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD URL: http://asm.objectweb.org/ Group: Development/Libraries/Java -Source0: http://download.forge.objectweb.org/asm/asm-3.2.tar.gz -Source1: http://repo1.maven.org/maven2/asm/asm/3.2/asm-3.2.pom -Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.2/asm-analysis-3.2.pom -Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.2/asm-commons-3.2.pom -Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.2/asm-tree-3.2.pom -Source5: http://repo1.maven.org/maven2/asm/asm-util/3.2/asm-util-3.2.pom -Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.2/asm-xml-3.2.pom -Source7: http://repo1.maven.org/maven2/asm/asm-all/3.2/asm-all-3.2.pom -Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.2/asm-parent-3.2.pom +Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz +Source1: http://repo1.maven.org/maven2/asm/asm/3.3.1/asm-3.3.1.pom +Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.pom +Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom +Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.3.1/asm-tree-3.3.1.pom +Source5: http://repo1.maven.org/maven2/asm/asm-util/3.3.1/asm-util-3.3.1.pom +Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.3.1/asm-xml-3.3.1.pom +Source7: http://repo1.maven.org/maven2/asm/asm-all/3.3.1/asm-all-3.3.1.pom +Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom Source9: asm-MANIFEST.MF Patch0: objectweb-asm-no-classpath-in-manifest.patch # Needed by asm-xml.jar @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog +* Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 +- Upgrade to 3.3.1 + * Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 2f3802e..4af6a91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2220390f526a6f1879eb0ad7ee3eed4 asm-3.2.tar.gz +433024df8176f09922646316e415631c asm-3.3.1.tar.gz From 8203106c1bd2e1dcf86451c45b3dfaf9a1244d77 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 16 Sep 2011 17:11:05 +0300 Subject: [PATCH 010/121] Use poms produced by the build not foreign ones. Adapt to current guidelines. --- asm-3.3.1.pom | 14 ---- asm-all-3.3.1.pom | 15 ----- asm-analysis-3.3.1.pom | 21 ------ asm-commons-3.3.1.pom | 21 ------ asm-parent-3.3.1.pom | 144 ----------------------------------------- asm-tree-3.3.1.pom | 21 ------ asm-util-3.3.1.pom | 21 ------ asm-xml-3.3.1.pom | 21 ------ objectweb-asm.spec | 83 ++++++++---------------- 9 files changed, 26 insertions(+), 335 deletions(-) delete mode 100644 asm-3.3.1.pom delete mode 100644 asm-all-3.3.1.pom delete mode 100644 asm-analysis-3.3.1.pom delete mode 100644 asm-commons-3.3.1.pom delete mode 100644 asm-parent-3.3.1.pom delete mode 100644 asm-tree-3.3.1.pom delete mode 100644 asm-util-3.3.1.pom delete mode 100644 asm-xml-3.3.1.pom diff --git a/asm-3.3.1.pom b/asm-3.3.1.pom deleted file mode 100644 index 4b4cea6..0000000 --- a/asm-3.3.1.pom +++ /dev/null @@ -1,14 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.3.1 - - - ASM Core - asm - jar - - diff --git a/asm-all-3.3.1.pom b/asm-all-3.3.1.pom deleted file mode 100644 index cbcb71f..0000000 --- a/asm-all-3.3.1.pom +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - - asm - asm-parent - 3.3.1 - - - ASM All - asm - asm-all - jar - - diff --git a/asm-analysis-3.3.1.pom b/asm-analysis-3.3.1.pom deleted file mode 100644 index f6b7a51..0000000 --- a/asm-analysis-3.3.1.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.3.1 - - - ASM Analysis - asm-analysis - jar - - - - asm-tree - asm - - - - diff --git a/asm-commons-3.3.1.pom b/asm-commons-3.3.1.pom deleted file mode 100644 index d0ffe75..0000000 --- a/asm-commons-3.3.1.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.3.1 - - - ASM Commons - asm-commons - jar - - - - asm-tree - asm - - - - diff --git a/asm-parent-3.3.1.pom b/asm-parent-3.3.1.pom deleted file mode 100644 index 0b6914c..0000000 --- a/asm-parent-3.3.1.pom +++ /dev/null @@ -1,144 +0,0 @@ - - 4.0.0 - - asm-parent - asm - 3.3.1 - pom - - ASM - A very small and fast Java bytecode manipulation framework - http://asm.objectweb.org/ - - - ObjectWeb - http://www.objectweb.org/ - - 2000 - - - - BSD - http://asm.objectweb.org/license.html - - - - - - Eric Bruneton - ebruneton - ebruneton@free.fr - - Creator - Java Developer - - - - Eugene Kuleshov - eu - eu@javatx.org - - Java Developer - - - - Remi Forax - forax - forax@univ-mlv.fr - - Java Developer - - - - - - scm:svn:svn://svn.forge.objectweb.org/svnroot/asm/trunk - scm:svn:svn+ssh://${maven.username}@svn.forge.objectweb.org/svnroot/asm/trunk - http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/ - - - - http://forge.objectweb.org/tracker/?group_id=23 - - - - - - - asm - ${project.groupId} - ${project.version} - - - - asm-tree - ${project.groupId} - ${project.version} - - - - asm-analysis - ${project.groupId} - ${project.version} - - - - asm-commons - ${project.groupId} - ${project.version} - - - - asm-util - ${project.groupId} - ${project.version} - - - - asm-xml - ${project.groupId} - ${project.version} - - - - - - - - ASM Users List - sympa@ow2.org?subject=subscribe%20asm - sympa@ow2.org?subject=unsubscribe%20asm - asm@ow2.org - http://www.ow2.org/wws/arc/asm - - - ASM Team List - sympa@ow2.org?subject=subscribe%20asm-team - sympa@ow2.org?subject=unsubscribe%20asm-team - asm-team@ow2.org - http://www.ow2.org/wws/arc/asm-team - - - - - http://mojo.codehaus.org/my-project - - objectweb - false - ObjectWeb Maven 2.0 Repository - dav:https://maven.forge.objectweb.org:8002/maven2/ - default - - - objectweb.snapshots - false - ObjectWeb Maven 2.0 Snapshot Repository - dav:https://maven.forge.objectweb.org:8002/maven2-snapshot/ - default - - - - diff --git a/asm-tree-3.3.1.pom b/asm-tree-3.3.1.pom deleted file mode 100644 index da8012c..0000000 --- a/asm-tree-3.3.1.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.3.1 - - - ASM Tree - asm-tree - jar - - - - asm - asm - - - - diff --git a/asm-util-3.3.1.pom b/asm-util-3.3.1.pom deleted file mode 100644 index 51abac2..0000000 --- a/asm-util-3.3.1.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.3.1 - - - ASM Util - asm-util - jar - - - - asm-tree - asm - - - - diff --git a/asm-xml-3.3.1.pom b/asm-xml-3.3.1.pom deleted file mode 100644 index ab5c335..0000000 --- a/asm-xml-3.3.1.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.3.1 - - - ASM XML - asm-xml - jar - - - - asm-util - asm - - - - diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 22e6070..d4f8313 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -28,26 +28,16 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define section free - Name: objectweb-asm Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD URL: http://asm.objectweb.org/ Group: Development/Libraries/Java Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz -Source1: http://repo1.maven.org/maven2/asm/asm/3.3.1/asm-3.3.1.pom -Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.pom -Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom -Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.3.1/asm-tree-3.3.1.pom -Source5: http://repo1.maven.org/maven2/asm/asm-util/3.3.1/asm-util-3.3.1.pom -Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.3.1/asm-xml-3.3.1.pom -Source7: http://repo1.maven.org/maven2/asm/asm-all/3.3.1/asm-all-3.3.1.pom -Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom -Source9: asm-MANIFEST.MF +Source1: asm-MANIFEST.MF Patch0: objectweb-asm-no-classpath-in-manifest.patch # Needed by asm-xml.jar Requires: xml-commons-jaxp-1.3-apis @@ -60,14 +50,13 @@ BuildRequires: objectweb-anttask BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: zip BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description ASM is a code manipulation tool to implement adaptable systems. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation +Group: Documentation %description javadoc Javadoc for %{name}. @@ -78,79 +67,59 @@ Javadoc for %{name}. perl -pi -e 's/\r$//g' LICENSE.txt README.txt mkdir META-INF -cp -p %{SOURCE9} META-INF/MANIFEST.MF +cp -p %{SOURCE1} META-INF/MANIFEST.MF %build -export CLASSPATH= -export OPT_JAR_LIST=: ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc %install -rm -rf $RPM_BUILD_ROOT - # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} for jar in output/dist/lib/*.jar; do install -m 644 ${jar} \ -$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar}` +$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar/-%{version}/}` done touch META-INF/MANIFEST.MF zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF -install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/ - -(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \ -ln -sf ${jar} ${jar/-%{version}/}; done) +install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all.jar +install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm.pom -%add_to_maven_depmap asm asm %{version} JPP/objectweb-asm asm -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-analysis.pom -%add_to_maven_depmap asm asm-analysis %{version} JPP/objectweb-asm asm-analysis -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-commons.pom -%add_to_maven_depmap asm asm-commons %{version} JPP/objectweb-asm asm-commons -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-tree.pom -%add_to_maven_depmap asm asm-tree %{version} JPP/objectweb-asm asm-tree -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-util.pom -%add_to_maven_depmap asm asm-util %{version} JPP/objectweb-asm asm-util -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-xml.pom -%add_to_maven_depmap asm asm-xml %{version} JPP/objectweb-asm asm-xml -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-all.pom -%add_to_maven_depmap asm asm-all %{version} JPP/objectweb-asm asm-all -install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-parent.pom -%add_to_maven_depmap asm asm-parent %{version} JPP/objectweb-asm asm-parent +for pom in output/dist/lib/*.pom; do +install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}` +done +%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar +%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar +%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar +%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar +%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar +%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar +%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar +%add_maven_depmap JPP.objectweb-asm-asm-parent.pom # javadoc -install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files -%defattr(0644,root,root,0755) %doc LICENSE.txt README.txt %dir %{_javadir}/%{name} %{_javadir}/%{name}/*.jar -%{_datadir}/maven2/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* %files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %changelog +* Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 +- Use poms produced by the build not foreign ones. +- Adpat to current guidelines. + * Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 - Upgrade to 3.3.1 From 7fe656ecfa4f374ad67b9a0d2c88184f89ed540b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 05:24:19 -0600 Subject: [PATCH 011/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index d4f8313..dec2b84 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -30,7 +30,7 @@ Name: objectweb-asm Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -116,6 +116,9 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 - Use poms produced by the build not foreign ones. - Adpat to current guidelines. From ef56ffd6fe2a0f3bbdc50db80ab656683f03df8d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 00:46:33 -0500 Subject: [PATCH 012/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index dec2b84..ae90be0 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -30,7 +30,7 @@ Name: objectweb-asm Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -116,6 +116,9 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 2932adf37344cd7d7d946a305dd13f6a18e3118f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 02:52:46 -0600 Subject: [PATCH 013/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ae90be0..844a9b3 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -30,7 +30,7 @@ Name: objectweb-asm Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -116,6 +116,9 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From dc89699e084cf7523611deffd0387b30d051c20d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Mar 2013 13:31:17 +0100 Subject: [PATCH 014/121] Add depmap for org.eclipse.jetty.orbit - Resolves: rhbz#917625 Signed-off-by: Mikolaj Izdebski --- objectweb-asm.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 844a9b3..2645a66 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -30,7 +30,7 @@ Name: objectweb-asm Version: 3.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -92,7 +92,7 @@ install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mave for pom in output/dist/lib/*.pom; do install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}` done -%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar +%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm" %add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar %add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar %add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar @@ -116,6 +116,10 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 +- Add depmap for org.eclipse.jetty.orbit +- Resolves: rhbz#917625 + * Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 92e102ddfdfc810110182397411628cea8470bd7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 6 Mar 2013 17:17:34 +0100 Subject: [PATCH 015/121] Make jetty orbit depmap point to asm-all jar - Resolves: rhbz#917625 --- objectweb-asm.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 2645a66..9b694b3 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -30,7 +30,7 @@ Name: objectweb-asm Version: 3.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -92,13 +92,13 @@ install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mave for pom in output/dist/lib/*.pom; do install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}` done -%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm" +%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar %add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar %add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar %add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar %add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar %add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar -%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar +%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm" %add_maven_depmap JPP.objectweb-asm-asm-parent.pom # javadoc @@ -116,6 +116,10 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 +- Make jetty orbit depmap point to asm-all jar +- Resolves: rhbz#917625 + * Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 - Add depmap for org.eclipse.jetty.orbit - Resolves: rhbz#917625 From 63e1ca6919c1e662dbf65c84ca1134613e8b257b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:43:50 -0500 Subject: [PATCH 016/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 9b694b3..8b7e4be 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -30,7 +30,7 @@ Name: objectweb-asm Version: 3.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD @@ -116,6 +116,9 @@ cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 - Make jetty orbit depmap point to asm-all jar - Resolves: rhbz#917625 From 8dd7044d4b990fcf1d9c95fcd4b69ffff526f1a8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Nov 2013 17:31:56 +0100 Subject: [PATCH 017/121] Update to 5.0 beta --- .gitignore | 2 + asm-MANIFEST.MF | 14 -- objectweb-asm-no-classpath-in-manifest.patch | 10 -- objectweb-asm.spec | 136 ++++++------------- sources | 3 +- 5 files changed, 46 insertions(+), 119 deletions(-) delete mode 100644 asm-MANIFEST.MF delete mode 100644 objectweb-asm-no-classpath-in-manifest.patch diff --git a/.gitignore b/.gitignore index 1c0ce92..aaa8cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ asm-*.tar.gz +/asm-5.0_BETA.tar.gz +/LICENSE-2.0.txt diff --git a/asm-MANIFEST.MF b/asm-MANIFEST.MF deleted file mode 100644 index 8396138..0000000 --- a/asm-MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-RequiredExecutionEnvironment: J2SE-1.3 -Bundle-SymbolicName: org.objectweb.asm -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Localization: plugin -Bundle-Version: 3.3.1 -Bundle-Vendor: %providerName -Export-Package: org.objectweb.asm;version="3.3.1",org.objectweb.asm.co - mmons;version="3.3.1",org.objectweb.asm.signature;version="3.3.1",org - .objectweb.asm.tree;version="3.3.1",org.objectweb.asm.tree.analysis;v - ersion="3.3.1",org.objectweb.asm.util;version="3.3.1",org.objectweb.a - sm.xml;version="3.3.1" - diff --git a/objectweb-asm-no-classpath-in-manifest.patch b/objectweb-asm-no-classpath-in-manifest.patch deleted file mode 100644 index 105ca9c..0000000 --- a/objectweb-asm-no-classpath-in-manifest.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- asm-3.2/archive/asm-xml.xml.orig 2010-04-19 11:25:13.000000000 -0400 -+++ asm-3.2/archive/asm-xml.xml 2010-04-19 11:25:21.000000000 -0400 -@@ -10,7 +10,6 @@ - - - -- - - - diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 8b7e4be..35c4f19 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,121 +1,69 @@ -# Copyright (c) 2000-2008, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - Name: objectweb-asm -Version: 3.3.1 -Release: 8%{?dist} -Epoch: 0 -Summary: A code manipulation tool to implement adaptable systems +Version: 5.0 +Release: 0.1.beta%{?dist} +Summary: Java bytecode manipulation and analysis framework License: BSD -URL: http://asm.objectweb.org/ -Group: Development/Libraries/Java -Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz -Source1: asm-MANIFEST.MF -Patch0: objectweb-asm-no-classpath-in-manifest.patch -# Needed by asm-xml.jar -Requires: xml-commons-jaxp-1.3-apis -Requires(post): jpackage-utils >= 0:1.7.4 -Requires(postun): jpackage-utils >= 0:1.7.4 -BuildRequires: jpackage-utils >= 0:1.7.4 -BuildRequires: java-devel >= 0:1.5.0 -BuildRequires: ant >= 0:1.6.5 -BuildRequires: objectweb-anttask -BuildRequires: xml-commons-jaxp-1.3-apis -BuildRequires: zip +URL: http://asm.ow2.org/ BuildArch: noarch +Source0: http://download.forge.ow2.org/asm/asm-%{version}_BETA.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +BuildRequires: ant +BuildRequires: aqute-bnd +BuildRequires: maven-local + +Obsoletes: %{name}4 < 5 +Provides: %{name}4 = %{version}-%{release} + %description -ASM is a code manipulation tool to implement adaptable systems. +ASM is an all purpose Java bytecode manipulation and analysis +framework. It can be used to modify existing classes or dynamically +generate classes, directly in binary form. Provided common +transformations and analysis algorithms allow to easily assemble +custom complex transformations and code analysis tools. %package javadoc -Summary: Javadoc for %{name} -Group: Documentation +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +This package provides %{summary}. %prep -%setup -q -n asm-%{version} -%patch0 -p1 -perl -pi -e 's/\r$//g' LICENSE.txt README.txt +%setup -q -n asm-%{version}_BETA +find -name *.jar -delete +%mvn_alias :asm-all org.eclipse.jetty.orbit:org.objectweb.asm -mkdir META-INF -cp -p %{SOURCE1} META-INF/MANIFEST.MF +sed -i /Class-Path/d archive/*.bnd +sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd +sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd`|" archive/*.xml +sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %build -ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc +%ant -Dobjectweb.ant.tasks.path= jar jdoc %install -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} - -for jar in output/dist/lib/*.jar; do -install -m 644 ${jar} \ -$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar/-%{version}/}` +%mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom +for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all; do + %mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \ + output/dist/lib/${m}-%{version}_BETA.jar done +%mvn_install -J output/dist/doc/javadoc/user -touch META-INF/MANIFEST.MF -zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF +%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true -install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all.jar -install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom - -# pom -for pom in output/dist/lib/*.pom; do -install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}` -done -%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar -%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar -%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar -%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar -%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar -%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar -%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm" -%add_maven_depmap JPP.objectweb-asm-asm-parent.pom - -# javadoc -install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%files +%files -f .mfiles %doc LICENSE.txt README.txt +%{_bindir}/%{name}-processor %dir %{_javadir}/%{name} -%{_javadir}/%{name}/*.jar -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt %changelog +* Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta +- Update to 5.0 beta + * Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 4af6a91..af4bed9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -433024df8176f09922646316e415631c asm-3.3.1.tar.gz +3025693f410c6e66d5422d4d9c855637 asm-5.0_BETA.tar.gz +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From 1090fe69be9443a006204b33a54cf0388c3e2a21 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Jan 2014 08:46:31 +0100 Subject: [PATCH 018/121] Remove Eclipse Orbit alias --- objectweb-asm.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 35c4f19..90a8d71 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 5.0 -Release: 0.1.beta%{?dist} +Release: 0.2.beta%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -32,7 +32,6 @@ This package provides %{summary}. %prep %setup -q -n asm-%{version}_BETA find -name *.jar -delete -%mvn_alias :asm-all org.eclipse.jetty.orbit:org.objectweb.asm sed -i /Class-Path/d archive/*.bnd sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd @@ -61,6 +60,9 @@ done %doc LICENSE.txt %changelog +* Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta +- Remove Eclipse Orbit alias + * Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta - Update to 5.0 beta From e0e5fd84de204fa227ff3078a40ec25e679a295f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 19 Mar 2014 13:01:50 +0100 Subject: [PATCH 019/121] Enable asm-debug-all module --- objectweb-asm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 90a8d71..feac0b6 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 5.0 -Release: 0.2.beta%{?dist} +Release: 0.3.beta%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -43,7 +43,7 @@ sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %install %mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom -for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all; do +for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do %mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \ output/dist/lib/${m}-%{version}_BETA.jar done @@ -60,6 +60,9 @@ done %doc LICENSE.txt %changelog +* Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta +- Enable asm-debug-all module + * Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta - Remove Eclipse Orbit alias From a98edc835c4b8b92b60e5fa8be1cb3c5ae96b951 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 24 Mar 2014 12:06:06 +0100 Subject: [PATCH 020/121] Update to upstream version 5.0.1 --- objectweb-asm.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index feac0b6..504fdfc 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,12 +1,12 @@ Name: objectweb-asm -Version: 5.0 -Release: 0.3.beta%{?dist} +Version: 5.0.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ BuildArch: noarch -Source0: http://download.forge.ow2.org/asm/asm-%{version}_BETA.tar.gz +Source0: http://download.forge.ow2.org/asm/asm-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: ant @@ -30,7 +30,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n asm-%{version}_BETA +%setup -q -n asm-%{version} find -name *.jar -delete sed -i /Class-Path/d archive/*.bnd @@ -42,10 +42,10 @@ sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %ant -Dobjectweb.ant.tasks.path= jar jdoc %install -%mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom +%mvn_artifact output/dist/lib/asm-parent-%{version}.pom for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do - %mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \ - output/dist/lib/${m}-%{version}_BETA.jar + %mvn_artifact output/dist/lib/${m}-%{version}.pom \ + output/dist/lib/${m}-%{version}.jar done %mvn_install -J output/dist/doc/javadoc/user @@ -60,6 +60,9 @@ done %doc LICENSE.txt %changelog +* Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 +- Update to upstream version 5.0.1 + * Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta - Enable asm-debug-all module diff --git a/sources b/sources index af4bed9..ab937ce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3025693f410c6e66d5422d4d9c855637 asm-5.0_BETA.tar.gz +5e8c67f39c51e50b3b3459fc6b44d439 asm-5.0.1.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From 0da404da511f9c3712b83e60c4150e5abfc822da Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 1 May 2014 14:51:40 +0100 Subject: [PATCH 021/121] SCL-ize package --- .gitignore | 7 +++++-- objectweb-asm.spec | 30 ++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index aaa8cf8..87f8cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ -asm-*.tar.gz -/asm-5.0_BETA.tar.gz /LICENSE-2.0.txt +/.project +/.build-*.log +/*.src.rpm +/noarch +/asm-* diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 504fdfc..07ffa24 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,9 @@ -Name: objectweb-asm +%{?scl:%scl_package objectweb-asm} +%{!?scl:%global pkg_name %{name}} + +Name: %{?scl_prefix}objectweb-asm Version: 5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -12,9 +15,10 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: ant BuildRequires: aqute-bnd BuildRequires: maven-local +%{?scl:Requires: %scl_runtime} -Obsoletes: %{name}4 < 5 -Provides: %{name}4 = %{version}-%{release} +Obsoletes: %{?scl_prefix}objectweb-asm4 < 5 +Provides: %{?scl_prefix}objectweb-asm4 = %{version}-%{release} %description ASM is an all purpose Java bytecode manipulation and analysis @@ -24,7 +28,7 @@ transformations and analysis algorithms allow to easily assemble custom complex transformations and code analysis tools. %package javadoc -Summary: API documentation for %{name} +Summary: API documentation for %{pkg_name} %description javadoc This package provides %{summary}. @@ -42,24 +46,30 @@ sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %ant -Dobjectweb.ant.tasks.path= jar jdoc %install +%{?scl:scl enable %{scl} - <<"EOF"} %mvn_artifact output/dist/lib/asm-parent-%{version}.pom for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do %mvn_artifact output/dist/lib/${m}-%{version}.pom \ output/dist/lib/${m}-%{version}.jar done %mvn_install -J output/dist/doc/javadoc/user +%{?scl:EOF} -%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true +%jpackage_script org.objectweb.asm.xml.Processor "" "" %{pkg_name}/asm:%{pkg_name}/asm-attrs:%{pkg_name}/asm-util:%{pkg_name}/asm-xml %{pkg_name}-processor true %files -f .mfiles %doc LICENSE.txt README.txt -%{_bindir}/%{name}-processor -%dir %{_javadir}/%{name} +%{_bindir}/%{pkg_name}-processor +%dir %{_javadir}/%{pkg_name} %files javadoc -f .mfiles-javadoc %doc LICENSE.txt %changelog +* Mon Apr 14 2014 Mat Booth - 5.0.1-2 +- SCL-ize package. +- Fix bogus dates in changelog. + * Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 - Update to upstream version 5.0.1 @@ -114,10 +124,10 @@ done * Wed Feb 25 2009 Fedora Release Engineering - 0:3.1-6.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Tue Oct 23 2008 David Walluck 0:3.1-5.1 +* Thu Oct 23 2008 David Walluck 0:3.1-5.1 - build for Fedora -* Tue Oct 23 2008 David Walluck 0:3.1-5 +* Thu Oct 23 2008 David Walluck 0:3.1-5 - add OSGi manifest (Alexander Kurtakov) * Mon Oct 20 2008 David Walluck 0:3.1-4 From 975f81ddfb52b9417ac03997289daf24481d0ee7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 5 May 2014 08:44:39 +0200 Subject: [PATCH 022/121] Update to upstream version 5.0.2 --- objectweb-asm.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 07ffa24..4edf88b 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %{!?scl:%global pkg_name %{name}} Name: %{?scl_prefix}objectweb-asm -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 +- Update to upstream version 5.0.2 + * Mon Apr 14 2014 Mat Booth - 5.0.1-2 - SCL-ize package. - Fix bogus dates in changelog. diff --git a/sources b/sources index ab937ce..db2f6dc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5e8c67f39c51e50b3b3459fc6b44d439 asm-5.0.1.tar.gz +60d6ff85c6e04f3528e1bde98a06d57a asm-5.0.2.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From 25f0972d7605b7be78123174f6284337d3aa58e6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:26:14 -0500 Subject: [PATCH 023/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4edf88b..45482d8 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: %{?scl_prefix}objectweb-asm Version: 5.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 - Update to upstream version 5.0.2 From 35dd448ebd632ea31588cbcacd5dbb4c27be3318 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 20 Jul 2014 10:18:04 +0200 Subject: [PATCH 024/121] Update to upstream version 5.0.3 --- objectweb-asm.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 45482d8..eb802d9 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %{!?scl:%global pkg_name %{name}} Name: %{?scl_prefix}objectweb-asm -Version: 5.0.2 -Release: 2%{?dist} +Version: 5.0.3 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 +- Update to upstream version 5.0.3 + * Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index db2f6dc..d5c0f81 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -60d6ff85c6e04f3528e1bde98a06d57a asm-5.0.2.tar.gz +68ca7a7551a05f1f37fa8c11680b86af asm-5.0.3.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From ff770afcf3b2f5a700b3a17871041c82a563cbd9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 23:31:05 +0000 Subject: [PATCH 025/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index eb802d9..6cd1d2a 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: %{?scl_prefix}objectweb-asm Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 - Update to upstream version 5.0.3 From 1c1dacd1e7b0199d1390984a59e0c32843098434 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 6 Aug 2015 21:05:42 +0200 Subject: [PATCH 026/121] Update to upstream version 5.0.4 --- objectweb-asm.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 6cd1d2a..bbae80e 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %{!?scl:%global pkg_name %{name}} Name: %{?scl_prefix}objectweb-asm -Version: 5.0.3 -Release: 2%{?dist} +Version: 5.0.4 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Thu Aug 06 2015 Michael Simacek - 5.0.4-1 +- Update to upstream version 5.0.4 + * Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index d5c0f81..e0cbd58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -68ca7a7551a05f1f37fa8c11680b86af asm-5.0.3.tar.gz +bc328e4336a4fc30636b395b7f8081f3 asm-5.0.4.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From 3a5eb05978b80746b4ad298033e967819eada54f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 11:02:52 +0000 Subject: [PATCH 027/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index bbae80e..2efdbfa 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: %{?scl_prefix}objectweb-asm Version: 5.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Aug 06 2015 Michael Simacek - 5.0.4-1 - Update to upstream version 5.0.4 From 3718551d681cc1ec6b2a082c7a79aa669f7847d2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 24 Mar 2016 12:39:50 +0100 Subject: [PATCH 028/121] Update to upstream version 5.1 --- objectweb-asm.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 2efdbfa..44422d6 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %{!?scl:%global pkg_name %{name}} Name: %{?scl_prefix}objectweb-asm -Version: 5.0.4 -Release: 2%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Thu Mar 24 2016 Mikolaj Izdebski - 5.1-1 +- Update to upstream version 5.1 + * Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e0cbd58..6237975 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bc328e4336a4fc30636b395b7f8081f3 asm-5.0.4.tar.gz +856246dc75d1c8581e4b12d182c50519 asm-5.1.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From 92465bd9e0c7d9cc7ca3f4061100fb2775126217 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 May 2016 10:30:01 +0200 Subject: [PATCH 029/121] Add missing JARs to BND classpath --- objectweb-asm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 44422d6..50c330a 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: %{?scl_prefix}objectweb-asm Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -39,7 +39,7 @@ find -name *.jar -delete sed -i /Class-Path/d archive/*.bnd sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd -sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd`|" archive/*.xml +sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple org.eclipse.osgi:org.eclipse.osgi.services`|" archive/*.xml sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %build @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Tue May 31 2016 Mikolaj Izdebski - 5.1-2 +- Add missing JARs to BND classpath + * Thu Mar 24 2016 Mikolaj Izdebski - 5.1-1 - Update to upstream version 5.1 From 489c6ecbe8607dcbc1845acfc5c2d7d4a999a2a5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 1 Jun 2016 10:47:13 +0200 Subject: [PATCH 030/121] Avoid calling XMvn from build-classpath --- objectweb-asm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 50c330a..b936d40 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: %{?scl_prefix}objectweb-asm Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -39,7 +39,7 @@ find -name *.jar -delete sed -i /Class-Path/d archive/*.bnd sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd -sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple org.eclipse.osgi:org.eclipse.osgi.services`|" archive/*.xml +sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple eclipse/osgi.services`|" archive/*.xml sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %build @@ -66,6 +66,9 @@ done %doc LICENSE.txt %changelog +* Wed Jun 1 2016 Mikolaj Izdebski - 5.1-3 +- Avoid calling XMvn from build-classpath + * Tue May 31 2016 Mikolaj Izdebski - 5.1-2 - Add missing JARs to BND classpath From 6a890e90737a8afa975b986c1f85a6d33e4cfb3e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 15 Jun 2016 11:57:41 +0200 Subject: [PATCH 031/121] Add missing build-requires --- objectweb-asm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index b936d40..97f8f61 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: %{?scl_prefix}objectweb-asm Version: 5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -15,6 +15,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: ant BuildRequires: aqute-bnd BuildRequires: maven-local +BuildRequires: objectweb-pom %{?scl:Requires: %scl_runtime} Obsoletes: %{?scl_prefix}objectweb-asm4 < 5 @@ -66,6 +67,9 @@ done %doc LICENSE.txt %changelog +* Wed Jun 15 2016 Mikolaj Izdebski - 5.1-4 +- Add missing build-requires + * Wed Jun 1 2016 Mikolaj Izdebski - 5.1-3 - Avoid calling XMvn from build-classpath From 68e789f59d249250f4d71fd5e812b173eb60bde6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 24 Sep 2016 18:48:41 +0200 Subject: [PATCH 032/121] Update to current packaging guidelines - Remove obsoletes and provides for objectweb-asm4 --- objectweb-asm.spec | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 97f8f61..69d41d3 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,9 +1,6 @@ -%{?scl:%scl_package objectweb-asm} -%{!?scl:%global pkg_name %{name}} - -Name: %{?scl_prefix}objectweb-asm +Name: objectweb-asm Version: 5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -14,12 +11,8 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: ant BuildRequires: aqute-bnd -BuildRequires: maven-local +BuildRequires: javapackages-local BuildRequires: objectweb-pom -%{?scl:Requires: %scl_runtime} - -Obsoletes: %{?scl_prefix}objectweb-asm4 < 5 -Provides: %{?scl_prefix}objectweb-asm4 = %{version}-%{release} %description ASM is an all purpose Java bytecode manipulation and analysis @@ -29,7 +22,7 @@ transformations and analysis algorithms allow to easily assemble custom complex transformations and code analysis tools. %package javadoc -Summary: API documentation for %{pkg_name} +Summary: API documentation for %{name} %description javadoc This package provides %{summary}. @@ -47,26 +40,28 @@ sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %ant -Dobjectweb.ant.tasks.path= jar jdoc %install -%{?scl:scl enable %{scl} - <<"EOF"} %mvn_artifact output/dist/lib/asm-parent-%{version}.pom for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do %mvn_artifact output/dist/lib/${m}-%{version}.pom \ output/dist/lib/${m}-%{version}.jar done %mvn_install -J output/dist/doc/javadoc/user -%{?scl:EOF} -%jpackage_script org.objectweb.asm.xml.Processor "" "" %{pkg_name}/asm:%{pkg_name}/asm-attrs:%{pkg_name}/asm-util:%{pkg_name}/asm-xml %{pkg_name}-processor true +%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true %files -f .mfiles -%doc LICENSE.txt README.txt -%{_bindir}/%{pkg_name}-processor -%dir %{_javadir}/%{pkg_name} +%license LICENSE.txt +%doc README.txt +%{_bindir}/%{name}-processor %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt +%license LICENSE.txt %changelog +* Sat Sep 24 2016 Mikolaj Izdebski - 5.1-5 +- Update to current packaging guidelines +- Remove obsoletes and provides for objectweb-asm4 + * Wed Jun 15 2016 Mikolaj Izdebski - 5.1-4 - Add missing build-requires From e1d8362a92020693432d669da8953dddb2971a51 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Oct 2016 18:56:09 +0200 Subject: [PATCH 033/121] Use OSGi API JARs to run BND classpath, instead of Eclipse --- objectweb-asm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 69d41d3..28446db 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -33,7 +33,7 @@ find -name *.jar -delete sed -i /Class-Path/d archive/*.bnd sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd -sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple eclipse/osgi.services`|" archive/*.xml +sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple osgi-core osgi-compendium`|" archive/*.xml sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %build @@ -58,6 +58,9 @@ done %license LICENSE.txt %changelog +* Mon Oct 10 2016 Mikolaj Izdebski - 5.1-6 +- Use OSGi API JARs to run BND classpath, instead of Eclipse + * Sat Sep 24 2016 Mikolaj Izdebski - 5.1-5 - Update to current packaging guidelines - Remove obsoletes and provides for objectweb-asm4 From 814b4438f485d49832bdbd7b90f80848168ef1ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 00:27:02 +0000 Subject: [PATCH 034/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 28446db..7065341 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 5.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -58,6 +58,9 @@ done %license LICENSE.txt %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Oct 10 2016 Mikolaj Izdebski - 5.1-6 - Use OSGi API JARs to run BND classpath, instead of Eclipse From 34942baf5cdda59698f741966c3b3f11e7db3a77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 01:24:14 +0000 Subject: [PATCH 035/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 7065341..af9530d 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -58,6 +58,9 @@ done %license LICENSE.txt %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 5.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 322fd1f52cd97bce682823eecf5421ebc44e2e8e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Sep 2017 13:04:14 +0200 Subject: [PATCH 036/121] Update to upstream version 6.0 beta --- objectweb-asm.spec | 19 +++++++++++-------- sources | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index af9530d..c8b763d 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,12 +1,12 @@ Name: objectweb-asm -Version: 5.1 -Release: 8%{?dist} +Version: 6.0 +Release: 0.1.beta%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ BuildArch: noarch -Source0: http://download.forge.ow2.org/asm/asm-%{version}.tar.gz +Source0: http://download.forge.ow2.org/asm/asm-%{version}_BETA.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: ant @@ -28,7 +28,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n asm-%{version} +%setup -q -n asm-%{version}_BETA find -name *.jar -delete sed -i /Class-Path/d archive/*.bnd @@ -37,13 +37,13 @@ sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4 sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath %build -%ant -Dobjectweb.ant.tasks.path= jar jdoc +%ant -Dobjectweb.ant.tasks.path= -Dbiz.aQute.bnd.path= jar jdoc %install -%mvn_artifact output/dist/lib/asm-parent-%{version}.pom +%mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do - %mvn_artifact output/dist/lib/${m}-%{version}.pom \ - output/dist/lib/${m}-%{version}.jar + %mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \ + output/dist/lib/${m}-%{version}_BETA.jar done %mvn_install -J output/dist/doc/javadoc/user @@ -58,6 +58,9 @@ done %license LICENSE.txt %changelog +* Mon Sep 11 2017 Mikolaj Izdebski - 6.0-0.1.beta +- Update to upstream version 6.0 beta + * Thu Jul 27 2017 Fedora Release Engineering - 5.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 6237975..9549e94 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -856246dc75d1c8581e4b12d182c50519 asm-5.1.tar.gz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (asm-6.0_BETA.tar.gz) = cbdbef0760e2a5f7e07273066351487d0a259ddbecfc8ecd21d7f488a6d76b94a687458e028d99ff6b6615195de091f3d55bcac29f2450515533653fe1eb985e +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 418140acc991cae745497184a437f88e2f78fda6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 12 Sep 2017 12:19:23 +0200 Subject: [PATCH 037/121] Fix invalid OSGi metadata Resolves: rhbz#1490817 --- objectweb-asm.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index c8b763d..d3bc7df 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 6.0 -Release: 0.1.beta%{?dist} +Release: 0.2.beta%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -36,6 +36,9 @@ sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/a sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple osgi-core osgi-compendium`|" archive/*.xml sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath +# XXX dirty fix for https://bugzilla.redhat.com/show_bug.cgi?id=1490817 +sed -i '/version=/s/${product.artifact}/%{version}.0.BETA/g' archive/*.bnd + %build %ant -Dobjectweb.ant.tasks.path= -Dbiz.aQute.bnd.path= jar jdoc @@ -58,6 +61,10 @@ done %license LICENSE.txt %changelog +* Tue Sep 12 2017 Mikolaj Izdebski - 6.0-0.2.beta +- Fix invalid OSGi metadata +- Resolves: rhbz#1490817 + * Mon Sep 11 2017 Mikolaj Izdebski - 6.0-0.1.beta - Update to upstream version 6.0 beta From fb40b7f7bf8864a47e2c55bbc00313dd67ef2f98 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 2 Oct 2017 11:37:05 +0300 Subject: [PATCH 038/121] Update to upstream version 6.0 --- 0001-Revert-removal-of-asm-all.patch | 420 +++++++++++++++++++++++++++ objectweb-asm.spec | 27 +- sources | 2 +- 3 files changed, 438 insertions(+), 11 deletions(-) create mode 100644 0001-Revert-removal-of-asm-all.patch diff --git a/0001-Revert-removal-of-asm-all.patch b/0001-Revert-removal-of-asm-all.patch new file mode 100644 index 0000000..47415c8 --- /dev/null +++ b/0001-Revert-removal-of-asm-all.patch @@ -0,0 +1,420 @@ +From b99cee6776d45dd79248ba04de516f9d259229f9 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 26 Sep 2017 17:41:25 +0300 +Subject: [PATCH] Revert removal of asm-all + +--- + archive/asm-all.bnd | 70 +++++++++++++++++++++++++++++++++++++++++++++++ + archive/asm-all.pom | 45 ++++++++++++++++++++++++++++++ + archive/asm-all.xml | 57 ++++++++++++++++++++++++++++++++++++++ + archive/asm-debug-all.bnd | 69 ++++++++++++++++++++++++++++++++++++++++++++++ + archive/asm-debug-all.pom | 45 ++++++++++++++++++++++++++++++ + archive/asm-debug-all.xml | 61 +++++++++++++++++++++++++++++++++++++++++ + build.xml | 2 ++ + 7 files changed, 349 insertions(+) + create mode 100644 archive/asm-all.bnd + create mode 100644 archive/asm-all.pom + create mode 100644 archive/asm-all.xml + create mode 100644 archive/asm-debug-all.bnd + create mode 100644 archive/asm-debug-all.pom + create mode 100644 archive/asm-debug-all.xml + +diff --git a/archive/asm-all.bnd b/archive/asm-all.bnd +new file mode 100644 +index 00000000..ea0584c0 +--- /dev/null ++++ b/archive/asm-all.bnd +@@ -0,0 +1,70 @@ ++############################################################################### ++#ASM: a very small and fast Java bytecode manipulation framework ++#Copyright (c) 2000-2011 INRIA, France Telecom ++#All rights reserved. ++# ++#Redistribution and use in source and binary forms, with or without ++#modification, are permitted provided that the following conditions ++#are met: ++#1. Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++#2. Redistributions in binary form must reproduce the above copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++#3. Neither the name of the copyright holders nor the names of its ++# contributors may be used to endorse or promote products derived from ++# this software without specific prior written permission. ++# ++#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++#THE POSSIBILITY OF SUCH DAMAGE. ++############################################################################### ++ ++ ++Implementation-Title: ASM all classes ++Implementation-Version: ${product.artifact} ++Implementation-Vendor: France Telecom R&D ++ ++Bundle-Name: ASM all classes with debug info ++Bundle-Vendor: France Telecom R&D ++Bundle-Version: ${product.artifact} ++Bundle-DocURL: http://asm.objectweb.org ++Bundle-SymbolicName: org.objectweb.asm.all ++ ++Export-Package: \ ++ org.objectweb.asm;version=${product.artifact},\ ++ org.objectweb.asm.commons;version=${product.artifact},\ ++ org.objectweb.asm.signature;version=${product.artifact},\ ++ org.objectweb.asm.tree;version=${product.artifact},\ ++ org.objectweb.asm.tree.analysis;version=${product.artifact},\ ++ org.objectweb.asm.util;version=${product.artifact},\ ++ org.objectweb.asm.xml;version=${product.artifact} ++ ++Import-Package: \ ++ javax.xml.transform.*;resolution:="optional",\ ++ org.xml.sax.*;resolution:="optional" ++ ++Module-Requires: \ ++ java.xml;transitive=true ++ ++Bundle-RequiredExecutionEnvironment: J2SE-1.4 ++ ++-pluginpath: \ ++ ${out.build}/bnd-module-plugin.jar ++ ++-plugin.asm: \ ++ org.objectweb.asm.tools.ModuleInfoBndPlugin; ++ ++ ++-removeheaders:\ ++ DSTAMP,\ ++ TODAY,\ ++ TSTAMP +diff --git a/archive/asm-all.pom b/archive/asm-all.pom +new file mode 100644 +index 00000000..d4f123b0 +--- /dev/null ++++ b/archive/asm-all.pom +@@ -0,0 +1,45 @@ ++ ++ ++ ++ 4.0.0 ++ ++ ++ org.ow2.asm ++ asm-parent ++ @product.artifact@ ++ ++ ++ ASM All ++ org.ow2.asm ++ asm-all ++ jar ++ ++ +diff --git a/archive/asm-all.xml b/archive/asm-all.xml +new file mode 100644 +index 00000000..96353561 +--- /dev/null ++++ b/archive/asm-all.xml +@@ -0,0 +1,57 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/archive/asm-debug-all.bnd b/archive/asm-debug-all.bnd +new file mode 100644 +index 00000000..c9c75a00 +--- /dev/null ++++ b/archive/asm-debug-all.bnd +@@ -0,0 +1,69 @@ ++############################################################################### ++#ASM: a very small and fast Java bytecode manipulation framework ++#Copyright (c) 2000-2011 INRIA, France Telecom ++#All rights reserved. ++# ++#Redistribution and use in source and binary forms, with or without ++#modification, are permitted provided that the following conditions ++#are met: ++#1. Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++#2. Redistributions in binary form must reproduce the above copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++#3. Neither the name of the copyright holders nor the names of its ++# contributors may be used to endorse or promote products derived from ++# this software without specific prior written permission. ++# ++#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++#THE POSSIBILITY OF SUCH DAMAGE. ++############################################################################### ++ ++ ++Implementation-Title: ASM all classes with debug info ++Implementation-Version: ${product.artifact} ++Implementation-Vendor: France Telecom R&D ++ ++Bundle-Name: ASM all classes with debug info ++Bundle-Vendor: France Telecom R&D ++Bundle-Version: ${product.artifact} ++Bundle-DocURL: http://asm.objectweb.org ++Bundle-SymbolicName: org.objectweb.asm.all.debug ++ ++Export-Package: \ ++ org.objectweb.asm;version=${product.artifact},\ ++ org.objectweb.asm.commons;version=${product.artifact},\ ++ org.objectweb.asm.signature;version=${product.artifact},\ ++ org.objectweb.asm.tree;version=${product.artifact},\ ++ org.objectweb.asm.tree.analysis;version=${product.artifact},\ ++ org.objectweb.asm.util;version=${product.artifact},\ ++ org.objectweb.asm.xml;version=${product.artifact} ++ ++Import-Package: \ ++ javax.xml.transform.*;resolution:="optional",\ ++ org.xml.sax.*;resolution:="optional" ++ ++Module-Requires: \ ++ java.xml;transitive=true ++ ++Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++ ++-pluginpath: \ ++ ${out.build}/bnd-module-plugin.jar ++ ++-plugin.asm: \ ++ org.objectweb.asm.tools.ModuleInfoBndPlugin; ++ ++-removeheaders:\ ++ DSTAMP,\ ++ TODAY,\ ++ TSTAMP +diff --git a/archive/asm-debug-all.pom b/archive/asm-debug-all.pom +new file mode 100644 +index 00000000..ad88584b +--- /dev/null ++++ b/archive/asm-debug-all.pom +@@ -0,0 +1,45 @@ ++ ++ ++ ++ 4.0.0 ++ ++ ++ org.ow2.asm ++ asm-parent ++ @product.artifact@ ++ ++ ++ ASM Debug All ++ org.ow2.asm ++ asm-debug-all ++ jar ++ ++ +diff --git a/archive/asm-debug-all.xml b/archive/asm-debug-all.xml +new file mode 100644 +index 00000000..7a24fa27 +--- /dev/null ++++ b/archive/asm-debug-all.xml +@@ -0,0 +1,61 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ It is highly recommended to use only the necessary ASM jars for your ++application instead of using the asm-all jar, unless you really need ++all ASM packages. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/build.xml b/build.xml +index 8a3c2e23..541e6dd4 100644 +--- a/build.xml ++++ b/build.xml +@@ -262,6 +262,8 @@ + + + ++ ++ + + + +-- +2.13.5 + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index d3bc7df..0d7fbd6 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,14 +1,18 @@ Name: objectweb-asm Version: 6.0 -Release: 0.2.beta%{?dist} +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ BuildArch: noarch -Source0: http://download.forge.ow2.org/asm/asm-%{version}_BETA.tar.gz +Source0: http://download.forge.ow2.org/asm/asm-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +# Temporarily reintroduces asm-all uberjar, will be removed when we have time +# to fix dependent packages +Patch1: 0001-Revert-removal-of-asm-all.patch + BuildRequires: ant BuildRequires: aqute-bnd BuildRequires: javapackages-local @@ -28,7 +32,10 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n asm-%{version}_BETA +%setup -q -n asm-%{version} + +%patch1 -p1 + find -name *.jar -delete sed -i /Class-Path/d archive/*.bnd @@ -36,17 +43,14 @@ sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/a sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple osgi-core osgi-compendium`|" archive/*.xml sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath -# XXX dirty fix for https://bugzilla.redhat.com/show_bug.cgi?id=1490817 -sed -i '/version=/s/${product.artifact}/%{version}.0.BETA/g' archive/*.bnd - %build %ant -Dobjectweb.ant.tasks.path= -Dbiz.aQute.bnd.path= jar jdoc %install -%mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom -for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all all/asm-debug-all; do - %mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \ - output/dist/lib/${m}-%{version}_BETA.jar +%mvn_artifact output/dist/lib/asm-parent-%{version}.pom +for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml asm-all asm-debug-all; do + %mvn_artifact output/dist/lib/${m}-%{version}.pom \ + output/dist/lib/${m}-%{version}.jar done %mvn_install -J output/dist/doc/javadoc/user @@ -61,6 +65,9 @@ done %license LICENSE.txt %changelog +* Mon Sep 25 2017 Michael Simacek - 6.0-1 +- Update to upstream version 6.0 + * Tue Sep 12 2017 Mikolaj Izdebski - 6.0-0.2.beta - Fix invalid OSGi metadata - Resolves: rhbz#1490817 diff --git a/sources b/sources index 9549e94..cd34dac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (asm-6.0_BETA.tar.gz) = cbdbef0760e2a5f7e07273066351487d0a259ddbecfc8ecd21d7f488a6d76b94a687458e028d99ff6b6615195de091f3d55bcac29f2450515533653fe1eb985e +SHA512 (asm-6.0.tar.gz) = a91cdedc87b769ae06b3b198273fadce86f83f3baf2f70f97aa573660234cb948d31a7c30ef77b05f3a1031bc2cc82d151a68b7b45d54af3f7ed99b76057725d SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From d8d85d8dbc5f06c40f1d6179dca0f7b1de4a1955 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 08:42:37 +0000 Subject: [PATCH 039/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 0d7fbd6..77c28ac 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -65,6 +65,9 @@ done %license LICENSE.txt %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Sep 25 2017 Michael Simacek - 6.0-1 - Update to upstream version 6.0 From 7d2c73320dd8710ae3a66902b03070c77b538045 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 25 Apr 2018 15:17:18 +0100 Subject: [PATCH 040/121] Update to latest upstream relase for Java 10 support Switch to maven build Now executing test suites --- .gitignore | 2 + 0001-Revert-removal-of-asm-all.patch | 420 --------------------------- objectweb-asm.spec | 115 ++++++-- sources | 12 +- 4 files changed, 100 insertions(+), 449 deletions(-) delete mode 100644 0001-Revert-removal-of-asm-all.patch diff --git a/.gitignore b/.gitignore index 87f8cf7..ee9f857 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /*.src.rpm /noarch /asm-* +/archive.tar.gz +/parent.pom diff --git a/0001-Revert-removal-of-asm-all.patch b/0001-Revert-removal-of-asm-all.patch deleted file mode 100644 index 47415c8..0000000 --- a/0001-Revert-removal-of-asm-all.patch +++ /dev/null @@ -1,420 +0,0 @@ -From b99cee6776d45dd79248ba04de516f9d259229f9 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Tue, 26 Sep 2017 17:41:25 +0300 -Subject: [PATCH] Revert removal of asm-all - ---- - archive/asm-all.bnd | 70 +++++++++++++++++++++++++++++++++++++++++++++++ - archive/asm-all.pom | 45 ++++++++++++++++++++++++++++++ - archive/asm-all.xml | 57 ++++++++++++++++++++++++++++++++++++++ - archive/asm-debug-all.bnd | 69 ++++++++++++++++++++++++++++++++++++++++++++++ - archive/asm-debug-all.pom | 45 ++++++++++++++++++++++++++++++ - archive/asm-debug-all.xml | 61 +++++++++++++++++++++++++++++++++++++++++ - build.xml | 2 ++ - 7 files changed, 349 insertions(+) - create mode 100644 archive/asm-all.bnd - create mode 100644 archive/asm-all.pom - create mode 100644 archive/asm-all.xml - create mode 100644 archive/asm-debug-all.bnd - create mode 100644 archive/asm-debug-all.pom - create mode 100644 archive/asm-debug-all.xml - -diff --git a/archive/asm-all.bnd b/archive/asm-all.bnd -new file mode 100644 -index 00000000..ea0584c0 ---- /dev/null -+++ b/archive/asm-all.bnd -@@ -0,0 +1,70 @@ -+############################################################################### -+#ASM: a very small and fast Java bytecode manipulation framework -+#Copyright (c) 2000-2011 INRIA, France Telecom -+#All rights reserved. -+# -+#Redistribution and use in source and binary forms, with or without -+#modification, are permitted provided that the following conditions -+#are met: -+#1. Redistributions of source code must retain the above copyright -+# notice, this list of conditions and the following disclaimer. -+#2. Redistributions in binary form must reproduce the above copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+#3. Neither the name of the copyright holders nor the names of its -+# contributors may be used to endorse or promote products derived from -+# this software without specific prior written permission. -+# -+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -+#THE POSSIBILITY OF SUCH DAMAGE. -+############################################################################### -+ -+ -+Implementation-Title: ASM all classes -+Implementation-Version: ${product.artifact} -+Implementation-Vendor: France Telecom R&D -+ -+Bundle-Name: ASM all classes with debug info -+Bundle-Vendor: France Telecom R&D -+Bundle-Version: ${product.artifact} -+Bundle-DocURL: http://asm.objectweb.org -+Bundle-SymbolicName: org.objectweb.asm.all -+ -+Export-Package: \ -+ org.objectweb.asm;version=${product.artifact},\ -+ org.objectweb.asm.commons;version=${product.artifact},\ -+ org.objectweb.asm.signature;version=${product.artifact},\ -+ org.objectweb.asm.tree;version=${product.artifact},\ -+ org.objectweb.asm.tree.analysis;version=${product.artifact},\ -+ org.objectweb.asm.util;version=${product.artifact},\ -+ org.objectweb.asm.xml;version=${product.artifact} -+ -+Import-Package: \ -+ javax.xml.transform.*;resolution:="optional",\ -+ org.xml.sax.*;resolution:="optional" -+ -+Module-Requires: \ -+ java.xml;transitive=true -+ -+Bundle-RequiredExecutionEnvironment: J2SE-1.4 -+ -+-pluginpath: \ -+ ${out.build}/bnd-module-plugin.jar -+ -+-plugin.asm: \ -+ org.objectweb.asm.tools.ModuleInfoBndPlugin; -+ -+ -+-removeheaders:\ -+ DSTAMP,\ -+ TODAY,\ -+ TSTAMP -diff --git a/archive/asm-all.pom b/archive/asm-all.pom -new file mode 100644 -index 00000000..d4f123b0 ---- /dev/null -+++ b/archive/asm-all.pom -@@ -0,0 +1,45 @@ -+ -+ -+ -+ 4.0.0 -+ -+ -+ org.ow2.asm -+ asm-parent -+ @product.artifact@ -+ -+ -+ ASM All -+ org.ow2.asm -+ asm-all -+ jar -+ -+ -diff --git a/archive/asm-all.xml b/archive/asm-all.xml -new file mode 100644 -index 00000000..96353561 ---- /dev/null -+++ b/archive/asm-all.xml -@@ -0,0 +1,57 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/archive/asm-debug-all.bnd b/archive/asm-debug-all.bnd -new file mode 100644 -index 00000000..c9c75a00 ---- /dev/null -+++ b/archive/asm-debug-all.bnd -@@ -0,0 +1,69 @@ -+############################################################################### -+#ASM: a very small and fast Java bytecode manipulation framework -+#Copyright (c) 2000-2011 INRIA, France Telecom -+#All rights reserved. -+# -+#Redistribution and use in source and binary forms, with or without -+#modification, are permitted provided that the following conditions -+#are met: -+#1. Redistributions of source code must retain the above copyright -+# notice, this list of conditions and the following disclaimer. -+#2. Redistributions in binary form must reproduce the above copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+#3. Neither the name of the copyright holders nor the names of its -+# contributors may be used to endorse or promote products derived from -+# this software without specific prior written permission. -+# -+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -+#THE POSSIBILITY OF SUCH DAMAGE. -+############################################################################### -+ -+ -+Implementation-Title: ASM all classes with debug info -+Implementation-Version: ${product.artifact} -+Implementation-Vendor: France Telecom R&D -+ -+Bundle-Name: ASM all classes with debug info -+Bundle-Vendor: France Telecom R&D -+Bundle-Version: ${product.artifact} -+Bundle-DocURL: http://asm.objectweb.org -+Bundle-SymbolicName: org.objectweb.asm.all.debug -+ -+Export-Package: \ -+ org.objectweb.asm;version=${product.artifact},\ -+ org.objectweb.asm.commons;version=${product.artifact},\ -+ org.objectweb.asm.signature;version=${product.artifact},\ -+ org.objectweb.asm.tree;version=${product.artifact},\ -+ org.objectweb.asm.tree.analysis;version=${product.artifact},\ -+ org.objectweb.asm.util;version=${product.artifact},\ -+ org.objectweb.asm.xml;version=${product.artifact} -+ -+Import-Package: \ -+ javax.xml.transform.*;resolution:="optional",\ -+ org.xml.sax.*;resolution:="optional" -+ -+Module-Requires: \ -+ java.xml;transitive=true -+ -+Bundle-RequiredExecutionEnvironment: J2SE-1.5 -+ -+-pluginpath: \ -+ ${out.build}/bnd-module-plugin.jar -+ -+-plugin.asm: \ -+ org.objectweb.asm.tools.ModuleInfoBndPlugin; -+ -+-removeheaders:\ -+ DSTAMP,\ -+ TODAY,\ -+ TSTAMP -diff --git a/archive/asm-debug-all.pom b/archive/asm-debug-all.pom -new file mode 100644 -index 00000000..ad88584b ---- /dev/null -+++ b/archive/asm-debug-all.pom -@@ -0,0 +1,45 @@ -+ -+ -+ -+ 4.0.0 -+ -+ -+ org.ow2.asm -+ asm-parent -+ @product.artifact@ -+ -+ -+ ASM Debug All -+ org.ow2.asm -+ asm-debug-all -+ jar -+ -+ -diff --git a/archive/asm-debug-all.xml b/archive/asm-debug-all.xml -new file mode 100644 -index 00000000..7a24fa27 ---- /dev/null -+++ b/archive/asm-debug-all.xml -@@ -0,0 +1,61 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ It is highly recommended to use only the necessary ASM jars for your -+application instead of using the asm-all jar, unless you really need -+all ASM packages. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/build.xml b/build.xml -index 8a3c2e23..541e6dd4 100644 ---- a/build.xml -+++ b/build.xml -@@ -262,6 +262,8 @@ - - - -+ -+ - - - --- -2.13.5 - diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 77c28ac..914419d 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,22 +1,35 @@ +%global gittag ASM_6_1_1 + Name: objectweb-asm -Version: 6.0 -Release: 2%{?dist} +Version: 6.1.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ BuildArch: noarch -Source0: http://download.forge.ow2.org/asm/asm-%{version}.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source0: https://gitlab.ow2.org/asm/asm/repository/%{gittag}/archive.tar.gz +Source1: parent.pom +Source2: http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom +Source3: http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom +Source4: http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom +Source5: http://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom +Source6: http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom +Source7: http://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom +Source8: http://repo1.maven.org/maven2/org/ow2/asm/asm-xml/%{version}/asm-xml-%{version}.pom +# We still want to create an "all" uberjar, so this is a custom pom to generate it +# TODO: Fix other packages to no longer depend on "asm-all" so we can drop this +Source9: asm-all-%{version}.pom -# Temporarily reintroduces asm-all uberjar, will be removed when we have time -# to fix dependent packages -Patch1: 0001-Revert-removal-of-asm-all.patch - -BuildRequires: ant -BuildRequires: aqute-bnd -BuildRequires: javapackages-local -BuildRequires: objectweb-pom +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.codehaus.janino:janino) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) +BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) +BuildRequires: mvn(org.ow2:ow2:pom:) %description ASM is an all purpose Java bytecode manipulation and analysis @@ -32,39 +45,87 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n asm-%{version} - -%patch1 -p1 +%setup -q -n asm-%{gittag}-11b3cabce9b90706cf91a47dd15215c667f8055b find -name *.jar -delete +rm -rf gradle/ -sed -i /Class-Path/d archive/*.bnd -sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd -sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd slf4j/api slf4j/simple osgi-core osgi-compendium`|" archive/*.xml -sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath +# A custom parent pom to aggregate the build +cp -p %{SOURCE1} pom.xml + +# Insert poms into modules +for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do + cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml + # Fix junit5 configuration + %pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom + %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.21.0 $pom \ +" + + org.junit.platform + junit-platform-surefire-provider + 1.2.0-RC1 + + " + if [ "$pom" != "asm-test" ] ; then + # Make into OSGi bundles + bsn="org.objectweb.${pom//-/.}" + %pom_xpath_inject pom:project "bundle" $pom + %pom_add_plugin org.apache.felix:maven-bundle-plugin:3.5.0 $pom \ +" true + + + $bsn + JavaSE-1.8 + <_removeheaders>Bnd-LastModified,Build-By,Created-By,Include-Resource,Require-Capability,Tool + <_pluginpath>$(pwd)/tools/bnd-module-plugin/bnd-module-plugin.jar + <_plugin>org.objectweb.asm.tools.ModuleInfoBndPlugin; + + " + fi +done + +# Insert asm-all pom +mkdir -p asm-all +cp -p %{SOURCE9} asm-all/pom.xml + +# Remove invalid self-dependency +%pom_remove_dep org.ow2.asm:asm-test asm-test + +# Compat aliases +%mvn_alias :asm-all org.ow2.asm:asm-debug-all + +# No need to ship the custom parent pom +%mvn_package :asm-aggregator __noinstall +# Don't ship the test framework to avoid runtime dep on junit +%mvn_package :asm-test __noinstall %build -%ant -Dobjectweb.ant.tasks.path= -Dbiz.aQute.bnd.path= jar jdoc +# Must compile bnd plugin first, which is used to generate Java 9 module-info.class files +pushd tools/bnd-module-plugin +javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath aqute-bnd) $(find -name *.java) +jar cf bnd-module-plugin.jar -C src/main/java org +popd + +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install -%mvn_artifact output/dist/lib/asm-parent-%{version}.pom -for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml asm-all asm-debug-all; do - %mvn_artifact output/dist/lib/${m}-%{version}.pom \ - output/dist/lib/${m}-%{version}.jar -done -%mvn_install -J output/dist/doc/javadoc/user +%mvn_install %jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true %files -f .mfiles %license LICENSE.txt -%doc README.txt %{_bindir}/%{name}-processor %files javadoc -f .mfiles-javadoc %license LICENSE.txt %changelog +* Wed Apr 25 2018 Mat Booth - 6.1.1-1 +- Update to latest upstream relase for Java 10 support +- Switch to maven build +- Now executing test suites + * Thu Feb 08 2018 Fedora Release Engineering - 6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index cd34dac..bc5fe57 100644 --- a/sources +++ b/sources @@ -1,2 +1,10 @@ -SHA512 (asm-6.0.tar.gz) = a91cdedc87b769ae06b3b198273fadce86f83f3baf2f70f97aa573660234cb948d31a7c30ef77b05f3a1031bc2cc82d151a68b7b45d54af3f7ed99b76057725d -SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 +SHA512 (archive.tar.gz) = 9719f97dc953d20473bc161557e2e254e9455654229858af13af5fe6582a39a96c77dd52ee342bc79157e8e8e87ef48188185a0ebe28f4bb6ecb7f0cb3923f7b +SHA512 (asm-6.1.1.pom) = 4485086ec55d29fdcd96f0c1d6cf517ef3237a87552c68d6bdf59f5ae50cd93ba9706eeb5f43bafcc1289e32e152cd845aee44a2316fd060d0501cf3141840b7 +SHA512 (asm-all-6.1.1.pom) = 90df1a63b5e2a2b2b40f17cbc0303072e96d168c6cccd1bcb986f9b900b370fa191d857c694e20449d42d4b9d575f5c5153fceb09405f472257bc6733388e917 +SHA512 (asm-analysis-6.1.1.pom) = 213bfae989c64f807bb00856a262c7ad507eb9188653e688319f3c862f1362aa5ffffd18cb1ed712c7cb3bd3095b924fbfba06ed54c2e67920d6251b307c86d0 +SHA512 (asm-commons-6.1.1.pom) = 742b17e77b93c04bae33987fd4ab0a3bf889277ae46331b0b8fc3e67c360e0a11406e02e8ca6d3350542557a7c0f6b78057f15866fd3250b7dffe81999a29ae2 +SHA512 (asm-test-6.1.1.pom) = 2ff4b770eb6e14eddd13b7fa41c3b8d684c5f22f4d08c215e42a7f3a51c846b66e90603040376a56c6b9dbd09f7bf49beca826062145d0613319087b860614c7 +SHA512 (asm-tree-6.1.1.pom) = c02053d0279b7f43f7838a9540806bd597391ee5af7babb2a77d7764e0e255dad3eb6da83203480c1cabc06a2014fb196e97f2f34e90442f9516c19874fd1153 +SHA512 (asm-util-6.1.1.pom) = 2ceac588f3aa34e2531dcc3dac8614ce0c9131e7ba226f2f9b5766f80c4f7ad5dfd9806c9379789d7ac38d4e91543c4936f61f1dacd3f0815cc8abed9d6edf8e +SHA512 (asm-xml-6.1.1.pom) = a0796711334d3f29ba8a3743e87c13f3c0c5e2491f6718ee08cfb45bd7f873699e79daf6845437f8c58abf8b6d273fde56328ae5e53797df3c22309629d36c41 +SHA512 (parent.pom) = 0e0ed1e893e604ebfa863b046b1189a424ebb68032026b7402894e66f36376c8a748f2e4c08e96be6fee21eab3dc79203b805b61b422d3ab9158a4a1a78d2bb6 From ee77186fd9879c26da6925b5b2544c1bd6db025c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Jun 2018 02:12:13 +0200 Subject: [PATCH 041/121] Allow conditionally building without junit5 --- objectweb-asm.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 914419d..bd4b7db 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,8 +1,10 @@ %global gittag ASM_6_1_1 +%bcond_without junit5 + Name: objectweb-asm Version: 6.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -24,12 +26,14 @@ Source9: asm-all-%{version}.pom BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.ow2:ow2:pom:) +%if %{with junit5} BuildRequires: mvn(org.codehaus.janino:janino) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) -BuildRequires: mvn(org.ow2:ow2:pom:) +%endif %description ASM is an all purpose Java bytecode manipulation and analysis @@ -53,10 +57,15 @@ rm -rf gradle/ # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml +%if %{without junit5} +%pom_disable_module asm-test +%endif + # Insert poms into modules for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml # Fix junit5 configuration +%if %{with junit5} %pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.21.0 $pom \ " @@ -66,6 +75,7 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do 1.2.0-RC1 " +%endif if [ "$pom" != "asm-test" ] ; then # Make into OSGi bundles bsn="org.objectweb.${pom//-/.}" @@ -106,7 +116,11 @@ javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath aqute-bnd) $(fi jar cf bnd-module-plugin.jar -C src/main/java org popd +%if %{with junit5} %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%else +%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%endif %install %mvn_install @@ -121,6 +135,9 @@ popd %license LICENSE.txt %changelog +* Thu Jun 28 2018 Mikolaj Izdebski - 6.1.1-2 +- Allow conditionally building without junit5 + * Wed Apr 25 2018 Mat Booth - 6.1.1-1 - Update to latest upstream relase for Java 10 support - Switch to maven build From ffe986089d8c701438ee29c45b799416076b0e63 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Jun 2018 16:41:24 +0200 Subject: [PATCH 042/121] Add objectweb-asm to BND pluginpath --- objectweb-asm.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index bd4b7db..351806f 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -4,7 +4,7 @@ Name: objectweb-asm Version: 6.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -35,6 +35,11 @@ BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) %endif +# asm-all needs to be in pluginpath for BND. If this self-dependency +# becomes a problem then ASM core will have to be build from source +# with javac before main maven build, just like bnd-module-plugin +BuildRequires: objectweb-asm >= 6.1.1 + %description ASM is an all purpose Java bytecode manipulation and analysis framework. It can be used to modify existing classes or dynamically @@ -87,7 +92,7 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do $bsn JavaSE-1.8 <_removeheaders>Bnd-LastModified,Build-By,Created-By,Include-Resource,Require-Capability,Tool - <_pluginpath>$(pwd)/tools/bnd-module-plugin/bnd-module-plugin.jar + <_pluginpath>$(pwd)/tools/bnd-module-plugin/bnd-module-plugin.jar, $(find-jar objectweb-asm/asm-all) <_plugin>org.objectweb.asm.tools.ModuleInfoBndPlugin; " @@ -135,6 +140,9 @@ popd %license LICENSE.txt %changelog +* Fri Jun 29 2018 Mikolaj Izdebski - 6.1.1-3 +- Add objectweb-asm to BND pluginpath + * Thu Jun 28 2018 Mikolaj Izdebski - 6.1.1-2 - Allow conditionally building without junit5 From 9468288fa8e5b4ec0bf500adf366832b1f464422 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 30 Jun 2018 04:34:27 +0200 Subject: [PATCH 043/121] Relax versioned self-build-requirement a bit --- objectweb-asm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 351806f..1497f40 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -4,7 +4,7 @@ Name: objectweb-asm Version: 6.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -38,7 +38,7 @@ BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) # asm-all needs to be in pluginpath for BND. If this self-dependency # becomes a problem then ASM core will have to be build from source # with javac before main maven build, just like bnd-module-plugin -BuildRequires: objectweb-asm >= 6.1.1 +BuildRequires: objectweb-asm >= 6 %description ASM is an all purpose Java bytecode manipulation and analysis @@ -140,6 +140,9 @@ popd %license LICENSE.txt %changelog +* Sat Jun 30 2018 Mikolaj Izdebski - 6.1.1-4 +- Relax versioned self-build-requirement a bit + * Fri Jun 29 2018 Mikolaj Izdebski - 6.1.1-3 - Add objectweb-asm to BND pluginpath From dd6d8c1052ad6cc44ca139f44ee3cd0b48049b16 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 2 Jul 2018 17:24:40 +0200 Subject: [PATCH 044/121] Update to upstream version 6.2 --- .gitignore | 10 ++++++-- asm-all.pom | 62 ++++++++++++++++++++++++++++++++++++++++++++++ objectweb-asm.spec | 17 +++++++------ parent.pom | 22 ++++++++++++++++ sources | 18 ++++++-------- 5 files changed, 110 insertions(+), 19 deletions(-) create mode 100644 asm-all.pom create mode 100644 parent.pom diff --git a/.gitignore b/.gitignore index ee9f857..667054d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,12 @@ /.build-*.log /*.src.rpm /noarch -/asm-* /archive.tar.gz -/parent.pom +/asm-6.2.pom +/asm-analysis-6.2.pom +/asm-commons-6.2.pom +/asm-test-6.2.pom +/asm-tree-6.2.pom +/asm-util-6.2.pom +/asm-xml-6.2.pom +/objectweb-asm-6.2.tar.gz diff --git a/asm-all.pom b/asm-all.pom new file mode 100644 index 0000000..81aba6d --- /dev/null +++ b/asm-all.pom @@ -0,0 +1,62 @@ + + + 4.0.0 + + org.ow2 + ow2 + 1.5 + + org.ow2.asm + asm-all + @VERSION@ + + + org.ow2.asm + asm + @VERSION@ + + + org.ow2.asm + asm-analysis + @VERSION@ + + + org.ow2.asm + asm-commons + @VERSION@ + + + org.ow2.asm + asm-tree + @VERSION@ + + + org.ow2.asm + asm-tree + @VERSION@ + + + org.ow2.asm + asm-xml + @VERSION@ + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + package + + shade + + + + + + + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 1497f40..12475f6 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,16 +1,16 @@ -%global gittag ASM_6_1_1 +%global gittag ASM_6_2 %bcond_without junit5 Name: objectweb-asm -Version: 6.1.1 -Release: 4%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ BuildArch: noarch -Source0: https://gitlab.ow2.org/asm/asm/repository/%{gittag}/archive.tar.gz +Source0: https://gitlab.ow2.org/asm/asm/repository/%{gittag}/archive.tar.gz#/%{name}-%{version}.tar.gz Source1: parent.pom Source2: http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom Source3: http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom @@ -21,7 +21,7 @@ Source7: http://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/as Source8: http://repo1.maven.org/maven2/org/ow2/asm/asm-xml/%{version}/asm-xml-%{version}.pom # We still want to create an "all" uberjar, so this is a custom pom to generate it # TODO: Fix other packages to no longer depend on "asm-all" so we can drop this -Source9: asm-all-%{version}.pom +Source9: asm-all.pom BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -54,7 +54,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n asm-%{gittag}-11b3cabce9b90706cf91a47dd15215c667f8055b +%setup -q -n asm-%{gittag}-c72a86bd5f48a308537695213d3a23ac35a57d55 find -name *.jar -delete rm -rf gradle/ @@ -101,7 +101,7 @@ done # Insert asm-all pom mkdir -p asm-all -cp -p %{SOURCE9} asm-all/pom.xml +sed 's/@VERSION@/%{version}/g' %{SOURCE9} > asm-all/pom.xml # Remove invalid self-dependency %pom_remove_dep org.ow2.asm:asm-test asm-test @@ -140,6 +140,9 @@ popd %license LICENSE.txt %changelog +* Mon Jul 02 2018 Michael Simacek - 6.2-1 +- Update to upstream version 6.2 + * Sat Jun 30 2018 Mikolaj Izdebski - 6.1.1-4 - Relax versioned self-build-requirement a bit diff --git a/parent.pom b/parent.pom new file mode 100644 index 0000000..6aad2c2 --- /dev/null +++ b/parent.pom @@ -0,0 +1,22 @@ + + + 4.0.0 + + org.ow2.asm + asm-aggregator + 1 + + pom + + + asm + asm-analysis + asm-commons + asm-test + asm-tree + asm-util + asm-xml + asm-all + + diff --git a/sources b/sources index bc5fe57..8302099 100644 --- a/sources +++ b/sources @@ -1,10 +1,8 @@ -SHA512 (archive.tar.gz) = 9719f97dc953d20473bc161557e2e254e9455654229858af13af5fe6582a39a96c77dd52ee342bc79157e8e8e87ef48188185a0ebe28f4bb6ecb7f0cb3923f7b -SHA512 (asm-6.1.1.pom) = 4485086ec55d29fdcd96f0c1d6cf517ef3237a87552c68d6bdf59f5ae50cd93ba9706eeb5f43bafcc1289e32e152cd845aee44a2316fd060d0501cf3141840b7 -SHA512 (asm-all-6.1.1.pom) = 90df1a63b5e2a2b2b40f17cbc0303072e96d168c6cccd1bcb986f9b900b370fa191d857c694e20449d42d4b9d575f5c5153fceb09405f472257bc6733388e917 -SHA512 (asm-analysis-6.1.1.pom) = 213bfae989c64f807bb00856a262c7ad507eb9188653e688319f3c862f1362aa5ffffd18cb1ed712c7cb3bd3095b924fbfba06ed54c2e67920d6251b307c86d0 -SHA512 (asm-commons-6.1.1.pom) = 742b17e77b93c04bae33987fd4ab0a3bf889277ae46331b0b8fc3e67c360e0a11406e02e8ca6d3350542557a7c0f6b78057f15866fd3250b7dffe81999a29ae2 -SHA512 (asm-test-6.1.1.pom) = 2ff4b770eb6e14eddd13b7fa41c3b8d684c5f22f4d08c215e42a7f3a51c846b66e90603040376a56c6b9dbd09f7bf49beca826062145d0613319087b860614c7 -SHA512 (asm-tree-6.1.1.pom) = c02053d0279b7f43f7838a9540806bd597391ee5af7babb2a77d7764e0e255dad3eb6da83203480c1cabc06a2014fb196e97f2f34e90442f9516c19874fd1153 -SHA512 (asm-util-6.1.1.pom) = 2ceac588f3aa34e2531dcc3dac8614ce0c9131e7ba226f2f9b5766f80c4f7ad5dfd9806c9379789d7ac38d4e91543c4936f61f1dacd3f0815cc8abed9d6edf8e -SHA512 (asm-xml-6.1.1.pom) = a0796711334d3f29ba8a3743e87c13f3c0c5e2491f6718ee08cfb45bd7f873699e79daf6845437f8c58abf8b6d273fde56328ae5e53797df3c22309629d36c41 -SHA512 (parent.pom) = 0e0ed1e893e604ebfa863b046b1189a424ebb68032026b7402894e66f36376c8a748f2e4c08e96be6fee21eab3dc79203b805b61b422d3ab9158a4a1a78d2bb6 +SHA512 (objectweb-asm-6.2.tar.gz) = 4eabeebf98ca642cc3901b6eb178840cc677150d79c7c981e1759d6e9a798df1837f15eb3dba6d0fe3c0dd156f21f6348bd908b49da78aa5c5e03d374d797943 +SHA512 (asm-6.2.pom) = a6cebb211772ac4e13df2c519593da5ce0742bb88d928fc0c2cf9094141f88c4e88dbff29ca6f7b7b3749d0ada02ddc07c27c25493c6562be8dbcecf8a1fcad5 +SHA512 (asm-analysis-6.2.pom) = 853742bb74ffae42314c162f624c8bb2a6149a3fc7763a9ac2ec2528f2381c5b84d7bfd41c61f89e59bd1650a06faf64d4124f6e0fa2cfd23554257949d6006b +SHA512 (asm-commons-6.2.pom) = c8033bde09af20576aee78237e555620f22de6fccfa9ab8840d7e09657f6d92cf2b467080c18207cf978c4a21af86eba120bd9a19430b264822b55fbfefa5e4f +SHA512 (asm-test-6.2.pom) = 3ef16fee0924ffd6da3bc3e715574cc6324250707980586beadd1bbee50bf9e709f251593e21c6637d56f5c90db9b7c599b5617f22e4da5bc87932fb610914da +SHA512 (asm-tree-6.2.pom) = cb8eec7d54024595cd2c13a7fb2e8fec9d04f83ccd0c50b71745fd51a6fb6f4e5e56521b86932f9da3e775dd2a0d3a1fe90c8bf2da3c2ee39453b1019e0efd43 +SHA512 (asm-util-6.2.pom) = 0fcf4c8c0dc98b71cd53f1e2253a5f8293bfed4a673b2d231993365645326a27f8ded6a2879e3f9a341ffeb2cdbb5b8d659c789ee1bd3ed109676f505b61bc18 +SHA512 (asm-xml-6.2.pom) = 078aa27a82b3513080e238830e6ac7cd09e5dd374587544ec55c56a9ddf53d050b660b2f61ed51ff7421fd6134ee0fdf686c4e6c55cbb9fc8f48123eb750c96c From 6878fcd4a33d3665143eb0395cb8110bcad4b08d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 14:39:05 +0000 Subject: [PATCH 045/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 12475f6..a0402f2 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -4,7 +4,7 @@ Name: objectweb-asm Version: 6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -140,6 +140,9 @@ popd %license LICENSE.txt %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 02 2018 Michael Simacek - 6.2-1 - Update to upstream version 6.2 From 7e9edb7b5ad2c1d2d6624ce7ca52bc070182979e Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Fri, 6 Jul 2018 15:14:51 +0200 Subject: [PATCH 046/121] Allow conditionally building without OSGi. --- objectweb-asm.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index a0402f2..f76443b 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,10 +1,11 @@ %global gittag ASM_6_2 %bcond_without junit5 +%bcond_without osgi Name: objectweb-asm Version: 6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -35,10 +36,12 @@ BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) %endif +%if %{with osgi} # asm-all needs to be in pluginpath for BND. If this self-dependency # becomes a problem then ASM core will have to be build from source # with javac before main maven build, just like bnd-module-plugin BuildRequires: objectweb-asm >= 6 +%endif %description ASM is an all purpose Java bytecode manipulation and analysis @@ -81,6 +84,7 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do " %endif +%if %{with osgi} if [ "$pom" != "asm-test" ] ; then # Make into OSGi bundles bsn="org.objectweb.${pom//-/.}" @@ -97,6 +101,7 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do " fi +%endif done # Insert asm-all pom @@ -140,6 +145,10 @@ popd %license LICENSE.txt %changelog +* Wed Aug 01 2018 Severin Gehwolf - 6.2-3 +- Allow conditionally building without OSGi + metadata. + * Fri Jul 13 2018 Fedora Release Engineering - 6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f25bcc96dbfbbdc9a9ada38c7073df48327e2046 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 1 Aug 2018 10:24:29 +0200 Subject: [PATCH 047/121] Explicitly require javapackages-tools --- objectweb-asm.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index f76443b..e21b266 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -5,7 +5,7 @@ Name: objectweb-asm Version: 6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -43,6 +43,10 @@ BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) BuildRequires: objectweb-asm >= 6 %endif +# Explicit javapackages-tools requires since asm-processor script uses +# /usr/share/java-utils/java-functions +Requires: javapackages-tools + %description ASM is an all purpose Java bytecode manipulation and analysis framework. It can be used to modify existing classes or dynamically @@ -145,6 +149,10 @@ popd %license LICENSE.txt %changelog +* Wed Aug 01 2018 Severin Gehwolf - 6.2-4 +- Explicitly require javapackages-tools for asm-processor script + which uses java-functions. + * Wed Aug 01 2018 Severin Gehwolf - 6.2-3 - Allow conditionally building without OSGi metadata. From 7a38eb6d86b829d57d76a8059c7e56e331506e27 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 3 Aug 2018 14:08:10 +0200 Subject: [PATCH 048/121] Repack the tarball without binaries --- generate-tarball.sh | 26 ++++++++++++++++++++++++++ objectweb-asm.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 36 insertions(+), 9 deletions(-) create mode 100755 generate-tarball.sh diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..eac806b --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,26 @@ +#!/bin/bash +set -e + +name=objectweb-asm +version="$(sed -n 's/Version:\s*//p' *.spec)" +gittag="ASM_${version//./_}" + +# RETRIEVE +wget "https://gitlab.ow2.org/asm/asm/repository/${gittag}/archive.tar.gz#/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +cd tarball-tmp +tar xf "../${name}-${version}.orig.tar.gz" + +# Rename dir not to contain commit +mv asm-${gittag}-* ${name}-${version} + +# CLEAN TARBALL +find -name '*.jar' -delete +find -name '*.class' -delete +rm -r */gradle + +tar cf "../${name}-${version}.tar.gz" * +cd .. +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/objectweb-asm.spec b/objectweb-asm.spec index e21b266..ceb671e 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,17 +1,16 @@ -%global gittag ASM_6_2 - %bcond_without junit5 %bcond_without osgi Name: objectweb-asm Version: 6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ BuildArch: noarch -Source0: https://gitlab.ow2.org/asm/asm/repository/%{gittag}/archive.tar.gz#/%{name}-%{version}.tar.gz +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz Source1: parent.pom Source2: http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom Source3: http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom @@ -23,6 +22,8 @@ Source8: http://repo1.maven.org/maven2/org/ow2/asm/asm-xml/%{version}/asm # We still want to create an "all" uberjar, so this is a custom pom to generate it # TODO: Fix other packages to no longer depend on "asm-all" so we can drop this Source9: asm-all.pom +# The source contains binary jars that cannot be verified for licensing and could be proprietary +Source10: generate-tarball.sh BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -61,10 +62,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q -n asm-%{gittag}-c72a86bd5f48a308537695213d3a23ac35a57d55 - -find -name *.jar -delete -rm -rf gradle/ +%setup -q # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml @@ -149,6 +147,9 @@ popd %license LICENSE.txt %changelog +* Fri Aug 03 2018 Michael Simacek - 6.2-5 +- Repack the tarball without binaries + * Wed Aug 01 2018 Severin Gehwolf - 6.2-4 - Explicitly require javapackages-tools for asm-processor script which uses java-functions. diff --git a/sources b/sources index 8302099..4edcbb4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (objectweb-asm-6.2.tar.gz) = 4eabeebf98ca642cc3901b6eb178840cc677150d79c7c981e1759d6e9a798df1837f15eb3dba6d0fe3c0dd156f21f6348bd908b49da78aa5c5e03d374d797943 +SHA512 (objectweb-asm-6.2.tar.gz) = 52de20e11eb7f09bb47ef7394138c3fb425197c552786bf01e1f17331f2d32481e09ce2dd7267058647e29bcd4cbd0b4e7a2f2f3ee583945b18eefebbe407238 SHA512 (asm-6.2.pom) = a6cebb211772ac4e13df2c519593da5ce0742bb88d928fc0c2cf9094141f88c4e88dbff29ca6f7b7b3749d0ada02ddc07c27c25493c6562be8dbcecf8a1fcad5 SHA512 (asm-analysis-6.2.pom) = 853742bb74ffae42314c162f624c8bb2a6149a3fc7763a9ac2ec2528f2381c5b84d7bfd41c61f89e59bd1650a06faf64d4124f6e0fa2cfd23554257949d6006b SHA512 (asm-commons-6.2.pom) = c8033bde09af20576aee78237e555620f22de6fccfa9ab8840d7e09657f6d92cf2b467080c18207cf978c4a21af86eba120bd9a19430b264822b55fbfefa5e4f From f89a581e8d4b80d8a20a8d766beaaeda3ad0e393 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 12 Sep 2018 11:43:35 +0100 Subject: [PATCH 049/121] Update to latest upstream release Fix test suite execution --- .gitignore | 8 ++++++++ generate-tarball.sh | 4 +++- objectweb-asm.spec | 27 ++++++++++++++++----------- sources | 16 ++++++++-------- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 667054d..e3dc0f5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,11 @@ /asm-util-6.2.pom /asm-xml-6.2.pom /objectweb-asm-6.2.tar.gz +/objectweb-asm-6.2.1.tar.gz +/asm-6.2.1.pom +/asm-analysis-6.2.1.pom +/asm-commons-6.2.1.pom +/asm-test-6.2.1.pom +/asm-tree-6.2.1.pom +/asm-util-6.2.1.pom +/asm-xml-6.2.1.pom diff --git a/generate-tarball.sh b/generate-tarball.sh index eac806b..255d107 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -17,8 +17,10 @@ tar xf "../${name}-${version}.orig.tar.gz" mv asm-${gittag}-* ${name}-${version} # CLEAN TARBALL +# Remove all jar files find -name '*.jar' -delete -find -name '*.class' -delete +# Remove all class files except those in asm-test, which are shipped alongside appropriately licensed source +find */asm{,-analysis,-commons} -name '*.class' -delete rm -r */gradle tar cf "../${name}-${version}.tar.gz" * diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ceb671e..b5f0f04 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %bcond_without osgi Name: objectweb-asm -Version: 6.2 -Release: 5%{?dist} +Version: 6.2.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -34,7 +34,7 @@ BuildRequires: mvn(org.codehaus.janino:janino) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) -BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) %endif %if %{with osgi} @@ -77,14 +77,7 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do # Fix junit5 configuration %if %{with junit5} %pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom - %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.21.0 $pom \ -" - - org.junit.platform - junit-platform-surefire-provider - 1.2.0-RC1 - - " + %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.22.0 $pom %endif %if %{with osgi} if [ "$pom" != "asm-test" ] ; then @@ -106,6 +99,14 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do %endif done +# Disable tests that use unlicensed class files +sed -i -e '/testReadAndWriteWithComputeMaxsAndLargeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm/src/test/java/org/objectweb/asm/ClassWriterTest.java +sed -i -e '/testMergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/BasicInterpreterTest.java +sed -i -e '/testSortLocalVariablesAndInstantiate()/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java + # Insert asm-all pom mkdir -p asm-all sed 's/@VERSION@/%{version}/g' %{SOURCE9} > asm-all/pom.xml @@ -147,6 +148,10 @@ popd %license LICENSE.txt %changelog +* Tue Sep 11 2018 Mat Booth - 6.2.1-1 +- Update to latest upstream release +- Fix test suite execution + * Fri Aug 03 2018 Michael Simacek - 6.2-5 - Repack the tarball without binaries diff --git a/sources b/sources index 4edcbb4..9c6b364 100644 --- a/sources +++ b/sources @@ -1,8 +1,8 @@ -SHA512 (objectweb-asm-6.2.tar.gz) = 52de20e11eb7f09bb47ef7394138c3fb425197c552786bf01e1f17331f2d32481e09ce2dd7267058647e29bcd4cbd0b4e7a2f2f3ee583945b18eefebbe407238 -SHA512 (asm-6.2.pom) = a6cebb211772ac4e13df2c519593da5ce0742bb88d928fc0c2cf9094141f88c4e88dbff29ca6f7b7b3749d0ada02ddc07c27c25493c6562be8dbcecf8a1fcad5 -SHA512 (asm-analysis-6.2.pom) = 853742bb74ffae42314c162f624c8bb2a6149a3fc7763a9ac2ec2528f2381c5b84d7bfd41c61f89e59bd1650a06faf64d4124f6e0fa2cfd23554257949d6006b -SHA512 (asm-commons-6.2.pom) = c8033bde09af20576aee78237e555620f22de6fccfa9ab8840d7e09657f6d92cf2b467080c18207cf978c4a21af86eba120bd9a19430b264822b55fbfefa5e4f -SHA512 (asm-test-6.2.pom) = 3ef16fee0924ffd6da3bc3e715574cc6324250707980586beadd1bbee50bf9e709f251593e21c6637d56f5c90db9b7c599b5617f22e4da5bc87932fb610914da -SHA512 (asm-tree-6.2.pom) = cb8eec7d54024595cd2c13a7fb2e8fec9d04f83ccd0c50b71745fd51a6fb6f4e5e56521b86932f9da3e775dd2a0d3a1fe90c8bf2da3c2ee39453b1019e0efd43 -SHA512 (asm-util-6.2.pom) = 0fcf4c8c0dc98b71cd53f1e2253a5f8293bfed4a673b2d231993365645326a27f8ded6a2879e3f9a341ffeb2cdbb5b8d659c789ee1bd3ed109676f505b61bc18 -SHA512 (asm-xml-6.2.pom) = 078aa27a82b3513080e238830e6ac7cd09e5dd374587544ec55c56a9ddf53d050b660b2f61ed51ff7421fd6134ee0fdf686c4e6c55cbb9fc8f48123eb750c96c +SHA512 (objectweb-asm-6.2.1.tar.gz) = 203d36483d068beb26e2139ad535f4b386b043f1a5a5e7e6e5f29c1fc04dd0905e22f5746594d5c4bff9c94a90fb7ce1a3d566c3d312a728c14693ed6cc9af97 +SHA512 (asm-6.2.1.pom) = 3d5f1c68c1eb9b4b92655138a611f3ce5fded9183a1abe37473a349f226e2e83b2bf7caa5f7a53a93ab16a392f3ebaa962b1630dd0e9cdc41dc99de975270c40 +SHA512 (asm-analysis-6.2.1.pom) = 6bd4328c59ee0e30af88f2036fb22ba2256013ac97572ae149b8368df2f550e8a356ae86d8cbf172865d7f884366efad76473079bcc77e46ad1c089ad4443856 +SHA512 (asm-commons-6.2.1.pom) = d91a12ea460fbde0c6e8984daf33abac9c724893c5a2de7b2de7e741162fd358b47f4be398bd6813168a65878d0f948d1853d2fcb8f3b9a575f130b1c02acecf +SHA512 (asm-test-6.2.1.pom) = 273a26015bdecf945df3a30729b9628eed779c0218f9d343c39c1349e947133d9e87e0dc6865a6429a01bf8178e03b86e1c874e3bb1b3c175e3d38c8d6c1941a +SHA512 (asm-tree-6.2.1.pom) = 4f3150dd6737ca05862769de49df55d8f66882ddeea2bfaaa04852862e4c07ad51ab14a87a92bea55dd611ec5886123331d756cb8fc511c8c0a5b3cba400c033 +SHA512 (asm-util-6.2.1.pom) = e257f5fe8f32c5c35c9ac1b307e1f9a69141a6ed66aa28a0e76b12560b6441b59c84ff3dbd0da185f53bd57517edb95e1b0517b19d0e2299ef4271818e66056b +SHA512 (asm-xml-6.2.1.pom) = cef15584c25df9e07aa3c1121134545b7e79e678b58340e6d34b7f28c0b9b8c61768dc0d501299c5b489a9f26d28511adc1cbae757a2973201852c28de45d25b From a2533d9a52735b3b83ffe2baaaa8444bd9424338 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 21 Nov 2018 12:10:05 +0100 Subject: [PATCH 050/121] Update to upstream's 7.0 release. --- .gitignore | 8 ++++++++ asm-all.pom | 5 ----- objectweb-asm.spec | 17 ++++++++++------- parent.pom | 1 - sources | 15 +++++++-------- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index e3dc0f5..f45b3a8 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,11 @@ /asm-tree-6.2.1.pom /asm-util-6.2.1.pom /asm-xml-6.2.1.pom +/objectweb-asm-7.0.tar.gz +/objectweb-asm-7.0/ +/asm-7.0.pom +/asm-analysis-7.0.pom +/asm-commons-7.0.pom +/asm-test-7.0.pom +/asm-tree-7.0.pom +/asm-util-7.0.pom diff --git a/asm-all.pom b/asm-all.pom index 81aba6d..230058b 100644 --- a/asm-all.pom +++ b/asm-all.pom @@ -36,11 +36,6 @@ asm-tree @VERSION@ - - org.ow2.asm - asm-xml - @VERSION@ - diff --git a/objectweb-asm.spec b/objectweb-asm.spec index b5f0f04..c572f93 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ %bcond_without osgi Name: objectweb-asm -Version: 6.2.1 +Version: 7.0 Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD @@ -18,12 +18,11 @@ Source4: http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version} Source5: http://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom Source6: http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom Source7: http://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom -Source8: http://repo1.maven.org/maven2/org/ow2/asm/asm-xml/%{version}/asm-xml-%{version}.pom # We still want to create an "all" uberjar, so this is a custom pom to generate it # TODO: Fix other packages to no longer depend on "asm-all" so we can drop this -Source9: asm-all.pom +Source8: asm-all.pom # The source contains binary jars that cannot be verified for licensing and could be proprietary -Source10: generate-tarball.sh +Source9: generate-tarball.sh BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -72,7 +71,7 @@ cp -p %{SOURCE1} pom.xml %endif # Insert poms into modules -for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do +for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml # Fix junit5 configuration %if %{with junit5} @@ -109,7 +108,7 @@ sed -i -e '/testSortLocalVariablesAndInstantiate()/i@org.junit.jupiter.api.Disab # Insert asm-all pom mkdir -p asm-all -sed 's/@VERSION@/%{version}/g' %{SOURCE9} > asm-all/pom.xml +sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml # Remove invalid self-dependency %pom_remove_dep org.ow2.asm:asm-test asm-test @@ -138,7 +137,7 @@ popd %install %mvn_install -%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true +%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util %{name}-processor true %files -f .mfiles %license LICENSE.txt @@ -148,6 +147,10 @@ popd %license LICENSE.txt %changelog +* Wed Nov 21 2018 Severin Gehwolf - 7.0-1 +- Update to latest upstream 7.0 release. +- Removes package asm-xml (deprecated since 6.1). + * Tue Sep 11 2018 Mat Booth - 6.2.1-1 - Update to latest upstream release - Fix test suite execution diff --git a/parent.pom b/parent.pom index 6aad2c2..8cfbb70 100644 --- a/parent.pom +++ b/parent.pom @@ -16,7 +16,6 @@ asm-test asm-tree asm-util - asm-xml asm-all diff --git a/sources b/sources index 9c6b364..10d3c96 100644 --- a/sources +++ b/sources @@ -1,8 +1,7 @@ -SHA512 (objectweb-asm-6.2.1.tar.gz) = 203d36483d068beb26e2139ad535f4b386b043f1a5a5e7e6e5f29c1fc04dd0905e22f5746594d5c4bff9c94a90fb7ce1a3d566c3d312a728c14693ed6cc9af97 -SHA512 (asm-6.2.1.pom) = 3d5f1c68c1eb9b4b92655138a611f3ce5fded9183a1abe37473a349f226e2e83b2bf7caa5f7a53a93ab16a392f3ebaa962b1630dd0e9cdc41dc99de975270c40 -SHA512 (asm-analysis-6.2.1.pom) = 6bd4328c59ee0e30af88f2036fb22ba2256013ac97572ae149b8368df2f550e8a356ae86d8cbf172865d7f884366efad76473079bcc77e46ad1c089ad4443856 -SHA512 (asm-commons-6.2.1.pom) = d91a12ea460fbde0c6e8984daf33abac9c724893c5a2de7b2de7e741162fd358b47f4be398bd6813168a65878d0f948d1853d2fcb8f3b9a575f130b1c02acecf -SHA512 (asm-test-6.2.1.pom) = 273a26015bdecf945df3a30729b9628eed779c0218f9d343c39c1349e947133d9e87e0dc6865a6429a01bf8178e03b86e1c874e3bb1b3c175e3d38c8d6c1941a -SHA512 (asm-tree-6.2.1.pom) = 4f3150dd6737ca05862769de49df55d8f66882ddeea2bfaaa04852862e4c07ad51ab14a87a92bea55dd611ec5886123331d756cb8fc511c8c0a5b3cba400c033 -SHA512 (asm-util-6.2.1.pom) = e257f5fe8f32c5c35c9ac1b307e1f9a69141a6ed66aa28a0e76b12560b6441b59c84ff3dbd0da185f53bd57517edb95e1b0517b19d0e2299ef4271818e66056b -SHA512 (asm-xml-6.2.1.pom) = cef15584c25df9e07aa3c1121134545b7e79e678b58340e6d34b7f28c0b9b8c61768dc0d501299c5b489a9f26d28511adc1cbae757a2973201852c28de45d25b +SHA512 (objectweb-asm-7.0.tar.gz) = 696935563bffad143653f9cde722fcb16e93271c95918731a8eb08a15b783985848c42ba74a65990489638132fbae3fdf7892889545abb548834f10db3f27ed4 +SHA512 (asm-7.0.pom) = a7a2060b33710202034e1f025a687a40ec97232213bf21a8aeb70e23d8b2200a0f7c33697d0adaf942c1ac2852d7b5a4032a43132a89b5692fa68a26ce32c77e +SHA512 (asm-analysis-7.0.pom) = b2ad03aedcd027e02d493bfb39ad454ad1f969f420af9a27531ca2650b9720375e3f65657820bd5e4b3095625cd9e5c30543a2be14abb9f04b9928514cfdcb99 +SHA512 (asm-commons-7.0.pom) = a092e8dbb0ae7417c3a245ba022485b84432fbb7c072ea1100f60266346cc94e9d4176c25f981c3e05a86e0e0c8348ae6ea0856cf29ead310946fa982bd70ec4 +SHA512 (asm-test-7.0.pom) = 34f8fe64d4db1f6e2e07dc8e39d00aecb072f8c260b094047cd9c7aa6754927a95ea9cde51494d6d3dbda427fb3b1d8583f92f9ad034925d5eba2745253cbb88 +SHA512 (asm-tree-7.0.pom) = e88f0d20160061e9b6eba203a80d50471deb53ece26c256388d06a8026a455c0463c2cc9463c427e88797bd075ddaa8e9f1594fe2f0939997677c629e86f6cca +SHA512 (asm-util-7.0.pom) = c2b8ef7eb326b76b7fca816ec21da04d69426f2c04028b127a1b517a6b23ae92985d6328d37c80b84a5c3e8b503df7623504c761b382f31dce6b80ae4d193302 From 662adb73b8ebdcde92c070e1757af29324b59ee7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 051/121] Expand conditionals --- objectweb-asm.spec | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ceb671e..fc0b253 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,5 +1,3 @@ -%bcond_without junit5 -%bcond_without osgi Name: objectweb-asm Version: 6.2 @@ -29,20 +27,11 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.ow2:ow2:pom:) -%if %{with junit5} -BuildRequires: mvn(org.codehaus.janino:janino) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) -BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider) -%endif -%if %{with osgi} # asm-all needs to be in pluginpath for BND. If this self-dependency # becomes a problem then ASM core will have to be build from source # with javac before main maven build, just like bnd-module-plugin BuildRequires: objectweb-asm >= 6 -%endif # Explicit javapackages-tools requires since asm-processor script uses # /usr/share/java-utils/java-functions @@ -67,26 +56,12 @@ This package provides %{summary}. # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml -%if %{without junit5} %pom_disable_module asm-test -%endif # Insert poms into modules for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml # Fix junit5 configuration -%if %{with junit5} - %pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom - %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.21.0 $pom \ -" - - org.junit.platform - junit-platform-surefire-provider - 1.2.0-RC1 - - " -%endif -%if %{with osgi} if [ "$pom" != "asm-test" ] ; then # Make into OSGi bundles bsn="org.objectweb.${pom//-/.}" @@ -103,7 +78,6 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do " fi -%endif done # Insert asm-all pom @@ -128,11 +102,7 @@ javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath aqute-bnd) $(fi jar cf bnd-module-plugin.jar -C src/main/java org popd -%if %{with junit5} -%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -%else %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -%endif %install %mvn_install From 287d20e3cb6e1a4caa1132c41aae91f9c0ee99c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 16:43:28 +0000 Subject: [PATCH 052/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index c572f93..5554148 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: objectweb-asm Version: 7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -147,6 +147,9 @@ popd %license LICENSE.txt %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Nov 21 2018 Severin Gehwolf - 7.0-1 - Update to latest upstream 7.0 release. - Removes package asm-xml (deprecated since 6.1). From d9f5014a360434431eaad12a0ba3a7277f088b5f Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Mon, 6 May 2019 12:15:41 +0200 Subject: [PATCH 053/121] Update to latest upstream 7.1 release --- .gitignore | 8 ++++++++ objectweb-asm.spec | 25 ++++++++++++++++++++----- sources | 14 +++++++------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f45b3a8..c0247ae 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,11 @@ /asm-test-7.0.pom /asm-tree-7.0.pom /asm-util-7.0.pom +/objectweb-asm-7.1.tar.gz +/asm-7.1.pom +/asm-analysis-7.1.pom +/asm-commons-7.1.pom +/asm-test-7.1.pom +/asm-tree-7.1.pom +/asm-util-7.1.pom +/objectweb-asm-7.1/ diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 5554148..0a304e7 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %bcond_without osgi Name: objectweb-asm -Version: 7.0 -Release: 2%{?dist} +Version: 7.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -99,12 +99,24 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do done # Disable tests that use unlicensed class files -sed -i -e '/testReadAndWriteWithComputeMaxsAndLargeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \ +sed -i -e '/testToByteArray_computeMaxs_largeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \ asm/src/test/java/org/objectweb/asm/ClassWriterTest.java -sed -i -e '/testMergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \ - asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/BasicInterpreterTest.java +sed -i -e '/testAnalyze_mergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/AnalyzerWithBasicInterpreterTest.java sed -i -e '/testSortLocalVariablesAndInstantiate()/i@org.junit.jupiter.api.Disabled("missing class file")' \ asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java +sed -i -e '/testAllMethods_issue317586/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java +sed -i -e '/testAllMethods_anonymousInnerClass/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java +sed -i -e '/testAllMethods_emptyInterface/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java +sed -i -e '/testAllMethods_enum/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java +sed -i -e '/testAllMethods_class/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java +sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java # Insert asm-all pom mkdir -p asm-all @@ -147,6 +159,9 @@ popd %license LICENSE.txt %changelog +* Mon May 06 2019 Severin Gehwolf - 7.1-1 +- Update to latest upstream 7.1 release. + * Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 10d3c96..81cb02b 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-7.0.tar.gz) = 696935563bffad143653f9cde722fcb16e93271c95918731a8eb08a15b783985848c42ba74a65990489638132fbae3fdf7892889545abb548834f10db3f27ed4 -SHA512 (asm-7.0.pom) = a7a2060b33710202034e1f025a687a40ec97232213bf21a8aeb70e23d8b2200a0f7c33697d0adaf942c1ac2852d7b5a4032a43132a89b5692fa68a26ce32c77e -SHA512 (asm-analysis-7.0.pom) = b2ad03aedcd027e02d493bfb39ad454ad1f969f420af9a27531ca2650b9720375e3f65657820bd5e4b3095625cd9e5c30543a2be14abb9f04b9928514cfdcb99 -SHA512 (asm-commons-7.0.pom) = a092e8dbb0ae7417c3a245ba022485b84432fbb7c072ea1100f60266346cc94e9d4176c25f981c3e05a86e0e0c8348ae6ea0856cf29ead310946fa982bd70ec4 -SHA512 (asm-test-7.0.pom) = 34f8fe64d4db1f6e2e07dc8e39d00aecb072f8c260b094047cd9c7aa6754927a95ea9cde51494d6d3dbda427fb3b1d8583f92f9ad034925d5eba2745253cbb88 -SHA512 (asm-tree-7.0.pom) = e88f0d20160061e9b6eba203a80d50471deb53ece26c256388d06a8026a455c0463c2cc9463c427e88797bd075ddaa8e9f1594fe2f0939997677c629e86f6cca -SHA512 (asm-util-7.0.pom) = c2b8ef7eb326b76b7fca816ec21da04d69426f2c04028b127a1b517a6b23ae92985d6328d37c80b84a5c3e8b503df7623504c761b382f31dce6b80ae4d193302 +SHA512 (objectweb-asm-7.1.tar.gz) = 54d7475e058111dc67019fa5fd9b030aba7e8abac27a905dd4c9f8f548da45fbfc96e4b28c73a0496b236e1162cfaa8b677e330373d210d491de191bb9035c1d +SHA512 (asm-7.1.pom) = f0c20a1cfa4a0bcd23abb4fe034a22fbc7cb6694b208b1058fc93dc93f83c2a81b83e91359179c627c458db4a3d67a8897b23faa4feb90b7cbda0febdbb94c83 +SHA512 (asm-analysis-7.1.pom) = 491206a341202d7994843fb83efd42fd40f156f7bdbc041f7659cd43ac6207f5121e6fa3258ef26371ac91c6ccef43d74a9376d7cd8bbc983fca3d85bdf59b6d +SHA512 (asm-commons-7.1.pom) = 2b34fcc09d69ec3e493a6f241ca89380e252ba618e876a27f72ca4a325f1e27978a9b32687f096689265f76ccf20f2f280b614a67e7bd33251ddc0d3d80422ce +SHA512 (asm-test-7.1.pom) = 057a9ae6155b0dfb0327062c86de41d661f637cd3755e938a9568518066b0ad3b9f659e1f8f3649be5957bc0bce79261396551d5017b8065a7fabe1637aec2ca +SHA512 (asm-tree-7.1.pom) = 3103e4c7cf099f3d9e8c444606d3db18b1419bf112a818420c6a31632359021913736bb0a8f74ef05a65eb32b99314abbadd7198cce18cfa90ce20649aac8d03 +SHA512 (asm-util-7.1.pom) = 7387ec72e26e06ff07c057613034f5e4724e273a3b8c5932f51f141160a0c1310a93b4a48fdbedcb0769dbcfe7ed448b895e15bc2f24e28f976c79448fd5b595 From 019b189a6eb6cb5836e1341e92cdb038bbfdbf24 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:22 +0200 Subject: [PATCH 054/121] Mass rebuild for javapackages-tools 201901 --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 31c7929..a5ed9d6 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ Name: objectweb-asm Version: 7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -136,6 +136,9 @@ popd %license LICENSE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 7.1-2 +- Mass rebuild for javapackages-tools 201901 + * Mon May 06 2019 Severin Gehwolf - 7.1-1 - Update to latest upstream 7.1 release. From 3e27f791ebf6bc87610582e1f2ecf02225e3e93c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 22:45:35 +0000 Subject: [PATCH 055/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 5554148..ffdc27f 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: objectweb-asm Version: 7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -147,6 +147,9 @@ popd %license LICENSE.txt %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9105f964fc16519d853606ca8b9799714332a68a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Oct 2019 14:29:11 +0200 Subject: [PATCH 056/121] Update to upstream version 7.2 --- .gitignore | 7 +++++++ objectweb-asm.spec | 8 +++++--- sources | 14 +++++++------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c0247ae..3f4be2e 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,10 @@ /asm-tree-7.1.pom /asm-util-7.1.pom /objectweb-asm-7.1/ +/objectweb-asm-7.2.tar.gz +/asm-7.2.pom +/asm-analysis-7.2.pom +/asm-commons-7.2.pom +/asm-test-7.2.pom +/asm-tree-7.2.pom +/asm-util-7.2.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index a5ed9d6..e4bb511 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,6 @@ - Name: objectweb-asm -Version: 7.1 -Release: 2%{?dist} +Version: 7.2 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -136,6 +135,9 @@ popd %license LICENSE.txt %changelog +* Thu Oct 17 2019 Marian Koncek - 7.2-1 +- Update to upstream version 7.2 + * Fri May 24 2019 Mikolaj Izdebski - 7.1-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 81cb02b..b555a57 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-7.1.tar.gz) = 54d7475e058111dc67019fa5fd9b030aba7e8abac27a905dd4c9f8f548da45fbfc96e4b28c73a0496b236e1162cfaa8b677e330373d210d491de191bb9035c1d -SHA512 (asm-7.1.pom) = f0c20a1cfa4a0bcd23abb4fe034a22fbc7cb6694b208b1058fc93dc93f83c2a81b83e91359179c627c458db4a3d67a8897b23faa4feb90b7cbda0febdbb94c83 -SHA512 (asm-analysis-7.1.pom) = 491206a341202d7994843fb83efd42fd40f156f7bdbc041f7659cd43ac6207f5121e6fa3258ef26371ac91c6ccef43d74a9376d7cd8bbc983fca3d85bdf59b6d -SHA512 (asm-commons-7.1.pom) = 2b34fcc09d69ec3e493a6f241ca89380e252ba618e876a27f72ca4a325f1e27978a9b32687f096689265f76ccf20f2f280b614a67e7bd33251ddc0d3d80422ce -SHA512 (asm-test-7.1.pom) = 057a9ae6155b0dfb0327062c86de41d661f637cd3755e938a9568518066b0ad3b9f659e1f8f3649be5957bc0bce79261396551d5017b8065a7fabe1637aec2ca -SHA512 (asm-tree-7.1.pom) = 3103e4c7cf099f3d9e8c444606d3db18b1419bf112a818420c6a31632359021913736bb0a8f74ef05a65eb32b99314abbadd7198cce18cfa90ce20649aac8d03 -SHA512 (asm-util-7.1.pom) = 7387ec72e26e06ff07c057613034f5e4724e273a3b8c5932f51f141160a0c1310a93b4a48fdbedcb0769dbcfe7ed448b895e15bc2f24e28f976c79448fd5b595 +SHA512 (objectweb-asm-7.2.tar.gz) = c305f0369dc8af83cb7b683fc2a56ca557cd4c9b27800db2b1726894cb0c19c888f1a94d3571975b1556d4f762e9fd75a9b89c66986a1af70daaf6fba3fc6713 +SHA512 (asm-7.2.pom) = 66d602775aef6d6225dceb1aa357754d4410ef3ee187ce24b887e2d467fd35caf1c50503bb6f3c63cd2144ec60cab61f5a311b77cc5753b0bf639d18aa947d63 +SHA512 (asm-analysis-7.2.pom) = 56bfb252328e1459b2ff4d28b4adfbd0567abf0d8e4e2a5d28c2b40d0faf93b9a8dcb59be29595c57af15d5b7019b66d9654aceda4c64926cf51be9d05e89686 +SHA512 (asm-commons-7.2.pom) = 7e76ba1573f493c88ba11738231fcd1bcafc448445d8f30b4e1354b9f58980a49101b317214469e51532ed727002d9babc39a4a833deec7897845e30e60ef466 +SHA512 (asm-test-7.2.pom) = e85543d87ef648ee6b06dfa97702df6ca5c7f43e8ce78b18203e3ae064c65daa8d44232097970520dfd983f564046b64eec272791a2b75b9015e939447d69046 +SHA512 (asm-tree-7.2.pom) = 3e12ecc6d8940fa283abd31b2a222a0103439c06ab1d0e605866c15deb0b0f4aaac0a153745e3bbfd574e97b781d4029c98d8f7765bd8cbb7f4ebdbac92ef6e4 +SHA512 (asm-util-7.2.pom) = d3d4c1a52a2a8d79717d0414fde5997ce9d93bbbd2ab340ad97394a684500916be79d42f09583aa87c4ae7a900eae073ea056ca4da41c19ed46887df4741cbbf From 9eb75fbfd5e1d389f262619a8d746ec44d8bbc40 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 057/121] Mass rebuild for javapackages-tools 201902 --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index e4bb511..c75fdd0 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm Version: 7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -135,6 +135,9 @@ popd %license LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 7.2-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Oct 17 2019 Marian Koncek - 7.2-1 - Update to upstream version 7.2 From 1314b240231afcf502eb3d6183a3228102a1b6ff Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 21 Jan 2020 11:40:06 +0100 Subject: [PATCH 058/121] Update to upstream version 7.3.1 --- .gitignore | 7 +++++++ objectweb-asm.spec | 19 +++++++++++-------- sources | 14 +++++++------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 3f4be2e..82409f4 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,10 @@ /asm-test-7.2.pom /asm-tree-7.2.pom /asm-util-7.2.pom +/objectweb-asm-7.3.1.tar.gz +/asm-7.3.1.pom +/asm-analysis-7.3.1.pom +/asm-commons-7.3.1.pom +/asm-test-7.3.1.pom +/asm-tree-7.3.1.pom +/asm-util-7.3.1.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index c75fdd0..6f5a49b 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,6 +1,6 @@ Name: objectweb-asm -Version: 7.2 -Release: 2%{?dist} +Version: 7.3.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -9,12 +9,12 @@ BuildArch: noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz Source1: parent.pom -Source2: http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom -Source3: http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom -Source4: http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom -Source5: http://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom -Source6: http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom -Source7: http://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom +Source4: https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom +Source5: https://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom +Source6: https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom +Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom # We still want to create an "all" uberjar, so this is a custom pom to generate it # TODO: Fix other packages to no longer depend on "asm-all" so we can drop this Source8: asm-all.pom @@ -135,6 +135,9 @@ popd %license LICENSE.txt %changelog +* Tue Jan 21 2020 Marian Koncek - 7.3.1-1 +- Update to upstream version 7.3.1 + * Tue Nov 05 2019 Mikolaj Izdebski - 7.2-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index b555a57..328ea85 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-7.2.tar.gz) = c305f0369dc8af83cb7b683fc2a56ca557cd4c9b27800db2b1726894cb0c19c888f1a94d3571975b1556d4f762e9fd75a9b89c66986a1af70daaf6fba3fc6713 -SHA512 (asm-7.2.pom) = 66d602775aef6d6225dceb1aa357754d4410ef3ee187ce24b887e2d467fd35caf1c50503bb6f3c63cd2144ec60cab61f5a311b77cc5753b0bf639d18aa947d63 -SHA512 (asm-analysis-7.2.pom) = 56bfb252328e1459b2ff4d28b4adfbd0567abf0d8e4e2a5d28c2b40d0faf93b9a8dcb59be29595c57af15d5b7019b66d9654aceda4c64926cf51be9d05e89686 -SHA512 (asm-commons-7.2.pom) = 7e76ba1573f493c88ba11738231fcd1bcafc448445d8f30b4e1354b9f58980a49101b317214469e51532ed727002d9babc39a4a833deec7897845e30e60ef466 -SHA512 (asm-test-7.2.pom) = e85543d87ef648ee6b06dfa97702df6ca5c7f43e8ce78b18203e3ae064c65daa8d44232097970520dfd983f564046b64eec272791a2b75b9015e939447d69046 -SHA512 (asm-tree-7.2.pom) = 3e12ecc6d8940fa283abd31b2a222a0103439c06ab1d0e605866c15deb0b0f4aaac0a153745e3bbfd574e97b781d4029c98d8f7765bd8cbb7f4ebdbac92ef6e4 -SHA512 (asm-util-7.2.pom) = d3d4c1a52a2a8d79717d0414fde5997ce9d93bbbd2ab340ad97394a684500916be79d42f09583aa87c4ae7a900eae073ea056ca4da41c19ed46887df4741cbbf +SHA512 (objectweb-asm-7.3.1.tar.gz) = d69ad850671a5cff7f45b10edee2da014df67880eae6214f5892976de08565aaaf4c3047389fae86150877a7fb0b8be07d66d3d8859280e4a5a298ca2547d9c3 +SHA512 (asm-7.3.1.pom) = bc1effc5b1e386fb352d4839b91e395997ae3053b165f93460d3b7f6ca1445e08a242287d30a7a9514161b0656f090dc7cd65e858a506d7b0ed750af7b316b42 +SHA512 (asm-analysis-7.3.1.pom) = 616bb5f12fe450d816c3b785b9942050bf9f5feadeafc123d28bf1a8d3dba64876a5f43024543ac91078f353f6a9429950635cca4ef0304e3d64b3d99014c65d +SHA512 (asm-commons-7.3.1.pom) = eb54866a53fade6e8c1f93507b6b3d8a234fe8a9ef8fa84dccc583612f1b1c8cb99e8ec3f547d20191b6dbc6627e53d5a0989a9ee87662af2c088cf20585e4c9 +SHA512 (asm-test-7.3.1.pom) = 17aabc1e94ff7320f2e5c8c3a47c107388ce456002f93737955bd448178d3a261cd5831e7c6b5b77bb7383b34793e9c879329dceff16b9ae63b686c17f38117e +SHA512 (asm-tree-7.3.1.pom) = 9fd3cb4898e0196cd912d8aaeceaed04a1e3b02701d4c3f761c8d899b1dbe09824d58b0dfda53ec6bebd109d10e6783a1ee3454bcd604a03dea0f871ff108523 +SHA512 (asm-util-7.3.1.pom) = 576462d670520bfb09159d69bd66cd152ba71c14c74670ad4ffe44e09146f935837056a3122a594a54792ab0e8dd873f72653c3d2853810e48ef2680453431ce From 4e49eba9dda22289d50be3ff076220cb817c5cb6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:12:06 +0100 Subject: [PATCH 059/121] Properly compress taballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 255d107..e6e5c9d 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -10,7 +10,7 @@ wget "https://gitlab.ow2.org/asm/asm/repository/${gittag}/archive.tar.gz#/${name rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp +pushd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # Rename dir not to contain commit @@ -23,6 +23,6 @@ find -name '*.jar' -delete find */asm{,-analysis,-commons} -name '*.class' -delete rm -r */gradle -tar cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" From 67c5f7fd28d48b5fff12023ab9d604cfb19222fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 19:26:01 +0000 Subject: [PATCH 060/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ffdc27f..4d24899 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: objectweb-asm Version: 7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -147,6 +147,9 @@ popd %license LICENSE.txt %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From fde76b9338158b2e2b5b90b29d05a7c1adee8699 Mon Sep 17 00:00:00 2001 From: Jayashree Huttanagoudar Date: Thu, 27 Feb 2020 16:57:23 +0530 Subject: [PATCH 061/121] Upgrade to upstream release 7.3.1 Test source file name BasicInterpreterTest has changed to AnalyzerWithBasicInterpreterTest. Related changes in spec file are restored accordingly --- objectweb-asm.spec | 30 ++++++++++++++++++------------ sources | 14 +++++++------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4d24899..39f9dfe 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %bcond_without osgi Name: objectweb-asm -Version: 7.0 -Release: 4%{?dist} +Version: 7.3.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -12,12 +12,12 @@ BuildArch: noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz Source1: parent.pom -Source2: http://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom -Source3: http://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom -Source4: http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom -Source5: http://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom -Source6: http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom -Source7: http://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom +Source4: https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom +Source5: https://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom +Source6: https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom +Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom # We still want to create an "all" uberjar, so this is a custom pom to generate it # TODO: Fix other packages to no longer depend on "asm-all" so we can drop this Source8: asm-all.pom @@ -99,13 +99,16 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do done # Disable tests that use unlicensed class files -sed -i -e '/testReadAndWriteWithComputeMaxsAndLargeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \ +sed -i -e '/testToByteArray_computeMaxs_largeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \ asm/src/test/java/org/objectweb/asm/ClassWriterTest.java -sed -i -e '/testMergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \ - asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/BasicInterpreterTest.java -sed -i -e '/testSortLocalVariablesAndInstantiate()/i@org.junit.jupiter.api.Disabled("missing class file")' \ +sed -i -e '/testAnalyze_mergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \ + asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/AnalyzerWithBasicInterpreterTest.java +sed -i -e '/testAllMethods_issue317586()/i@org.junit.jupiter.api.Disabled("missing class file")' \ asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java +# Remove failing test SerialVersionUidAdderTest due to missing class files +rm asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java + # Insert asm-all pom mkdir -p asm-all sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml @@ -147,6 +150,9 @@ popd %license LICENSE.txt %changelog +* Thu Feb 27 2020 Jayashree Huttanagoudat - 7.3.1-1 +- Upgraded to upstream version 7.3.1. + * Wed Jan 29 2020 Fedora Release Engineering - 7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 10d3c96..9ac0229 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-7.0.tar.gz) = 696935563bffad143653f9cde722fcb16e93271c95918731a8eb08a15b783985848c42ba74a65990489638132fbae3fdf7892889545abb548834f10db3f27ed4 -SHA512 (asm-7.0.pom) = a7a2060b33710202034e1f025a687a40ec97232213bf21a8aeb70e23d8b2200a0f7c33697d0adaf942c1ac2852d7b5a4032a43132a89b5692fa68a26ce32c77e -SHA512 (asm-analysis-7.0.pom) = b2ad03aedcd027e02d493bfb39ad454ad1f969f420af9a27531ca2650b9720375e3f65657820bd5e4b3095625cd9e5c30543a2be14abb9f04b9928514cfdcb99 -SHA512 (asm-commons-7.0.pom) = a092e8dbb0ae7417c3a245ba022485b84432fbb7c072ea1100f60266346cc94e9d4176c25f981c3e05a86e0e0c8348ae6ea0856cf29ead310946fa982bd70ec4 -SHA512 (asm-test-7.0.pom) = 34f8fe64d4db1f6e2e07dc8e39d00aecb072f8c260b094047cd9c7aa6754927a95ea9cde51494d6d3dbda427fb3b1d8583f92f9ad034925d5eba2745253cbb88 -SHA512 (asm-tree-7.0.pom) = e88f0d20160061e9b6eba203a80d50471deb53ece26c256388d06a8026a455c0463c2cc9463c427e88797bd075ddaa8e9f1594fe2f0939997677c629e86f6cca -SHA512 (asm-util-7.0.pom) = c2b8ef7eb326b76b7fca816ec21da04d69426f2c04028b127a1b517a6b23ae92985d6328d37c80b84a5c3e8b503df7623504c761b382f31dce6b80ae4d193302 +SHA512 (objectweb-asm-7.3.1.tar.gz) = 8b7523a7a56d1bf802c6bc476e8fbd23911952143c619cfce9b976e66aa6b5dbce5eda4567060c020ab098821942acd9c0539e00ba0c445548da9b67ff932cd4 +SHA512 (asm-7.3.1.pom) = bc1effc5b1e386fb352d4839b91e395997ae3053b165f93460d3b7f6ca1445e08a242287d30a7a9514161b0656f090dc7cd65e858a506d7b0ed750af7b316b42 +SHA512 (asm-analysis-7.3.1.pom) = 616bb5f12fe450d816c3b785b9942050bf9f5feadeafc123d28bf1a8d3dba64876a5f43024543ac91078f353f6a9429950635cca4ef0304e3d64b3d99014c65d +SHA512 (asm-commons-7.3.1.pom) = eb54866a53fade6e8c1f93507b6b3d8a234fe8a9ef8fa84dccc583612f1b1c8cb99e8ec3f547d20191b6dbc6627e53d5a0989a9ee87662af2c088cf20585e4c9 +SHA512 (asm-test-7.3.1.pom) = 17aabc1e94ff7320f2e5c8c3a47c107388ce456002f93737955bd448178d3a261cd5831e7c6b5b77bb7383b34793e9c879329dceff16b9ae63b686c17f38117e +SHA512 (asm-tree-7.3.1.pom) = 9fd3cb4898e0196cd912d8aaeceaed04a1e3b02701d4c3f761c8d899b1dbe09824d58b0dfda53ec6bebd109d10e6783a1ee3454bcd604a03dea0f871ff108523 +SHA512 (asm-util-7.3.1.pom) = 576462d670520bfb09159d69bd66cd152ba71c14c74670ad4ffe44e09146f935837056a3122a594a54792ab0e8dd873f72653c3d2853810e48ef2680453431ce From d3561a5e2de779c7f8d4e7c6912db9ba9b779197 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 Apr 2020 15:12:33 +0200 Subject: [PATCH 062/121] Use Maven coordinates in build-classpath --- objectweb-asm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 6f5a49b..413224e 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -116,7 +116,7 @@ sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml %build # Must compile bnd plugin first, which is used to generate Java 9 module-info.class files pushd tools/bnd-module-plugin -javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath aqute-bnd) $(find -name *.java) +javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath biz.aQute.bnd:biz.aQute.bndlib biz.aQute.bnd:aQute.libg) $(find -name *.java) jar cf bnd-module-plugin.jar -C src/main/java org popd From 55cfb4bb55e8f1ef6c51d2278411431858f27c22 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 6 May 2020 15:49:05 +0100 Subject: [PATCH 063/121] Revert an upstream change to prevent breaking API change --- .gitignore | 7 +- 0001-Revert-upstream-change-2a58bc9.patch | 813 ++++++++++++++++++++++ objectweb-asm.spec | 11 +- 3 files changed, 825 insertions(+), 6 deletions(-) create mode 100644 0001-Revert-upstream-change-2a58bc9.patch diff --git a/.gitignore b/.gitignore index f45b3a8..1c78938 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ /.build-*.log /*.src.rpm /noarch -/archive.tar.gz /asm-6.2.pom /asm-analysis-6.2.pom /asm-commons-6.2.pom @@ -11,8 +10,6 @@ /asm-tree-6.2.pom /asm-util-6.2.pom /asm-xml-6.2.pom -/objectweb-asm-6.2.tar.gz -/objectweb-asm-6.2.1.tar.gz /asm-6.2.1.pom /asm-analysis-6.2.1.pom /asm-commons-6.2.1.pom @@ -20,8 +17,8 @@ /asm-tree-6.2.1.pom /asm-util-6.2.1.pom /asm-xml-6.2.1.pom -/objectweb-asm-7.0.tar.gz -/objectweb-asm-7.0/ +/objectweb-asm-*.tar.gz +/objectweb-asm-*/ /asm-7.0.pom /asm-analysis-7.0.pom /asm-commons-7.0.pom diff --git a/0001-Revert-upstream-change-2a58bc9.patch b/0001-Revert-upstream-change-2a58bc9.patch new file mode 100644 index 0000000..907acb5 --- /dev/null +++ b/0001-Revert-upstream-change-2a58bc9.patch @@ -0,0 +1,813 @@ +From df50f201a0f253bc55dc89e191ac66cb920a3274 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Wed, 6 May 2020 15:09:27 +0100 +Subject: [PATCH] Revert upstream change 2a58bc9 + +--- + .../commons/RemappingAnnotationAdapter.java | 85 ++++++ + .../asm/commons/RemappingClassAdapter.java | 167 +++++++++++ + .../asm/commons/RemappingFieldAdapter.java | 74 +++++ + .../asm/commons/RemappingMethodAdapter.java | 279 ++++++++++++++++++ + .../commons/RemappingSignatureAdapter.java | 157 ++++++++++ + 5 files changed, 762 insertions(+) + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java + create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java + +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java +new file mode 100644 +index 0000000..86c6ee9 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java +@@ -0,0 +1,85 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.Opcodes; ++ ++/** ++ * An {@link AnnotationVisitor} adapter for type remapping. ++ * ++ * @deprecated use {@link AnnotationRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingAnnotationAdapter extends AnnotationVisitor { ++ ++ protected final Remapper remapper; ++ ++ public RemappingAnnotationAdapter( ++ final AnnotationVisitor annotationVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, annotationVisitor, remapper); ++ } ++ ++ protected RemappingAnnotationAdapter( ++ final int api, final AnnotationVisitor annotationVisitor, final Remapper remapper) { ++ super(api, annotationVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public void visit(final String name, final Object value) { ++ av.visit(name, remapper.mapValue(value)); ++ } ++ ++ @Override ++ public void visitEnum(final String name, final String descriptor, final String value) { ++ av.visitEnum(name, remapper.mapDesc(descriptor), value); ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String name, final String descriptor) { ++ AnnotationVisitor annotationVisitor = av.visitAnnotation(name, remapper.mapDesc(descriptor)); ++ return annotationVisitor == null ++ ? null ++ : (annotationVisitor == av ++ ? this ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper)); ++ } ++ ++ @Override ++ public AnnotationVisitor visitArray(final String name) { ++ AnnotationVisitor annotationVisitor = av.visitArray(name); ++ return annotationVisitor == null ++ ? null ++ : (annotationVisitor == av ++ ? this ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper)); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java +new file mode 100644 +index 0000000..b4cc08c +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java +@@ -0,0 +1,167 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.ClassVisitor; ++import org.objectweb.asm.FieldVisitor; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.ModuleVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.TypePath; ++ ++/** ++ * A {@link ClassVisitor} for type remapping. ++ * ++ * @deprecated use {@link ClassRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingClassAdapter extends ClassVisitor { ++ ++ protected final Remapper remapper; ++ ++ protected String className; ++ ++ public RemappingClassAdapter(final ClassVisitor classVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, classVisitor, remapper); ++ } ++ ++ protected RemappingClassAdapter( ++ final int api, final ClassVisitor classVisitor, final Remapper remapper) { ++ super(api, classVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public void visit( ++ final int version, ++ final int access, ++ final String name, ++ final String signature, ++ final String superName, ++ final String[] interfaces) { ++ this.className = name; ++ super.visit( ++ version, ++ access, ++ remapper.mapType(name), ++ remapper.mapSignature(signature, false), ++ remapper.mapType(superName), ++ interfaces == null ? null : remapper.mapTypes(interfaces)); ++ } ++ ++ @Override ++ public ModuleVisitor visitModule(final String name, final int flags, final String version) { ++ throw new RuntimeException("RemappingClassAdapter is deprecated, use ClassRemapper instead"); ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitAnnotation(remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTypeAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor); ++ } ++ ++ @Override ++ public FieldVisitor visitField( ++ final int access, ++ final String name, ++ final String descriptor, ++ final String signature, ++ final Object value) { ++ FieldVisitor fieldVisitor = ++ super.visitField( ++ access, ++ remapper.mapFieldName(className, name, descriptor), ++ remapper.mapDesc(descriptor), ++ remapper.mapSignature(signature, true), ++ remapper.mapValue(value)); ++ return fieldVisitor == null ? null : createRemappingFieldAdapter(fieldVisitor); ++ } ++ ++ @Override ++ public MethodVisitor visitMethod( ++ final int access, ++ final String name, ++ final String descriptor, ++ final String signature, ++ final String[] exceptions) { ++ String newDescriptor = remapper.mapMethodDesc(descriptor); ++ MethodVisitor methodVisitor = ++ super.visitMethod( ++ access, ++ remapper.mapMethodName(className, name, descriptor), ++ newDescriptor, ++ remapper.mapSignature(signature, false), ++ exceptions == null ? null : remapper.mapTypes(exceptions)); ++ return methodVisitor == null ++ ? null ++ : createRemappingMethodAdapter(access, newDescriptor, methodVisitor); ++ } ++ ++ @Override ++ public void visitInnerClass( ++ final String name, final String outerName, final String innerName, final int access) { ++ super.visitInnerClass( ++ remapper.mapType(name), ++ outerName == null ? null : remapper.mapType(outerName), ++ innerName, ++ access); ++ } ++ ++ @Override ++ public void visitOuterClass(final String owner, final String name, final String descriptor) { ++ super.visitOuterClass( ++ remapper.mapType(owner), ++ name == null ? null : remapper.mapMethodName(owner, name, descriptor), ++ descriptor == null ? null : remapper.mapMethodDesc(descriptor)); ++ } ++ ++ protected FieldVisitor createRemappingFieldAdapter(final FieldVisitor fieldVisitor) { ++ return new RemappingFieldAdapter(fieldVisitor, remapper); ++ } ++ ++ protected MethodVisitor createRemappingMethodAdapter( ++ final int access, final String newDescriptor, final MethodVisitor methodVisitior) { ++ return new RemappingMethodAdapter(access, newDescriptor, methodVisitior, remapper); ++ } ++ ++ protected AnnotationVisitor createRemappingAnnotationAdapter(final AnnotationVisitor av) { ++ return new RemappingAnnotationAdapter(av, remapper); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java +new file mode 100644 +index 0000000..5f14f33 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java +@@ -0,0 +1,74 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.FieldVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.TypePath; ++ ++/** ++ * A {@link FieldVisitor} adapter for type remapping. ++ * ++ * @deprecated use {@link FieldRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingFieldAdapter extends FieldVisitor { ++ ++ private final Remapper remapper; ++ ++ public RemappingFieldAdapter(final FieldVisitor fieldVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, fieldVisitor, remapper); ++ } ++ ++ protected RemappingFieldAdapter( ++ final int api, final FieldVisitor fieldVisitor, final Remapper remapper) { ++ super(api, fieldVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = fv.visitAnnotation(remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? null ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTypeAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? null ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java +new file mode 100644 +index 0000000..cf21f18 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java +@@ -0,0 +1,279 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.Handle; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.TypePath; ++ ++/** ++ * A {@link LocalVariablesSorter} for type mapping. ++ * ++ * @deprecated use {@link MethodRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingMethodAdapter extends LocalVariablesSorter { ++ ++ protected final Remapper remapper; ++ ++ public RemappingMethodAdapter( ++ final int access, ++ final String descriptor, ++ final MethodVisitor methodVisitor, ++ final Remapper remapper) { ++ this(Opcodes.ASM6, access, descriptor, methodVisitor, remapper); ++ } ++ ++ protected RemappingMethodAdapter( ++ final int api, ++ final int access, ++ final String descriptor, ++ final MethodVisitor methodVisitor, ++ final Remapper remapper) { ++ super(api, access, descriptor, methodVisitor); ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotationDefault() { ++ AnnotationVisitor annotationVisitor = super.visitAnnotationDefault(); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitAnnotation(remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTypeAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public AnnotationVisitor visitParameterAnnotation( ++ final int parameter, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitParameterAnnotation(parameter, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public void visitFrame( ++ final int type, ++ final int numLocal, ++ final Object[] local, ++ final int numStack, ++ final Object[] stack) { ++ super.visitFrame( ++ type, numLocal, remapEntries(numLocal, local), numStack, remapEntries(numStack, stack)); ++ } ++ ++ private Object[] remapEntries(final int numTypes, final Object[] entries) { ++ if (entries == null) { ++ return entries; ++ } ++ Object[] remappedEntries = null; ++ for (int i = 0; i < numTypes; ++i) { ++ if (entries[i] instanceof String) { ++ if (remappedEntries == null) { ++ remappedEntries = new Object[numTypes]; ++ System.arraycopy(entries, 0, remappedEntries, 0, numTypes); ++ } ++ remappedEntries[i] = remapper.mapType((String) entries[i]); ++ } ++ } ++ return remappedEntries == null ? entries : remappedEntries; ++ } ++ ++ @Override ++ public void visitFieldInsn( ++ final int opcode, final String owner, final String name, final String descriptor) { ++ super.visitFieldInsn( ++ opcode, ++ remapper.mapType(owner), ++ remapper.mapFieldName(owner, name, descriptor), ++ remapper.mapDesc(descriptor)); ++ } ++ ++ @Deprecated ++ @Override ++ public void visitMethodInsn( ++ final int opcode, final String owner, final String name, final String descriptor) { ++ if (api >= Opcodes.ASM5) { ++ super.visitMethodInsn(opcode, owner, name, descriptor); ++ return; ++ } ++ doVisitMethodInsn(opcode, owner, name, descriptor, opcode == Opcodes.INVOKEINTERFACE); ++ } ++ ++ @Override ++ public void visitMethodInsn( ++ final int opcode, ++ final String owner, ++ final String name, ++ final String descriptor, ++ final boolean isInterface) { ++ if (api < Opcodes.ASM5) { ++ super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); ++ return; ++ } ++ doVisitMethodInsn(opcode, owner, name, descriptor, isInterface); ++ } ++ ++ private void doVisitMethodInsn( ++ final int opcode, ++ final String owner, ++ final String name, ++ final String descriptor, ++ final boolean isInterface) { ++ // Calling super.visitMethodInsn requires to call the correct version ++ // depending on this.api (otherwise infinite loops can occur). To ++ // simplify and to make it easier to automatically remove the backward ++ // compatibility code, we inline the code of the overridden method here. ++ // IMPORTANT: THIS ASSUMES THAT visitMethodInsn IS NOT OVERRIDDEN IN ++ // LocalVariableSorter. ++ if (mv != null) { ++ mv.visitMethodInsn( ++ opcode, ++ remapper.mapType(owner), ++ remapper.mapMethodName(owner, name, descriptor), ++ remapper.mapMethodDesc(descriptor), ++ isInterface); ++ } ++ } ++ ++ @Override ++ public void visitInvokeDynamicInsn( ++ final String name, ++ final String descriptor, ++ final Handle bootstrapMethodHandle, ++ final Object... bootstrapMethodArguments) { ++ for (int i = 0; i < bootstrapMethodArguments.length; i++) { ++ bootstrapMethodArguments[i] = remapper.mapValue(bootstrapMethodArguments[i]); ++ } ++ super.visitInvokeDynamicInsn( ++ remapper.mapInvokeDynamicMethodName(name, descriptor), ++ remapper.mapMethodDesc(descriptor), ++ (Handle) remapper.mapValue(bootstrapMethodHandle), ++ bootstrapMethodArguments); ++ } ++ ++ @Override ++ public void visitTypeInsn(final int opcode, final String type) { ++ super.visitTypeInsn(opcode, remapper.mapType(type)); ++ } ++ ++ @Override ++ public void visitLdcInsn(final Object value) { ++ super.visitLdcInsn(remapper.mapValue(value)); ++ } ++ ++ @Override ++ public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) { ++ super.visitMultiANewArrayInsn(remapper.mapDesc(descriptor), numDimensions); ++ } ++ ++ @Override ++ public AnnotationVisitor visitInsnAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitInsnAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public void visitTryCatchBlock( ++ final Label start, final Label end, final Label handler, final String type) { ++ super.visitTryCatchBlock(start, end, handler, type == null ? null : remapper.mapType(type)); ++ } ++ ++ @Override ++ public AnnotationVisitor visitTryCatchAnnotation( ++ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitTryCatchAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++ ++ @Override ++ public void visitLocalVariable( ++ final String name, ++ final String descriptor, ++ final String signature, ++ final Label start, ++ final Label end, ++ final int index) { ++ super.visitLocalVariable( ++ name, ++ remapper.mapDesc(descriptor), ++ remapper.mapSignature(signature, true), ++ start, ++ end, ++ index); ++ } ++ ++ @Override ++ public AnnotationVisitor visitLocalVariableAnnotation( ++ final int typeRef, ++ final TypePath typePath, ++ final Label[] start, ++ final Label[] end, ++ final int[] index, ++ final String descriptor, ++ final boolean visible) { ++ AnnotationVisitor annotationVisitor = ++ super.visitLocalVariableAnnotation( ++ typeRef, typePath, start, end, index, remapper.mapDesc(descriptor), visible); ++ return annotationVisitor == null ++ ? annotationVisitor ++ : new RemappingAnnotationAdapter(annotationVisitor, remapper); ++ } ++} +diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java +new file mode 100644 +index 0000000..1553cd5 +--- /dev/null ++++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java +@@ -0,0 +1,157 @@ ++// ASM: a very small and fast Java bytecode manipulation framework ++// Copyright (c) 2000-2011 INRIA, France Telecom ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions ++// are met: ++// 1. Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// 2. Redistributions in binary form must reproduce the above copyright ++// notice, this list of conditions and the following disclaimer in the ++// documentation and/or other materials provided with the distribution. ++// 3. Neither the name of the copyright holders nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++// THE POSSIBILITY OF SUCH DAMAGE. ++ ++package org.objectweb.asm.commons; ++ ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.signature.SignatureVisitor; ++ ++/** ++ * A {@link SignatureVisitor} adapter for type mapping. ++ * ++ * @deprecated use {@link SignatureRemapper} instead. ++ * @author Eugene Kuleshov ++ */ ++@Deprecated ++public class RemappingSignatureAdapter extends SignatureVisitor { ++ ++ private final SignatureVisitor signatureVisitor; ++ ++ private final Remapper remapper; ++ ++ private String className; ++ ++ public RemappingSignatureAdapter( ++ final SignatureVisitor signatureVisitor, final Remapper remapper) { ++ this(Opcodes.ASM6, signatureVisitor, remapper); ++ } ++ ++ protected RemappingSignatureAdapter( ++ final int api, final SignatureVisitor signatureVisitor, final Remapper remapper) { ++ super(api); ++ this.signatureVisitor = signatureVisitor; ++ this.remapper = remapper; ++ } ++ ++ @Override ++ public void visitClassType(final String name) { ++ className = name; ++ signatureVisitor.visitClassType(remapper.mapType(name)); ++ } ++ ++ @Override ++ public void visitInnerClassType(final String name) { ++ String remappedOuter = remapper.mapType(className) + '$'; ++ className = className + '$' + name; ++ String remappedName = remapper.mapType(className); ++ int index = ++ remappedName.startsWith(remappedOuter) ++ ? remappedOuter.length() ++ : remappedName.lastIndexOf('$') + 1; ++ signatureVisitor.visitInnerClassType(remappedName.substring(index)); ++ } ++ ++ @Override ++ public void visitFormalTypeParameter(final String name) { ++ signatureVisitor.visitFormalTypeParameter(name); ++ } ++ ++ @Override ++ public void visitTypeVariable(final String name) { ++ signatureVisitor.visitTypeVariable(name); ++ } ++ ++ @Override ++ public SignatureVisitor visitArrayType() { ++ signatureVisitor.visitArrayType(); ++ return this; ++ } ++ ++ @Override ++ public void visitBaseType(final char descriptor) { ++ signatureVisitor.visitBaseType(descriptor); ++ } ++ ++ @Override ++ public SignatureVisitor visitClassBound() { ++ signatureVisitor.visitClassBound(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitExceptionType() { ++ signatureVisitor.visitExceptionType(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitInterface() { ++ signatureVisitor.visitInterface(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitInterfaceBound() { ++ signatureVisitor.visitInterfaceBound(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitParameterType() { ++ signatureVisitor.visitParameterType(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitReturnType() { ++ signatureVisitor.visitReturnType(); ++ return this; ++ } ++ ++ @Override ++ public SignatureVisitor visitSuperclass() { ++ signatureVisitor.visitSuperclass(); ++ return this; ++ } ++ ++ @Override ++ public void visitTypeArgument() { ++ signatureVisitor.visitTypeArgument(); ++ } ++ ++ @Override ++ public SignatureVisitor visitTypeArgument(final char wildcard) { ++ signatureVisitor.visitTypeArgument(wildcard); ++ return this; ++ } ++ ++ @Override ++ public void visitEnd() { ++ signatureVisitor.visitEnd(); ++ } ++} +-- +2.26.0 + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 39f9dfe..107a395 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: objectweb-asm Version: 7.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -24,6 +24,10 @@ Source8: asm-all.pom # The source contains binary jars that cannot be verified for licensing and could be proprietary Source9: generate-tarball.sh +# Revert upstream change https://gitlab.ow2.org/asm/asm/-/commit/2a58bc9bcf2ea6eee03e973d1df4cf9312573c9d +# To restore some deprecations that were deleted and broke the API +Patch0: 0001-Revert-upstream-change-2a58bc9.patch + BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) @@ -63,6 +67,8 @@ This package provides %{summary}. %prep %setup -q +%patch0 -p1 + # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml @@ -150,6 +156,9 @@ popd %license LICENSE.txt %changelog +* Wed May 06 2020 Mat Booth - 7.3.1-2 +- Revert an upstream change to prevent breaking API change + * Thu Feb 27 2020 Jayashree Huttanagoudat - 7.3.1-1 - Upgraded to upstream version 7.3.1. From ed0b433dbdcdce11a0fd89b5c12950d8f54c793b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 10:05:26 +0200 Subject: [PATCH 064/121] Remove asm-all uberjar --- asm-all.pom | 57 ---------------------------------------------- objectweb-asm.spec | 46 ++++--------------------------------- parent.pom | 2 -- 3 files changed, 5 insertions(+), 100 deletions(-) delete mode 100644 asm-all.pom diff --git a/asm-all.pom b/asm-all.pom deleted file mode 100644 index 230058b..0000000 --- a/asm-all.pom +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - org.ow2 - ow2 - 1.5 - - org.ow2.asm - asm-all - @VERSION@ - - - org.ow2.asm - asm - @VERSION@ - - - org.ow2.asm - asm-analysis - @VERSION@ - - - org.ow2.asm - asm-commons - @VERSION@ - - - org.ow2.asm - asm-tree - @VERSION@ - - - org.ow2.asm - asm-tree - @VERSION@ - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - package - - shade - - - - - - - diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 413224e..652ff98 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -15,21 +15,10 @@ Source4: https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version Source5: https://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom Source6: https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom -# We still want to create an "all" uberjar, so this is a custom pom to generate it -# TODO: Fix other packages to no longer depend on "asm-all" so we can drop this -Source8: asm-all.pom # The source contains binary jars that cannot be verified for licensing and could be proprietary Source9: generate-tarball.sh BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.ow2:ow2:pom:) - -# asm-all needs to be in pluginpath for BND. If this self-dependency -# becomes a problem then ASM core will have to be build from source -# with javac before main maven build, just like bnd-module-plugin -BuildRequires: objectweb-asm >= 6 # Explicit javapackages-tools requires since asm-processor script uses # /usr/share/java-utils/java-functions @@ -54,28 +43,10 @@ This package provides %{summary}. # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml -%pom_disable_module asm-test - # Insert poms into modules for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml - # Fix junit5 configuration - if [ "$pom" != "asm-test" ] ; then - # Make into OSGi bundles - bsn="org.objectweb.${pom//-/.}" - %pom_xpath_inject pom:project "bundle" $pom - %pom_add_plugin org.apache.felix:maven-bundle-plugin:3.5.0 $pom \ -" true - - - $bsn - JavaSE-1.8 - <_removeheaders>Bnd-LastModified,Build-By,Created-By,Include-Resource,Require-Capability,Tool - <_pluginpath>$(pwd)/tools/bnd-module-plugin/bnd-module-plugin.jar, $(find-jar objectweb-asm/asm-all) - <_plugin>org.objectweb.asm.tools.ModuleInfoBndPlugin; - - " - fi + %pom_remove_parent $pom done # Disable tests that use unlicensed class files @@ -98,16 +69,9 @@ sed -i -e '/testAllMethods_class/i@org.junit.jupiter.api.Disabled("missing class sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing class file")' \ asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java -# Insert asm-all pom -mkdir -p asm-all -sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml - # Remove invalid self-dependency %pom_remove_dep org.ow2.asm:asm-test asm-test -# Compat aliases -%mvn_alias :asm-all org.ow2.asm:asm-debug-all - # No need to ship the custom parent pom %mvn_package :asm-aggregator __noinstall # Don't ship the test framework to avoid runtime dep on junit @@ -115,10 +79,10 @@ sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml %build # Must compile bnd plugin first, which is used to generate Java 9 module-info.class files -pushd tools/bnd-module-plugin -javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath biz.aQute.bnd:biz.aQute.bndlib biz.aQute.bnd:aQute.libg) $(find -name *.java) -jar cf bnd-module-plugin.jar -C src/main/java org -popd +#pushd tools/bnd-module-plugin +#javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath biz.aQute.bnd:biz.aQute.bndlib biz.aQute.bnd:aQute.libg) $(find -name *.java) +#jar cf bnd-module-plugin.jar -C src/main/java org +#popd %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 diff --git a/parent.pom b/parent.pom index 8cfbb70..557cd16 100644 --- a/parent.pom +++ b/parent.pom @@ -13,9 +13,7 @@ asm asm-analysis asm-commons - asm-test asm-tree asm-util - asm-all From 162fdcddd557b97a4c03a0386a20d98dced99b45 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 22 Jun 2020 16:45:15 +0200 Subject: [PATCH 065/121] Update to upstream version 8.0.1 --- .gitignore | 7 +++++++ objectweb-asm.spec | 9 ++++++--- sources | 14 +++++++------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 82409f4..a333dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,10 @@ /asm-test-7.3.1.pom /asm-tree-7.3.1.pom /asm-util-7.3.1.pom +/objectweb-asm-8.0.1.tar.gz +/asm-8.0.1.pom +/asm-analysis-8.0.1.pom +/asm-commons-8.0.1.pom +/asm-test-8.0.1.pom +/asm-tree-8.0.1.pom +/asm-util-8.0.1.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 652ff98..8177690 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,9 +1,9 @@ Name: objectweb-asm -Version: 7.3.1 +Version: 8.0.1 Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD -URL: http://asm.ow2.org/ +URL: https://asm.ow2.org/ BuildArch: noarch # ./generate-tarball.sh @@ -16,7 +16,7 @@ Source5: https://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/a Source6: https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom # The source contains binary jars that cannot be verified for licensing and could be proprietary -Source9: generate-tarball.sh +Source9: generate-tarball.sh BuildRequires: maven-local @@ -99,6 +99,9 @@ sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing c %license LICENSE.txt %changelog +* Mon Jun 22 2020 Marian Koncek - 8.0.1-1 +- Update to upstream version 8.0.1 + * Tue Jan 21 2020 Marian Koncek - 7.3.1-1 - Update to upstream version 7.3.1 diff --git a/sources b/sources index 328ea85..0bcdf55 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-7.3.1.tar.gz) = d69ad850671a5cff7f45b10edee2da014df67880eae6214f5892976de08565aaaf4c3047389fae86150877a7fb0b8be07d66d3d8859280e4a5a298ca2547d9c3 -SHA512 (asm-7.3.1.pom) = bc1effc5b1e386fb352d4839b91e395997ae3053b165f93460d3b7f6ca1445e08a242287d30a7a9514161b0656f090dc7cd65e858a506d7b0ed750af7b316b42 -SHA512 (asm-analysis-7.3.1.pom) = 616bb5f12fe450d816c3b785b9942050bf9f5feadeafc123d28bf1a8d3dba64876a5f43024543ac91078f353f6a9429950635cca4ef0304e3d64b3d99014c65d -SHA512 (asm-commons-7.3.1.pom) = eb54866a53fade6e8c1f93507b6b3d8a234fe8a9ef8fa84dccc583612f1b1c8cb99e8ec3f547d20191b6dbc6627e53d5a0989a9ee87662af2c088cf20585e4c9 -SHA512 (asm-test-7.3.1.pom) = 17aabc1e94ff7320f2e5c8c3a47c107388ce456002f93737955bd448178d3a261cd5831e7c6b5b77bb7383b34793e9c879329dceff16b9ae63b686c17f38117e -SHA512 (asm-tree-7.3.1.pom) = 9fd3cb4898e0196cd912d8aaeceaed04a1e3b02701d4c3f761c8d899b1dbe09824d58b0dfda53ec6bebd109d10e6783a1ee3454bcd604a03dea0f871ff108523 -SHA512 (asm-util-7.3.1.pom) = 576462d670520bfb09159d69bd66cd152ba71c14c74670ad4ffe44e09146f935837056a3122a594a54792ab0e8dd873f72653c3d2853810e48ef2680453431ce +SHA512 (objectweb-asm-8.0.1.tar.gz) = 75f83c06dbb00276b3aa95285119b8c12d36eae171dfb2777bf76d5f0c8a6c768de6f45eec50dc462bbb9e783c362707c86ea0d8712266c3cd5dc7f7bc548f79 +SHA512 (asm-8.0.1.pom) = d2600348bd58f5f1a00a0dee7130088e7552be251c915922816952fc613377bd167762d3b986b67448ada28a84d8af668e8914ffcee4a446e0355e80bc7cbae8 +SHA512 (asm-analysis-8.0.1.pom) = 60b8806ad63a31a13f523f5b3410b2553292faebdc8fbc27c6d7d6237c17744a98ce5c7ac3a3defdbfe57400f914d66bfb4f3124b57c207fc6ebb4d559245550 +SHA512 (asm-commons-8.0.1.pom) = 1889eabf9f5758cf3b4a2cb8d1c6585d71be6fc9d3efbd53ef6f379ad422167398f9d1b393abdb8ffdc5420ab47f8d842fe112b8542a3d5245a80212c7219cb0 +SHA512 (asm-test-8.0.1.pom) = fd796c236b9b19facf828337e276d8933e1d08776dec96f8a370637b9706054eb8a9653b4c44fcecee5522ec2a24f9517a31a9858137adee5517b2824ebc1870 +SHA512 (asm-tree-8.0.1.pom) = 0116575ff309fee303ebe9c226c55993958aa0f84426aeb8fceb08c1f5a618f516114e556320e3d4a75e4b4fe575b05e9d774a988efb3609ebf92c0be0fd8b84 +SHA512 (asm-util-8.0.1.pom) = 66bde49a77c2ab636e0f6499b71a636a45d01cfd7d82da0d1c8377cee126b9194559f12de0ab4b10236553b761b24d8f645103ec051bd39dc1f6db50453ffd8f From ef1900a49f656b179477ea8e7ee67286a69a952d Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 03:30:00 +0200 Subject: [PATCH 066/121] Rebuilt for JDK-11 --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 107a395..7ea1550 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: objectweb-asm Version: 7.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -156,6 +156,9 @@ popd %license LICENSE.txt %changelog +* Sat Jul 11 2020 Jiri Vanek - 7.3.1-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Wed May 06 2020 Mat Booth - 7.3.1-2 - Revert an upstream change to prevent breaking API change From d2817ad3f5056ff4e4c874547e7623e127435cb7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:02:47 +0000 Subject: [PATCH 067/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 7ea1550..e25cb2f 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: objectweb-asm Version: 7.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -156,6 +156,9 @@ popd %license LICENSE.txt %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 7.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 7.3.1-3 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From c3f14c836b78b2332a82475a680244f5922036f0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 14 Aug 2020 21:45:55 -0600 Subject: [PATCH 068/121] Version 8.0.1. - Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test - Make generate-tarball.sh actually compress the tarball --- .gitignore | 6 ++++++ 0002-Catch-CompileException-in-test.patch | 12 ++++++++++++ generate-tarball.sh | 2 +- objectweb-asm.spec | 18 +++++++++++++----- sources | 14 +++++++------- 5 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 0002-Catch-CompileException-in-test.patch diff --git a/.gitignore b/.gitignore index 1c78938..1cfc788 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,9 @@ /asm-test-7.0.pom /asm-tree-7.0.pom /asm-util-7.0.pom +/asm-8.0.1.pom +/asm-analysis-8.0.1.pom +/asm-commons-8.0.1.pom +/asm-test-8.0.1.pom +/asm-tree-8.0.1.pom +/asm-util-8.0.1.pom diff --git a/0002-Catch-CompileException-in-test.patch b/0002-Catch-CompileException-in-test.patch new file mode 100644 index 0000000..76e2fe7 --- /dev/null +++ b/0002-Catch-CompileException-in-test.patch @@ -0,0 +1,12 @@ +--- a/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java ++++ b/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java +@@ -107,8 +107,8 @@ public class ASMifierTest extends AsmTes + } + + private static byte[] compile(final String name, final String source) throws IOException { +- Parser parser = new Parser(new Scanner(name, new StringReader(source))); + try { ++ Parser parser = new Parser(new Scanner(name, new StringReader(source))); + UnitCompiler unitCompiler = new UnitCompiler(parser.parseCompilationUnit(), ICLASS_LOADER); + return unitCompiler.compileUnit(true, true, true)[0].toByteArray(); + } catch (CompileException e) { diff --git a/generate-tarball.sh b/generate-tarball.sh index 255d107..fdeacca 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -23,6 +23,6 @@ find -name '*.jar' -delete find */asm{,-analysis,-commons} -name '*.class' -delete rm -r */gradle -tar cf "../${name}-${version}.tar.gz" * +tar cf "../${name}-${version}.tar.gz" -I 'gzip -9' * cd .. rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/objectweb-asm.spec b/objectweb-asm.spec index e25cb2f..08d2f9c 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %bcond_without osgi Name: objectweb-asm -Version: 7.3.1 -Release: 4%{?dist} +Version: 8.0.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -28,6 +28,11 @@ Source9: generate-tarball.sh # To restore some deprecations that were deleted and broke the API Patch0: 0001-Revert-upstream-change-2a58bc9.patch +# Move a statement that can throw a CompileException inside a try-catch block +# for that exception. Upstream has fixed this another way with a large code +# refactor that seems inappropriate to backport. +Patch1: 0002-Catch-CompileException-in-test.patch + BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) @@ -65,9 +70,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q - -%patch0 -p1 +%autosetup -p1 # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml @@ -156,6 +159,11 @@ popd %license LICENSE.txt %changelog +* Fri Aug 14 2020 Jerry James - 8.0.1-1 +- Version 8.0.1 +- Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test +- Make generate-tarball.sh actually compress the tarball + * Tue Jul 28 2020 Fedora Release Engineering - 7.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 9ac0229..d461c08 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-7.3.1.tar.gz) = 8b7523a7a56d1bf802c6bc476e8fbd23911952143c619cfce9b976e66aa6b5dbce5eda4567060c020ab098821942acd9c0539e00ba0c445548da9b67ff932cd4 -SHA512 (asm-7.3.1.pom) = bc1effc5b1e386fb352d4839b91e395997ae3053b165f93460d3b7f6ca1445e08a242287d30a7a9514161b0656f090dc7cd65e858a506d7b0ed750af7b316b42 -SHA512 (asm-analysis-7.3.1.pom) = 616bb5f12fe450d816c3b785b9942050bf9f5feadeafc123d28bf1a8d3dba64876a5f43024543ac91078f353f6a9429950635cca4ef0304e3d64b3d99014c65d -SHA512 (asm-commons-7.3.1.pom) = eb54866a53fade6e8c1f93507b6b3d8a234fe8a9ef8fa84dccc583612f1b1c8cb99e8ec3f547d20191b6dbc6627e53d5a0989a9ee87662af2c088cf20585e4c9 -SHA512 (asm-test-7.3.1.pom) = 17aabc1e94ff7320f2e5c8c3a47c107388ce456002f93737955bd448178d3a261cd5831e7c6b5b77bb7383b34793e9c879329dceff16b9ae63b686c17f38117e -SHA512 (asm-tree-7.3.1.pom) = 9fd3cb4898e0196cd912d8aaeceaed04a1e3b02701d4c3f761c8d899b1dbe09824d58b0dfda53ec6bebd109d10e6783a1ee3454bcd604a03dea0f871ff108523 -SHA512 (asm-util-7.3.1.pom) = 576462d670520bfb09159d69bd66cd152ba71c14c74670ad4ffe44e09146f935837056a3122a594a54792ab0e8dd873f72653c3d2853810e48ef2680453431ce +SHA512 (objectweb-asm-8.0.1.tar.gz) = 9ab01a55a2cc855bb2bd113a6923c62a0bdeb9311a5061508cf76e6bf1d96c37a9ff6d7af90c52eaf1cec102142c3dd7b6fa6fc0392ef2a96e687c639593f375 +SHA512 (asm-8.0.1.pom) = d2600348bd58f5f1a00a0dee7130088e7552be251c915922816952fc613377bd167762d3b986b67448ada28a84d8af668e8914ffcee4a446e0355e80bc7cbae8 +SHA512 (asm-analysis-8.0.1.pom) = 60b8806ad63a31a13f523f5b3410b2553292faebdc8fbc27c6d7d6237c17744a98ce5c7ac3a3defdbfe57400f914d66bfb4f3124b57c207fc6ebb4d559245550 +SHA512 (asm-commons-8.0.1.pom) = 1889eabf9f5758cf3b4a2cb8d1c6585d71be6fc9d3efbd53ef6f379ad422167398f9d1b393abdb8ffdc5420ab47f8d842fe112b8542a3d5245a80212c7219cb0 +SHA512 (asm-test-8.0.1.pom) = fd796c236b9b19facf828337e276d8933e1d08776dec96f8a370637b9706054eb8a9653b4c44fcecee5522ec2a24f9517a31a9858137adee5517b2824ebc1870 +SHA512 (asm-tree-8.0.1.pom) = 0116575ff309fee303ebe9c226c55993958aa0f84426aeb8fceb08c1f5a618f516114e556320e3d4a75e4b4fe575b05e9d774a988efb3609ebf92c0be0fd8b84 +SHA512 (asm-util-8.0.1.pom) = 66bde49a77c2ab636e0f6499b71a636a45d01cfd7d82da0d1c8377cee126b9194559f12de0ab4b10236553b761b24d8f645103ec051bd39dc1f6db50453ffd8f From aa30cccee326d6bb4de96b2f1b6c9f34a6a65434 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 25 Sep 2020 10:00:58 +0200 Subject: [PATCH 069/121] Update to upstream version 9.0 --- .gitignore | 7 +++++++ objectweb-asm.spec | 8 ++++---- sources | 14 +++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a333dc5..14bce22 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,10 @@ /asm-test-8.0.1.pom /asm-tree-8.0.1.pom /asm-util-8.0.1.pom +/objectweb-asm-9.0.tar.gz +/asm-9.0.pom +/asm-analysis-9.0.pom +/asm-commons-9.0.pom +/asm-test-9.0.pom +/asm-tree-9.0.pom +/asm-util-9.0.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 8177690..d493c4c 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,5 +1,5 @@ Name: objectweb-asm -Version: 8.0.1 +Version: 9.0 Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD @@ -69,9 +69,6 @@ sed -i -e '/testAllMethods_class/i@org.junit.jupiter.api.Disabled("missing class sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing class file")' \ asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java -# Remove invalid self-dependency -%pom_remove_dep org.ow2.asm:asm-test asm-test - # No need to ship the custom parent pom %mvn_package :asm-aggregator __noinstall # Don't ship the test framework to avoid runtime dep on junit @@ -99,6 +96,9 @@ sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing c %license LICENSE.txt %changelog +* Fri Sep 25 2020 Marian Koncek - 9.0-1 +- Update to upstream version 9.0 + * Mon Jun 22 2020 Marian Koncek - 8.0.1-1 - Update to upstream version 8.0.1 diff --git a/sources b/sources index 0bcdf55..39f6bd6 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-8.0.1.tar.gz) = 75f83c06dbb00276b3aa95285119b8c12d36eae171dfb2777bf76d5f0c8a6c768de6f45eec50dc462bbb9e783c362707c86ea0d8712266c3cd5dc7f7bc548f79 -SHA512 (asm-8.0.1.pom) = d2600348bd58f5f1a00a0dee7130088e7552be251c915922816952fc613377bd167762d3b986b67448ada28a84d8af668e8914ffcee4a446e0355e80bc7cbae8 -SHA512 (asm-analysis-8.0.1.pom) = 60b8806ad63a31a13f523f5b3410b2553292faebdc8fbc27c6d7d6237c17744a98ce5c7ac3a3defdbfe57400f914d66bfb4f3124b57c207fc6ebb4d559245550 -SHA512 (asm-commons-8.0.1.pom) = 1889eabf9f5758cf3b4a2cb8d1c6585d71be6fc9d3efbd53ef6f379ad422167398f9d1b393abdb8ffdc5420ab47f8d842fe112b8542a3d5245a80212c7219cb0 -SHA512 (asm-test-8.0.1.pom) = fd796c236b9b19facf828337e276d8933e1d08776dec96f8a370637b9706054eb8a9653b4c44fcecee5522ec2a24f9517a31a9858137adee5517b2824ebc1870 -SHA512 (asm-tree-8.0.1.pom) = 0116575ff309fee303ebe9c226c55993958aa0f84426aeb8fceb08c1f5a618f516114e556320e3d4a75e4b4fe575b05e9d774a988efb3609ebf92c0be0fd8b84 -SHA512 (asm-util-8.0.1.pom) = 66bde49a77c2ab636e0f6499b71a636a45d01cfd7d82da0d1c8377cee126b9194559f12de0ab4b10236553b761b24d8f645103ec051bd39dc1f6db50453ffd8f +SHA512 (objectweb-asm-9.0.tar.gz) = a3c65c0c12f64d032b16d3e872f9e52d6c20fe7caa3a367b2cd606fddbf4d4418ee68ac5775c8822ae18be0942ebb89792431670cad3456829217adac9febe48 +SHA512 (asm-9.0.pom) = 3d7d173d1f536560038934548440325b93b924d555a222043a51508fc23c5f7c5bea144db21b2b2d6eeb1d0ca5bf3d2147c2d9038cae5be3051690fc75d628c0 +SHA512 (asm-analysis-9.0.pom) = 685a7f451906603bbe527a9424988bd64a67b30954bfde201ade4294d0af6986d05ab6dee96b0a5160605a4e2fa6de9b623c2396bb973cca373ba8c1cda60cff +SHA512 (asm-commons-9.0.pom) = 73173c0032c29a9f9bb0664a38522e2e4bd01f61aed6c3e3ffe2a646a0812d0301df600aeecd216af34f1443ff1a53cb2164ba8f7368e1ed502726ec1f6d8291 +SHA512 (asm-test-9.0.pom) = 5a1f7c10b5c2ec0f5d10d09bc774ab7194c9e95379a12d0967c81e27c182f7430bd2bd5e4137ec3b8b6a6934375f25108639748fbba614d2c389b36e50e51d96 +SHA512 (asm-tree-9.0.pom) = 26e3100382b8cf6f4b6b0c2c9c90faf642e7c5ad69c71aece2e39c1a536be50720bb778742fa4351db99346550f9bfef30c30dedc3458b50681818f87a21d0bd +SHA512 (asm-util-9.0.pom) = ff1629361724d652ba79dc48327373abe13ae81ea07b75a6c70af87fdbbf3e9dbeedac824f88eeccb7dd3a190a42244fc35a95630fb2620e5dfad87f8fce850f From a77ae914c3b2e259b369ce19a85883b6d031a39d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:50:38 +0000 Subject: [PATCH 070/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 08d2f9c..be5f979 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -3,7 +3,7 @@ Name: objectweb-asm Version: 8.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -159,6 +159,9 @@ popd %license LICENSE.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 8.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Aug 14 2020 Jerry James - 8.0.1-1 - Version 8.0.1 - Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test From c3de89d06f36a64d7275c354a07759d2dae558a2 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 19 Feb 2021 15:59:24 +0000 Subject: [PATCH 071/121] Update to latest upstream release --- .gitignore | 32 +- ... 0001-Catch-CompileException-in-test.patch | 16 +- 0001-Revert-upstream-change-2a58bc9.patch | 813 ------------------ asm-all.pom | 2 +- objectweb-asm.spec | 32 +- sources | 14 +- 6 files changed, 46 insertions(+), 863 deletions(-) rename 0002-Catch-CompileException-in-test.patch => 0001-Catch-CompileException-in-test.patch (52%) delete mode 100644 0001-Revert-upstream-change-2a58bc9.patch diff --git a/.gitignore b/.gitignore index 1cfc788..5191f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,31 +3,11 @@ /.build-*.log /*.src.rpm /noarch -/asm-6.2.pom -/asm-analysis-6.2.pom -/asm-commons-6.2.pom -/asm-test-6.2.pom -/asm-tree-6.2.pom -/asm-util-6.2.pom -/asm-xml-6.2.pom -/asm-6.2.1.pom -/asm-analysis-6.2.1.pom -/asm-commons-6.2.1.pom -/asm-test-6.2.1.pom -/asm-tree-6.2.1.pom -/asm-util-6.2.1.pom -/asm-xml-6.2.1.pom /objectweb-asm-*.tar.gz /objectweb-asm-*/ -/asm-7.0.pom -/asm-analysis-7.0.pom -/asm-commons-7.0.pom -/asm-test-7.0.pom -/asm-tree-7.0.pom -/asm-util-7.0.pom -/asm-8.0.1.pom -/asm-analysis-8.0.1.pom -/asm-commons-8.0.1.pom -/asm-test-8.0.1.pom -/asm-tree-8.0.1.pom -/asm-util-8.0.1.pom +/asm-9.1.pom +/asm-analysis-9.1.pom +/asm-commons-9.1.pom +/asm-test-9.1.pom +/asm-tree-9.1.pom +/asm-util-9.1.pom diff --git a/0002-Catch-CompileException-in-test.patch b/0001-Catch-CompileException-in-test.patch similarity index 52% rename from 0002-Catch-CompileException-in-test.patch rename to 0001-Catch-CompileException-in-test.patch index 76e2fe7..26bb45d 100644 --- a/0002-Catch-CompileException-in-test.patch +++ b/0001-Catch-CompileException-in-test.patch @@ -1,6 +1,17 @@ +From feff2c9f3e5bc3a9900ac0ce7dfb9e9c2ce3e505 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 19 Feb 2021 15:36:30 +0000 +Subject: [PATCH] Catch CompileException in test + +--- + asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java b/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java +index b097b58..adfde2c 100644 --- a/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java +++ b/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java -@@ -107,8 +107,8 @@ public class ASMifierTest extends AsmTes +@@ -107,8 +107,8 @@ public class ASMifierTest extends AsmTest { } private static byte[] compile(final String name, final String source) throws IOException { @@ -10,3 +21,6 @@ UnitCompiler unitCompiler = new UnitCompiler(parser.parseCompilationUnit(), ICLASS_LOADER); return unitCompiler.compileUnit(true, true, true)[0].toByteArray(); } catch (CompileException e) { +-- +2.28.0 + diff --git a/0001-Revert-upstream-change-2a58bc9.patch b/0001-Revert-upstream-change-2a58bc9.patch deleted file mode 100644 index 907acb5..0000000 --- a/0001-Revert-upstream-change-2a58bc9.patch +++ /dev/null @@ -1,813 +0,0 @@ -From df50f201a0f253bc55dc89e191ac66cb920a3274 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Wed, 6 May 2020 15:09:27 +0100 -Subject: [PATCH] Revert upstream change 2a58bc9 - ---- - .../commons/RemappingAnnotationAdapter.java | 85 ++++++ - .../asm/commons/RemappingClassAdapter.java | 167 +++++++++++ - .../asm/commons/RemappingFieldAdapter.java | 74 +++++ - .../asm/commons/RemappingMethodAdapter.java | 279 ++++++++++++++++++ - .../commons/RemappingSignatureAdapter.java | 157 ++++++++++ - 5 files changed, 762 insertions(+) - create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java - create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java - create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java - create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java - create mode 100644 asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java - -diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java -new file mode 100644 -index 0000000..86c6ee9 ---- /dev/null -+++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingAnnotationAdapter.java -@@ -0,0 +1,85 @@ -+// ASM: a very small and fast Java bytecode manipulation framework -+// Copyright (c) 2000-2011 INRIA, France Telecom -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions -+// are met: -+// 1. Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// 2. Redistributions in binary form must reproduce the above copyright -+// notice, this list of conditions and the following disclaimer in the -+// documentation and/or other materials provided with the distribution. -+// 3. Neither the name of the copyright holders nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -+// THE POSSIBILITY OF SUCH DAMAGE. -+ -+package org.objectweb.asm.commons; -+ -+import org.objectweb.asm.AnnotationVisitor; -+import org.objectweb.asm.Opcodes; -+ -+/** -+ * An {@link AnnotationVisitor} adapter for type remapping. -+ * -+ * @deprecated use {@link AnnotationRemapper} instead. -+ * @author Eugene Kuleshov -+ */ -+@Deprecated -+public class RemappingAnnotationAdapter extends AnnotationVisitor { -+ -+ protected final Remapper remapper; -+ -+ public RemappingAnnotationAdapter( -+ final AnnotationVisitor annotationVisitor, final Remapper remapper) { -+ this(Opcodes.ASM6, annotationVisitor, remapper); -+ } -+ -+ protected RemappingAnnotationAdapter( -+ final int api, final AnnotationVisitor annotationVisitor, final Remapper remapper) { -+ super(api, annotationVisitor); -+ this.remapper = remapper; -+ } -+ -+ @Override -+ public void visit(final String name, final Object value) { -+ av.visit(name, remapper.mapValue(value)); -+ } -+ -+ @Override -+ public void visitEnum(final String name, final String descriptor, final String value) { -+ av.visitEnum(name, remapper.mapDesc(descriptor), value); -+ } -+ -+ @Override -+ public AnnotationVisitor visitAnnotation(final String name, final String descriptor) { -+ AnnotationVisitor annotationVisitor = av.visitAnnotation(name, remapper.mapDesc(descriptor)); -+ return annotationVisitor == null -+ ? null -+ : (annotationVisitor == av -+ ? this -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper)); -+ } -+ -+ @Override -+ public AnnotationVisitor visitArray(final String name) { -+ AnnotationVisitor annotationVisitor = av.visitArray(name); -+ return annotationVisitor == null -+ ? null -+ : (annotationVisitor == av -+ ? this -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper)); -+ } -+} -diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java -new file mode 100644 -index 0000000..b4cc08c ---- /dev/null -+++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingClassAdapter.java -@@ -0,0 +1,167 @@ -+// ASM: a very small and fast Java bytecode manipulation framework -+// Copyright (c) 2000-2011 INRIA, France Telecom -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions -+// are met: -+// 1. Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// 2. Redistributions in binary form must reproduce the above copyright -+// notice, this list of conditions and the following disclaimer in the -+// documentation and/or other materials provided with the distribution. -+// 3. Neither the name of the copyright holders nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -+// THE POSSIBILITY OF SUCH DAMAGE. -+ -+package org.objectweb.asm.commons; -+ -+import org.objectweb.asm.AnnotationVisitor; -+import org.objectweb.asm.ClassVisitor; -+import org.objectweb.asm.FieldVisitor; -+import org.objectweb.asm.MethodVisitor; -+import org.objectweb.asm.ModuleVisitor; -+import org.objectweb.asm.Opcodes; -+import org.objectweb.asm.TypePath; -+ -+/** -+ * A {@link ClassVisitor} for type remapping. -+ * -+ * @deprecated use {@link ClassRemapper} instead. -+ * @author Eugene Kuleshov -+ */ -+@Deprecated -+public class RemappingClassAdapter extends ClassVisitor { -+ -+ protected final Remapper remapper; -+ -+ protected String className; -+ -+ public RemappingClassAdapter(final ClassVisitor classVisitor, final Remapper remapper) { -+ this(Opcodes.ASM6, classVisitor, remapper); -+ } -+ -+ protected RemappingClassAdapter( -+ final int api, final ClassVisitor classVisitor, final Remapper remapper) { -+ super(api, classVisitor); -+ this.remapper = remapper; -+ } -+ -+ @Override -+ public void visit( -+ final int version, -+ final int access, -+ final String name, -+ final String signature, -+ final String superName, -+ final String[] interfaces) { -+ this.className = name; -+ super.visit( -+ version, -+ access, -+ remapper.mapType(name), -+ remapper.mapSignature(signature, false), -+ remapper.mapType(superName), -+ interfaces == null ? null : remapper.mapTypes(interfaces)); -+ } -+ -+ @Override -+ public ModuleVisitor visitModule(final String name, final int flags, final String version) { -+ throw new RuntimeException("RemappingClassAdapter is deprecated, use ClassRemapper instead"); -+ } -+ -+ @Override -+ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitAnnotation(remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor); -+ } -+ -+ @Override -+ public AnnotationVisitor visitTypeAnnotation( -+ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null ? null : createRemappingAnnotationAdapter(annotationVisitor); -+ } -+ -+ @Override -+ public FieldVisitor visitField( -+ final int access, -+ final String name, -+ final String descriptor, -+ final String signature, -+ final Object value) { -+ FieldVisitor fieldVisitor = -+ super.visitField( -+ access, -+ remapper.mapFieldName(className, name, descriptor), -+ remapper.mapDesc(descriptor), -+ remapper.mapSignature(signature, true), -+ remapper.mapValue(value)); -+ return fieldVisitor == null ? null : createRemappingFieldAdapter(fieldVisitor); -+ } -+ -+ @Override -+ public MethodVisitor visitMethod( -+ final int access, -+ final String name, -+ final String descriptor, -+ final String signature, -+ final String[] exceptions) { -+ String newDescriptor = remapper.mapMethodDesc(descriptor); -+ MethodVisitor methodVisitor = -+ super.visitMethod( -+ access, -+ remapper.mapMethodName(className, name, descriptor), -+ newDescriptor, -+ remapper.mapSignature(signature, false), -+ exceptions == null ? null : remapper.mapTypes(exceptions)); -+ return methodVisitor == null -+ ? null -+ : createRemappingMethodAdapter(access, newDescriptor, methodVisitor); -+ } -+ -+ @Override -+ public void visitInnerClass( -+ final String name, final String outerName, final String innerName, final int access) { -+ super.visitInnerClass( -+ remapper.mapType(name), -+ outerName == null ? null : remapper.mapType(outerName), -+ innerName, -+ access); -+ } -+ -+ @Override -+ public void visitOuterClass(final String owner, final String name, final String descriptor) { -+ super.visitOuterClass( -+ remapper.mapType(owner), -+ name == null ? null : remapper.mapMethodName(owner, name, descriptor), -+ descriptor == null ? null : remapper.mapMethodDesc(descriptor)); -+ } -+ -+ protected FieldVisitor createRemappingFieldAdapter(final FieldVisitor fieldVisitor) { -+ return new RemappingFieldAdapter(fieldVisitor, remapper); -+ } -+ -+ protected MethodVisitor createRemappingMethodAdapter( -+ final int access, final String newDescriptor, final MethodVisitor methodVisitior) { -+ return new RemappingMethodAdapter(access, newDescriptor, methodVisitior, remapper); -+ } -+ -+ protected AnnotationVisitor createRemappingAnnotationAdapter(final AnnotationVisitor av) { -+ return new RemappingAnnotationAdapter(av, remapper); -+ } -+} -diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java -new file mode 100644 -index 0000000..5f14f33 ---- /dev/null -+++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingFieldAdapter.java -@@ -0,0 +1,74 @@ -+// ASM: a very small and fast Java bytecode manipulation framework -+// Copyright (c) 2000-2011 INRIA, France Telecom -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions -+// are met: -+// 1. Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// 2. Redistributions in binary form must reproduce the above copyright -+// notice, this list of conditions and the following disclaimer in the -+// documentation and/or other materials provided with the distribution. -+// 3. Neither the name of the copyright holders nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -+// THE POSSIBILITY OF SUCH DAMAGE. -+ -+package org.objectweb.asm.commons; -+ -+import org.objectweb.asm.AnnotationVisitor; -+import org.objectweb.asm.FieldVisitor; -+import org.objectweb.asm.Opcodes; -+import org.objectweb.asm.TypePath; -+ -+/** -+ * A {@link FieldVisitor} adapter for type remapping. -+ * -+ * @deprecated use {@link FieldRemapper} instead. -+ * @author Eugene Kuleshov -+ */ -+@Deprecated -+public class RemappingFieldAdapter extends FieldVisitor { -+ -+ private final Remapper remapper; -+ -+ public RemappingFieldAdapter(final FieldVisitor fieldVisitor, final Remapper remapper) { -+ this(Opcodes.ASM6, fieldVisitor, remapper); -+ } -+ -+ protected RemappingFieldAdapter( -+ final int api, final FieldVisitor fieldVisitor, final Remapper remapper) { -+ super(api, fieldVisitor); -+ this.remapper = remapper; -+ } -+ -+ @Override -+ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = fv.visitAnnotation(remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? null -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+ -+ @Override -+ public AnnotationVisitor visitTypeAnnotation( -+ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? null -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+} -diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java -new file mode 100644 -index 0000000..cf21f18 ---- /dev/null -+++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingMethodAdapter.java -@@ -0,0 +1,279 @@ -+// ASM: a very small and fast Java bytecode manipulation framework -+// Copyright (c) 2000-2011 INRIA, France Telecom -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions -+// are met: -+// 1. Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// 2. Redistributions in binary form must reproduce the above copyright -+// notice, this list of conditions and the following disclaimer in the -+// documentation and/or other materials provided with the distribution. -+// 3. Neither the name of the copyright holders nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -+// THE POSSIBILITY OF SUCH DAMAGE. -+ -+package org.objectweb.asm.commons; -+ -+import org.objectweb.asm.AnnotationVisitor; -+import org.objectweb.asm.Handle; -+import org.objectweb.asm.Label; -+import org.objectweb.asm.MethodVisitor; -+import org.objectweb.asm.Opcodes; -+import org.objectweb.asm.TypePath; -+ -+/** -+ * A {@link LocalVariablesSorter} for type mapping. -+ * -+ * @deprecated use {@link MethodRemapper} instead. -+ * @author Eugene Kuleshov -+ */ -+@Deprecated -+public class RemappingMethodAdapter extends LocalVariablesSorter { -+ -+ protected final Remapper remapper; -+ -+ public RemappingMethodAdapter( -+ final int access, -+ final String descriptor, -+ final MethodVisitor methodVisitor, -+ final Remapper remapper) { -+ this(Opcodes.ASM6, access, descriptor, methodVisitor, remapper); -+ } -+ -+ protected RemappingMethodAdapter( -+ final int api, -+ final int access, -+ final String descriptor, -+ final MethodVisitor methodVisitor, -+ final Remapper remapper) { -+ super(api, access, descriptor, methodVisitor); -+ this.remapper = remapper; -+ } -+ -+ @Override -+ public AnnotationVisitor visitAnnotationDefault() { -+ AnnotationVisitor annotationVisitor = super.visitAnnotationDefault(); -+ return annotationVisitor == null -+ ? annotationVisitor -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+ -+ @Override -+ public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitAnnotation(remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? annotationVisitor -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+ -+ @Override -+ public AnnotationVisitor visitTypeAnnotation( -+ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitTypeAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? annotationVisitor -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+ -+ @Override -+ public AnnotationVisitor visitParameterAnnotation( -+ final int parameter, final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitParameterAnnotation(parameter, remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? annotationVisitor -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+ -+ @Override -+ public void visitFrame( -+ final int type, -+ final int numLocal, -+ final Object[] local, -+ final int numStack, -+ final Object[] stack) { -+ super.visitFrame( -+ type, numLocal, remapEntries(numLocal, local), numStack, remapEntries(numStack, stack)); -+ } -+ -+ private Object[] remapEntries(final int numTypes, final Object[] entries) { -+ if (entries == null) { -+ return entries; -+ } -+ Object[] remappedEntries = null; -+ for (int i = 0; i < numTypes; ++i) { -+ if (entries[i] instanceof String) { -+ if (remappedEntries == null) { -+ remappedEntries = new Object[numTypes]; -+ System.arraycopy(entries, 0, remappedEntries, 0, numTypes); -+ } -+ remappedEntries[i] = remapper.mapType((String) entries[i]); -+ } -+ } -+ return remappedEntries == null ? entries : remappedEntries; -+ } -+ -+ @Override -+ public void visitFieldInsn( -+ final int opcode, final String owner, final String name, final String descriptor) { -+ super.visitFieldInsn( -+ opcode, -+ remapper.mapType(owner), -+ remapper.mapFieldName(owner, name, descriptor), -+ remapper.mapDesc(descriptor)); -+ } -+ -+ @Deprecated -+ @Override -+ public void visitMethodInsn( -+ final int opcode, final String owner, final String name, final String descriptor) { -+ if (api >= Opcodes.ASM5) { -+ super.visitMethodInsn(opcode, owner, name, descriptor); -+ return; -+ } -+ doVisitMethodInsn(opcode, owner, name, descriptor, opcode == Opcodes.INVOKEINTERFACE); -+ } -+ -+ @Override -+ public void visitMethodInsn( -+ final int opcode, -+ final String owner, -+ final String name, -+ final String descriptor, -+ final boolean isInterface) { -+ if (api < Opcodes.ASM5) { -+ super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); -+ return; -+ } -+ doVisitMethodInsn(opcode, owner, name, descriptor, isInterface); -+ } -+ -+ private void doVisitMethodInsn( -+ final int opcode, -+ final String owner, -+ final String name, -+ final String descriptor, -+ final boolean isInterface) { -+ // Calling super.visitMethodInsn requires to call the correct version -+ // depending on this.api (otherwise infinite loops can occur). To -+ // simplify and to make it easier to automatically remove the backward -+ // compatibility code, we inline the code of the overridden method here. -+ // IMPORTANT: THIS ASSUMES THAT visitMethodInsn IS NOT OVERRIDDEN IN -+ // LocalVariableSorter. -+ if (mv != null) { -+ mv.visitMethodInsn( -+ opcode, -+ remapper.mapType(owner), -+ remapper.mapMethodName(owner, name, descriptor), -+ remapper.mapMethodDesc(descriptor), -+ isInterface); -+ } -+ } -+ -+ @Override -+ public void visitInvokeDynamicInsn( -+ final String name, -+ final String descriptor, -+ final Handle bootstrapMethodHandle, -+ final Object... bootstrapMethodArguments) { -+ for (int i = 0; i < bootstrapMethodArguments.length; i++) { -+ bootstrapMethodArguments[i] = remapper.mapValue(bootstrapMethodArguments[i]); -+ } -+ super.visitInvokeDynamicInsn( -+ remapper.mapInvokeDynamicMethodName(name, descriptor), -+ remapper.mapMethodDesc(descriptor), -+ (Handle) remapper.mapValue(bootstrapMethodHandle), -+ bootstrapMethodArguments); -+ } -+ -+ @Override -+ public void visitTypeInsn(final int opcode, final String type) { -+ super.visitTypeInsn(opcode, remapper.mapType(type)); -+ } -+ -+ @Override -+ public void visitLdcInsn(final Object value) { -+ super.visitLdcInsn(remapper.mapValue(value)); -+ } -+ -+ @Override -+ public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) { -+ super.visitMultiANewArrayInsn(remapper.mapDesc(descriptor), numDimensions); -+ } -+ -+ @Override -+ public AnnotationVisitor visitInsnAnnotation( -+ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitInsnAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? annotationVisitor -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+ -+ @Override -+ public void visitTryCatchBlock( -+ final Label start, final Label end, final Label handler, final String type) { -+ super.visitTryCatchBlock(start, end, handler, type == null ? null : remapper.mapType(type)); -+ } -+ -+ @Override -+ public AnnotationVisitor visitTryCatchAnnotation( -+ final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitTryCatchAnnotation(typeRef, typePath, remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? annotationVisitor -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+ -+ @Override -+ public void visitLocalVariable( -+ final String name, -+ final String descriptor, -+ final String signature, -+ final Label start, -+ final Label end, -+ final int index) { -+ super.visitLocalVariable( -+ name, -+ remapper.mapDesc(descriptor), -+ remapper.mapSignature(signature, true), -+ start, -+ end, -+ index); -+ } -+ -+ @Override -+ public AnnotationVisitor visitLocalVariableAnnotation( -+ final int typeRef, -+ final TypePath typePath, -+ final Label[] start, -+ final Label[] end, -+ final int[] index, -+ final String descriptor, -+ final boolean visible) { -+ AnnotationVisitor annotationVisitor = -+ super.visitLocalVariableAnnotation( -+ typeRef, typePath, start, end, index, remapper.mapDesc(descriptor), visible); -+ return annotationVisitor == null -+ ? annotationVisitor -+ : new RemappingAnnotationAdapter(annotationVisitor, remapper); -+ } -+} -diff --git a/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java -new file mode 100644 -index 0000000..1553cd5 ---- /dev/null -+++ b/asm-commons/src/main/java/org/objectweb/asm/commons/RemappingSignatureAdapter.java -@@ -0,0 +1,157 @@ -+// ASM: a very small and fast Java bytecode manipulation framework -+// Copyright (c) 2000-2011 INRIA, France Telecom -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions -+// are met: -+// 1. Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// 2. Redistributions in binary form must reproduce the above copyright -+// notice, this list of conditions and the following disclaimer in the -+// documentation and/or other materials provided with the distribution. -+// 3. Neither the name of the copyright holders nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -+// THE POSSIBILITY OF SUCH DAMAGE. -+ -+package org.objectweb.asm.commons; -+ -+import org.objectweb.asm.Opcodes; -+import org.objectweb.asm.signature.SignatureVisitor; -+ -+/** -+ * A {@link SignatureVisitor} adapter for type mapping. -+ * -+ * @deprecated use {@link SignatureRemapper} instead. -+ * @author Eugene Kuleshov -+ */ -+@Deprecated -+public class RemappingSignatureAdapter extends SignatureVisitor { -+ -+ private final SignatureVisitor signatureVisitor; -+ -+ private final Remapper remapper; -+ -+ private String className; -+ -+ public RemappingSignatureAdapter( -+ final SignatureVisitor signatureVisitor, final Remapper remapper) { -+ this(Opcodes.ASM6, signatureVisitor, remapper); -+ } -+ -+ protected RemappingSignatureAdapter( -+ final int api, final SignatureVisitor signatureVisitor, final Remapper remapper) { -+ super(api); -+ this.signatureVisitor = signatureVisitor; -+ this.remapper = remapper; -+ } -+ -+ @Override -+ public void visitClassType(final String name) { -+ className = name; -+ signatureVisitor.visitClassType(remapper.mapType(name)); -+ } -+ -+ @Override -+ public void visitInnerClassType(final String name) { -+ String remappedOuter = remapper.mapType(className) + '$'; -+ className = className + '$' + name; -+ String remappedName = remapper.mapType(className); -+ int index = -+ remappedName.startsWith(remappedOuter) -+ ? remappedOuter.length() -+ : remappedName.lastIndexOf('$') + 1; -+ signatureVisitor.visitInnerClassType(remappedName.substring(index)); -+ } -+ -+ @Override -+ public void visitFormalTypeParameter(final String name) { -+ signatureVisitor.visitFormalTypeParameter(name); -+ } -+ -+ @Override -+ public void visitTypeVariable(final String name) { -+ signatureVisitor.visitTypeVariable(name); -+ } -+ -+ @Override -+ public SignatureVisitor visitArrayType() { -+ signatureVisitor.visitArrayType(); -+ return this; -+ } -+ -+ @Override -+ public void visitBaseType(final char descriptor) { -+ signatureVisitor.visitBaseType(descriptor); -+ } -+ -+ @Override -+ public SignatureVisitor visitClassBound() { -+ signatureVisitor.visitClassBound(); -+ return this; -+ } -+ -+ @Override -+ public SignatureVisitor visitExceptionType() { -+ signatureVisitor.visitExceptionType(); -+ return this; -+ } -+ -+ @Override -+ public SignatureVisitor visitInterface() { -+ signatureVisitor.visitInterface(); -+ return this; -+ } -+ -+ @Override -+ public SignatureVisitor visitInterfaceBound() { -+ signatureVisitor.visitInterfaceBound(); -+ return this; -+ } -+ -+ @Override -+ public SignatureVisitor visitParameterType() { -+ signatureVisitor.visitParameterType(); -+ return this; -+ } -+ -+ @Override -+ public SignatureVisitor visitReturnType() { -+ signatureVisitor.visitReturnType(); -+ return this; -+ } -+ -+ @Override -+ public SignatureVisitor visitSuperclass() { -+ signatureVisitor.visitSuperclass(); -+ return this; -+ } -+ -+ @Override -+ public void visitTypeArgument() { -+ signatureVisitor.visitTypeArgument(); -+ } -+ -+ @Override -+ public SignatureVisitor visitTypeArgument(final char wildcard) { -+ signatureVisitor.visitTypeArgument(wildcard); -+ return this; -+ } -+ -+ @Override -+ public void visitEnd() { -+ signatureVisitor.visitEnd(); -+ } -+} --- -2.26.0 - diff --git a/asm-all.pom b/asm-all.pom index 230058b..3f03cc5 100644 --- a/asm-all.pom +++ b/asm-all.pom @@ -33,7 +33,7 @@ org.ow2.asm - asm-tree + asm-util @VERSION@ diff --git a/objectweb-asm.spec b/objectweb-asm.spec index be5f979..358d47d 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,8 +2,8 @@ %bcond_without osgi Name: objectweb-asm -Version: 8.0.1 -Release: 2%{?dist} +Version: 9.1 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: http://asm.ow2.org/ @@ -24,20 +24,17 @@ Source8: asm-all.pom # The source contains binary jars that cannot be verified for licensing and could be proprietary Source9: generate-tarball.sh -# Revert upstream change https://gitlab.ow2.org/asm/asm/-/commit/2a58bc9bcf2ea6eee03e973d1df4cf9312573c9d -# To restore some deprecations that were deleted and broke the API -Patch0: 0001-Revert-upstream-change-2a58bc9.patch - # Move a statement that can throw a CompileException inside a try-catch block # for that exception. Upstream has fixed this another way with a large code # refactor that seems inappropriate to backport. -Patch1: 0002-Catch-CompileException-in-test.patch +Patch1: 0001-Catch-CompileException-in-test.patch BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.ow2:ow2:pom:) %if %{with junit5} +BuildRequires: mvn(org.codehaus.janino:commons-compiler) BuildRequires: mvn(org.codehaus.janino:janino) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) @@ -82,11 +79,6 @@ cp -p %{SOURCE1} pom.xml # Insert poms into modules for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml - # Fix junit5 configuration -%if %{with junit5} - %pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom - %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.22.0 $pom -%endif %if %{with osgi} if [ "$pom" != "asm-test" ] ; then # Make into OSGi bundles @@ -106,6 +98,16 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do fi %endif done +# Fix junit5 configuration +%if %{with junit5} +%pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.7.0:test asm asm-analysis asm-commons asm-tree asm-util +%pom_add_dep org.junit.jupiter:junit-jupiter-params:5.7.0:test asm asm-analysis asm-commons asm-tree asm-util +%pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.22.0 asm asm-analysis asm-commons asm-test asm-tree asm-util +%pom_add_dep org.ow2.asm:asm-test:%{version}:test asm asm-analysis asm-commons asm-tree asm-util +%pom_add_dep org.ow2.asm:asm-util:%{version}:test asm-commons +%pom_add_dep org.codehaus.janino:janino:2.7.8:test asm-util +%pom_add_dep org.codehaus.janino:commons-compiler:2.7.8:test asm-util +%endif # Disable tests that use unlicensed class files sed -i -e '/testToByteArray_computeMaxs_largeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \ @@ -122,9 +124,6 @@ rm asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest mkdir -p asm-all sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml -# Remove invalid self-dependency -%pom_remove_dep org.ow2.asm:asm-test asm-test - # Compat aliases %mvn_alias :asm-all org.ow2.asm:asm-debug-all @@ -159,6 +158,9 @@ popd %license LICENSE.txt %changelog +* Fri Feb 19 2021 Mat Booth - 9.1-1 +- Update to latest upstream release + * Tue Jan 26 2021 Fedora Release Engineering - 8.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d461c08..501c2c8 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-8.0.1.tar.gz) = 9ab01a55a2cc855bb2bd113a6923c62a0bdeb9311a5061508cf76e6bf1d96c37a9ff6d7af90c52eaf1cec102142c3dd7b6fa6fc0392ef2a96e687c639593f375 -SHA512 (asm-8.0.1.pom) = d2600348bd58f5f1a00a0dee7130088e7552be251c915922816952fc613377bd167762d3b986b67448ada28a84d8af668e8914ffcee4a446e0355e80bc7cbae8 -SHA512 (asm-analysis-8.0.1.pom) = 60b8806ad63a31a13f523f5b3410b2553292faebdc8fbc27c6d7d6237c17744a98ce5c7ac3a3defdbfe57400f914d66bfb4f3124b57c207fc6ebb4d559245550 -SHA512 (asm-commons-8.0.1.pom) = 1889eabf9f5758cf3b4a2cb8d1c6585d71be6fc9d3efbd53ef6f379ad422167398f9d1b393abdb8ffdc5420ab47f8d842fe112b8542a3d5245a80212c7219cb0 -SHA512 (asm-test-8.0.1.pom) = fd796c236b9b19facf828337e276d8933e1d08776dec96f8a370637b9706054eb8a9653b4c44fcecee5522ec2a24f9517a31a9858137adee5517b2824ebc1870 -SHA512 (asm-tree-8.0.1.pom) = 0116575ff309fee303ebe9c226c55993958aa0f84426aeb8fceb08c1f5a618f516114e556320e3d4a75e4b4fe575b05e9d774a988efb3609ebf92c0be0fd8b84 -SHA512 (asm-util-8.0.1.pom) = 66bde49a77c2ab636e0f6499b71a636a45d01cfd7d82da0d1c8377cee126b9194559f12de0ab4b10236553b761b24d8f645103ec051bd39dc1f6db50453ffd8f +SHA512 (objectweb-asm-9.1.tar.gz) = c5cff60acc0fc31842e397abff376e9061c5431fbfba8c0a24fd54ac654bb78382fdb30142b76cf87e87c43f89167ea36a2fd2320583de2b26a19e8abdde4772 +SHA512 (asm-9.1.pom) = 9bdc46e2ee6721d9228b2ae9518a118b38f9cb35cfbf2a0a885f439b6cd8705cd62d6502fb1d6bb83523a1fc0b5d18832a0e231dc9ed4e0ca7fbd83bbf595061 +SHA512 (asm-analysis-9.1.pom) = f94b222e6ea2c964bde42785e43d82dc8ac4d07ad1b8748c6ee0e66ca70a5e3ee2dce0338ada8928b93929436bfc3227d5e2f73573caad67dd57e1bd612c9eec +SHA512 (asm-commons-9.1.pom) = ea17ae1dc7f732cb87d0bab9d68035b088577ed32b6fca3c70386f56feebbdd467dabe997e27134f8ad7c2133187af763b9c3aad696cce2ba36cf68f3f09b760 +SHA512 (asm-test-9.1.pom) = 1d3c7f7310d9a98136578653b2ace151286683c50c9d377ae27694322ae681913e2ae318ee614c2ef815b0e7a1eb3a31cb37451f366cd6cc0575d4e137fc61cf +SHA512 (asm-tree-9.1.pom) = d6239bff2d055de63ec2e3c97bee0f07d1fe07113d662f7b75783ebbbf5a1c4435f9a265c27a81ab4bd15d990470ddc9949f1cf3fd9e2c0bedec9fbf65134eac +SHA512 (asm-util-9.1.pom) = da73aecae4d8c8fb0c1a216c66f38a445cea7b24f3e8898b142f4f1d16d42e34265d49495d721438df4231f33422d4c649d358db6d1123b2e1efefc51381df29 From 985b4838d0d18570c9c6764d305a24fc10a7711e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 072/121] Conditionalize buildrequires in bootstrap mode --- objectweb-asm.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index d493c4c..51111ca 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: objectweb-asm Version: 9.0 Release: 1%{?dist} @@ -19,6 +21,9 @@ Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/a Source9: generate-tarball.sh BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%endif # Explicit javapackages-tools requires since asm-processor script uses # /usr/share/java-utils/java-functions From bab9f2cb3edbbbc94eef2a2079a1c08d618cfe3a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 073/121] Turn off bootstrap mode by default --- objectweb-asm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 51111ca..dd84b72 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: objectweb-asm Version: 9.0 From 24680252e9f2c7fdb9b001e9c86c1feb9323f98f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 14 May 2021 17:21:12 +0200 Subject: [PATCH 074/121] Update to upstream version 9.1 --- .gitignore | 7 +++++++ generate-tarball.sh | 6 +++--- objectweb-asm.spec | 5 ++++- sources | 14 +++++++------- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 14bce22..cc479c9 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,10 @@ /asm-test-9.0.pom /asm-tree-9.0.pom /asm-util-9.0.pom +/objectweb-asm-9.1.tar.gz +/asm-9.1.pom +/asm-analysis-9.1.pom +/asm-commons-9.1.pom +/asm-test-9.1.pom +/asm-tree-9.1.pom +/asm-util-9.1.pom diff --git a/generate-tarball.sh b/generate-tarball.sh index e6e5c9d..b5a3d3a 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -6,15 +6,15 @@ version="$(sed -n 's/Version:\s*//p' *.spec)" gittag="ASM_${version//./_}" # RETRIEVE -wget "https://gitlab.ow2.org/asm/asm/repository/${gittag}/archive.tar.gz#/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" +wget "https://gitlab.ow2.org/asm/asm/-/archive/${gittag}/asm-${gittag}.tar.gz" -O "${name}-${version}.orig.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp pushd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +tar -xzf "../${name}-${version}.orig.tar.gz" # Rename dir not to contain commit -mv asm-${gittag}-* ${name}-${version} +mv asm-${gittag} ${name}-${version} # CLEAN TARBALL # Remove all jar files diff --git a/objectweb-asm.spec b/objectweb-asm.spec index dd84b72..11c0aac 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.0 +Version: 9.1 Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD @@ -101,6 +101,9 @@ sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing c %license LICENSE.txt %changelog +* Fri May 14 2021 Marian Koncek - 9.1-1 +- Update to upstream version 9.1 + * Fri Sep 25 2020 Marian Koncek - 9.0-1 - Update to upstream version 9.0 diff --git a/sources b/sources index 39f6bd6..49f9fb5 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.0.tar.gz) = a3c65c0c12f64d032b16d3e872f9e52d6c20fe7caa3a367b2cd606fddbf4d4418ee68ac5775c8822ae18be0942ebb89792431670cad3456829217adac9febe48 -SHA512 (asm-9.0.pom) = 3d7d173d1f536560038934548440325b93b924d555a222043a51508fc23c5f7c5bea144db21b2b2d6eeb1d0ca5bf3d2147c2d9038cae5be3051690fc75d628c0 -SHA512 (asm-analysis-9.0.pom) = 685a7f451906603bbe527a9424988bd64a67b30954bfde201ade4294d0af6986d05ab6dee96b0a5160605a4e2fa6de9b623c2396bb973cca373ba8c1cda60cff -SHA512 (asm-commons-9.0.pom) = 73173c0032c29a9f9bb0664a38522e2e4bd01f61aed6c3e3ffe2a646a0812d0301df600aeecd216af34f1443ff1a53cb2164ba8f7368e1ed502726ec1f6d8291 -SHA512 (asm-test-9.0.pom) = 5a1f7c10b5c2ec0f5d10d09bc774ab7194c9e95379a12d0967c81e27c182f7430bd2bd5e4137ec3b8b6a6934375f25108639748fbba614d2c389b36e50e51d96 -SHA512 (asm-tree-9.0.pom) = 26e3100382b8cf6f4b6b0c2c9c90faf642e7c5ad69c71aece2e39c1a536be50720bb778742fa4351db99346550f9bfef30c30dedc3458b50681818f87a21d0bd -SHA512 (asm-util-9.0.pom) = ff1629361724d652ba79dc48327373abe13ae81ea07b75a6c70af87fdbbf3e9dbeedac824f88eeccb7dd3a190a42244fc35a95630fb2620e5dfad87f8fce850f +SHA512 (objectweb-asm-9.1.tar.gz) = 4cce236397f963e8b707136164c370cfbb1d5167a03545d413f91751df3197ccfeee9f1f34943a77fbb9713ba002e5c9ecf6ddc65adfe6f821304ad6a4fa26f6 +SHA512 (asm-9.1.pom) = 9bdc46e2ee6721d9228b2ae9518a118b38f9cb35cfbf2a0a885f439b6cd8705cd62d6502fb1d6bb83523a1fc0b5d18832a0e231dc9ed4e0ca7fbd83bbf595061 +SHA512 (asm-analysis-9.1.pom) = f94b222e6ea2c964bde42785e43d82dc8ac4d07ad1b8748c6ee0e66ca70a5e3ee2dce0338ada8928b93929436bfc3227d5e2f73573caad67dd57e1bd612c9eec +SHA512 (asm-commons-9.1.pom) = ea17ae1dc7f732cb87d0bab9d68035b088577ed32b6fca3c70386f56feebbdd467dabe997e27134f8ad7c2133187af763b9c3aad696cce2ba36cf68f3f09b760 +SHA512 (asm-test-9.1.pom) = 1d3c7f7310d9a98136578653b2ace151286683c50c9d377ae27694322ae681913e2ae318ee614c2ef815b0e7a1eb3a31cb37451f366cd6cc0575d4e137fc61cf +SHA512 (asm-tree-9.1.pom) = d6239bff2d055de63ec2e3c97bee0f07d1fe07113d662f7b75783ebbbf5a1c4435f9a265c27a81ab4bd15d990470ddc9949f1cf3fd9e2c0bedec9fbf65134eac +SHA512 (asm-util-9.1.pom) = da73aecae4d8c8fb0c1a216c66f38a445cea7b24f3e8898b142f4f1d16d42e34265d49495d721438df4231f33422d4c649d358db6d1123b2e1efefc51381df29 From 0ff2893b3da961ee0a09be214958c541e7fbaa8e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:50:28 +0200 Subject: [PATCH 075/121] Bootstrap build --- objectweb-asm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 959ee21..4dfbd32 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: objectweb-asm Version: 9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -75,6 +75,9 @@ done %license LICENSE.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 9.1-2 +- Bootstrap build + * Fri May 14 2021 Marian Koncek - 9.1-1 - Update to upstream version 9.1 From cb45efeb3f4768cce9f714d817cdf0e515ab574b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:47 +0200 Subject: [PATCH 076/121] Non-bootstrap build --- objectweb-asm.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4dfbd32..ed0fc76 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: objectweb-asm Version: 9.1 @@ -77,6 +77,7 @@ done %changelog * Mon May 17 2021 Mikolaj Izdebski - 9.1-2 - Bootstrap build +- Non-bootstrap build * Fri May 14 2021 Marian Koncek - 9.1-1 - Update to upstream version 9.1 From ffe2ee6ac87a6b47a6eaf9c3df48814265081856 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:29:25 +0000 Subject: [PATCH 077/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ed0fc76..ea9311f 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -75,6 +75,9 @@ done %license LICENSE.txt %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 9.1-2 - Bootstrap build - Non-bootstrap build From d47f2cd813d830c94df255c20f87ec5b3bc9ab88 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 19:41:20 +0100 Subject: [PATCH 078/121] Update to upstream version 9.2 --- .gitignore | 6 ++++++ objectweb-asm.spec | 7 +++++-- sources | 14 +++++++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a9dcf82..80e5efa 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,9 @@ /asm-test-9.1.pom /asm-tree-9.1.pom /asm-util-9.1.pom +/asm-9.2.pom +/asm-analysis-9.2.pom +/asm-commons-9.2.pom +/asm-test-9.2.pom +/asm-tree-9.2.pom +/asm-util-9.2.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ea9311f..a1413eb 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.1 -Release: 3%{?dist} +Version: 9.2 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -75,6 +75,9 @@ done %license LICENSE.txt %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 9.2-1 +- Update to upstream version 9.2 + * Thu Jul 22 2021 Fedora Release Engineering - 9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 49f9fb5..78abf89 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.1.tar.gz) = 4cce236397f963e8b707136164c370cfbb1d5167a03545d413f91751df3197ccfeee9f1f34943a77fbb9713ba002e5c9ecf6ddc65adfe6f821304ad6a4fa26f6 -SHA512 (asm-9.1.pom) = 9bdc46e2ee6721d9228b2ae9518a118b38f9cb35cfbf2a0a885f439b6cd8705cd62d6502fb1d6bb83523a1fc0b5d18832a0e231dc9ed4e0ca7fbd83bbf595061 -SHA512 (asm-analysis-9.1.pom) = f94b222e6ea2c964bde42785e43d82dc8ac4d07ad1b8748c6ee0e66ca70a5e3ee2dce0338ada8928b93929436bfc3227d5e2f73573caad67dd57e1bd612c9eec -SHA512 (asm-commons-9.1.pom) = ea17ae1dc7f732cb87d0bab9d68035b088577ed32b6fca3c70386f56feebbdd467dabe997e27134f8ad7c2133187af763b9c3aad696cce2ba36cf68f3f09b760 -SHA512 (asm-test-9.1.pom) = 1d3c7f7310d9a98136578653b2ace151286683c50c9d377ae27694322ae681913e2ae318ee614c2ef815b0e7a1eb3a31cb37451f366cd6cc0575d4e137fc61cf -SHA512 (asm-tree-9.1.pom) = d6239bff2d055de63ec2e3c97bee0f07d1fe07113d662f7b75783ebbbf5a1c4435f9a265c27a81ab4bd15d990470ddc9949f1cf3fd9e2c0bedec9fbf65134eac -SHA512 (asm-util-9.1.pom) = da73aecae4d8c8fb0c1a216c66f38a445cea7b24f3e8898b142f4f1d16d42e34265d49495d721438df4231f33422d4c649d358db6d1123b2e1efefc51381df29 +SHA512 (objectweb-asm-9.2.tar.gz) = 8e36aa1527cc49f59780b29fdd35eeed65eeb6d80c1fefe089327d160ab1801a2cd8b26b67e6595946904fb7eb6a6c93aeaa1bf3a679b3851d34ea34be03dcdb +SHA512 (asm-9.2.pom) = 9c996667f3402a1c4d0bb2ad88bbb5e7eac1b3641cdbadefff607be86b6b50f9c3745e82fb2725409bb5dcb5c5d09f04a5965e2f0a7b072657703b21e2c40ff0 +SHA512 (asm-analysis-9.2.pom) = aa24c2a4940f37839ffe6ba27ecf946e5cbe12617e7defd3f112551e50dfa6a126923f42d0441c47c936f35452b216f45567b145154ab45c0bcee29b8bd6436d +SHA512 (asm-commons-9.2.pom) = 7845868fd576b78defb3d67dcf85c22091b62294bff2a049ca8457419bc9c9cb971e4d8a110fbb5dfdf39b934556b3e5de4bdf423e5c07fe86425c39e1a0d52f +SHA512 (asm-test-9.2.pom) = 8c7b2eb8ad751d3f8ab426d2f8de3f5a1883e3617f53fb5755670665e3ce87151e7fef207097dd3b9445e04b4b1a8f4d9dbc128eff0536c7c42526870da05933 +SHA512 (asm-tree-9.2.pom) = 5ec722237b13dd774eb20e9d9047e8ef041c4a2d456c62137e267c381a038292f16293eee0d09ba0c22d6f67d39a9a00a692e655db3330e1b7530c8c5d78d03d +SHA512 (asm-util-9.2.pom) = 19e5410664af0835c52754a714667e9d9ebfa00cf6398bc87b86ad772fd0d1e307c83797005caf0745952644172112677161572d2a9099144e1d9dcb466b53a8 From a644120735560370ce45df4bb60f25d7316a6dc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:35:21 +0000 Subject: [PATCH 079/121] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index a1413eb..101e4b8 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -75,6 +75,9 @@ done %license LICENSE.txt %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 9.2-1 - Update to upstream version 9.2 From 5ec3b8f668915395c2a710c374656e5fb6857177 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 23:09:26 +0100 Subject: [PATCH 080/121] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 101e4b8..dad3606 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -75,6 +75,9 @@ done %license LICENSE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 9.2-3 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 2feb7716bb03558c4a525adf618844a8d430ac8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 9 May 2022 22:23:15 +0200 Subject: [PATCH 081/121] Update to upstream version 9.3 --- .gitignore | 6 ++++++ objectweb-asm.spec | 7 +++++-- sources | 14 +++++++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 80e5efa..6211337 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,9 @@ /asm-test-9.2.pom /asm-tree-9.2.pom /asm-util-9.2.pom +/asm-9.3.pom +/asm-analysis-9.3.pom +/asm-commons-9.3.pom +/asm-test-9.3.pom +/asm-tree-9.3.pom +/asm-util-9.3.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index dad3606..58da35e 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.2 -Release: 3%{?dist} +Version: 9.3 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -75,6 +75,9 @@ done %license LICENSE.txt %changelog +* Mon May 09 2022 Mikolaj Izdebski - 9.3-1 +- Update to upstream version 9.3 + * Sat Feb 05 2022 Jiri Vanek - 9.2-3 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 78abf89..e89e1c4 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.2.tar.gz) = 8e36aa1527cc49f59780b29fdd35eeed65eeb6d80c1fefe089327d160ab1801a2cd8b26b67e6595946904fb7eb6a6c93aeaa1bf3a679b3851d34ea34be03dcdb -SHA512 (asm-9.2.pom) = 9c996667f3402a1c4d0bb2ad88bbb5e7eac1b3641cdbadefff607be86b6b50f9c3745e82fb2725409bb5dcb5c5d09f04a5965e2f0a7b072657703b21e2c40ff0 -SHA512 (asm-analysis-9.2.pom) = aa24c2a4940f37839ffe6ba27ecf946e5cbe12617e7defd3f112551e50dfa6a126923f42d0441c47c936f35452b216f45567b145154ab45c0bcee29b8bd6436d -SHA512 (asm-commons-9.2.pom) = 7845868fd576b78defb3d67dcf85c22091b62294bff2a049ca8457419bc9c9cb971e4d8a110fbb5dfdf39b934556b3e5de4bdf423e5c07fe86425c39e1a0d52f -SHA512 (asm-test-9.2.pom) = 8c7b2eb8ad751d3f8ab426d2f8de3f5a1883e3617f53fb5755670665e3ce87151e7fef207097dd3b9445e04b4b1a8f4d9dbc128eff0536c7c42526870da05933 -SHA512 (asm-tree-9.2.pom) = 5ec722237b13dd774eb20e9d9047e8ef041c4a2d456c62137e267c381a038292f16293eee0d09ba0c22d6f67d39a9a00a692e655db3330e1b7530c8c5d78d03d -SHA512 (asm-util-9.2.pom) = 19e5410664af0835c52754a714667e9d9ebfa00cf6398bc87b86ad772fd0d1e307c83797005caf0745952644172112677161572d2a9099144e1d9dcb466b53a8 +SHA512 (objectweb-asm-9.3.tar.gz) = ec23e717f17789fee264a6a08b3d52c2ec46d39270b38e0804ea18f1abebdddc738c7ff788d2ab348af8345b41c827021dec4e843b18ede04965eac77697e72b +SHA512 (asm-9.3.pom) = a354aaa4a45f6e6c3d24e28b8a9e4490bd0a5e43a33a45dd712daefaab33a65f45cd9ae11d57e38c45082053efbe03e6ab7d5c3882d50f1e6a5d6984f477ce86 +SHA512 (asm-analysis-9.3.pom) = e32fd3696ac4770f109a4abaf38e56cb4c8ad4f5131f8d24ff54505798279593c602402363c18b580f5453717a35fc7820fbe18e3b34ed780aa0c7025087d8cd +SHA512 (asm-commons-9.3.pom) = 1446c1528e07110c5a5894365c5c84063d264ec833532d894e3238bdb027f98a72398bc763fb89785a6f757e1d195f2934505ab63f75eb4538532fbed1ef0af9 +SHA512 (asm-test-9.3.pom) = 6c99662ac0701653dc76619e651ed3969c20ccd92a3f61eda9f785cceae446e6a4cf74e67f90835125719ce220d0639887f3047525c697203f3804e27dae8ff0 +SHA512 (asm-tree-9.3.pom) = f066513d4dba672edc85e9b457d827c16d55a321cb02f4f5faf6e02f59594c44fe3eae23006e6a7310151ff88ea53e654e27fdced6b0af85dcb24ab276279ca2 +SHA512 (asm-util-9.3.pom) = 283675d07165cd635d0417eed078be18aae09ec8960e370d5d56b5b7845d74e150330f21e4610c0c4ca391843d7dd21bcd341604763924f102d65875df8ff927 From b907f8be5a5cd54efb7a19a9a28b9b153106ac34 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 082/121] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- objectweb-asm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 58da35e..0a2d652 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -7,6 +7,7 @@ Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From 93b9c3927e77b74ab00fa490ff4bbcf7943c1f5d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 083/121] Update build-requires in bootstrap mode --- objectweb-asm.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 0a2d652..61981f4 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -21,9 +21,10 @@ Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/a # The source contains binary jars that cannot be verified for licensing and could be proprietary Source9: generate-tarball.sh -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local %endif # Explicit javapackages-tools requires since asm-processor script uses From de5b1f567fcd806e06c1f3eb06a931f433dac2b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:02:12 +0000 Subject: [PATCH 084/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 61981f4..ab4502f 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -77,6 +77,9 @@ done %license LICENSE.txt %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 09 2022 Mikolaj Izdebski - 9.3-1 - Update to upstream version 9.3 From b20f0db2d6b64a9efd12050cdb0c0f4e6797f683 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 1 Aug 2022 10:21:37 +0200 Subject: [PATCH 085/121] Use 2 spaces in parent.pom --- parent.pom | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/parent.pom b/parent.pom index 557cd16..86a53b6 100644 --- a/parent.pom +++ b/parent.pom @@ -1,19 +1,19 @@ - 4.0.0 + xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> + 4.0.0 - org.ow2.asm - asm-aggregator - 1 + org.ow2.asm + asm-aggregator + 1 - pom + pom - - asm - asm-analysis - asm-commons - asm-tree - asm-util - + + asm + asm-analysis + asm-commons + asm-tree + asm-util + From d4756bd2ef403ca37ae60b2992ad4b3123a7f546 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 22 Jul 2022 15:26:28 +0200 Subject: [PATCH 086/121] Generate module-info without bnd-plugin --- ...ule-info-classes-without-Bnd.-Delete.patch | 614 ++++++++++++++++++ objectweb-asm.spec | 32 +- parent.pom | 38 +- tools-retrofitter.pom | 19 + 4 files changed, 697 insertions(+), 6 deletions(-) create mode 100644 0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch create mode 100644 tools-retrofitter.pom diff --git a/0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch b/0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch new file mode 100644 index 0000000..8d4a837 --- /dev/null +++ b/0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch @@ -0,0 +1,614 @@ +From 5921eb2a141f0dcc83c6a5d7dcd5035a30c5edfc Mon Sep 17 00:00:00 2001 +From: Eric Bruneton +Date: Sun, 31 Jul 2022 12:21:41 +0000 +Subject: [PATCH] Generate the module info classes without Bnd. Delete the Bnd + plugin. + +--- + .../asm/tools/ModuleInfoBndPlugin.java | 99 ------ + .../org/objectweb/asm/tools/Retrofitter.java | 336 +++++++++++++----- + 4 files changed, 267 insertions(+), 206 deletions(-) + delete mode 100644 tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java + +diff --git a/tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java b/tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java +deleted file mode 100644 +index ee91bdc1..00000000 +--- a/tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java ++++ /dev/null +@@ -1,99 +0,0 @@ +-// ASM: a very small and fast Java bytecode manipulation framework +-// Copyright (c) 2000-2011 INRIA, France Telecom +-// All rights reserved. +-// +-// Redistribution and use in source and binary forms, with or without +-// modification, are permitted provided that the following conditions +-// are met: +-// 1. Redistributions of source code must retain the above copyright +-// notice, this list of conditions and the following disclaimer. +-// 2. Redistributions in binary form must reproduce the above copyright +-// notice, this list of conditions and the following disclaimer in the +-// documentation and/or other materials provided with the distribution. +-// 3. Neither the name of the copyright holders nor the names of its +-// contributors may be used to endorse or promote products derived from +-// this software without specific prior written permission. +-// +-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +-// THE POSSIBILITY OF SUCH DAMAGE. +-package org.objectweb.asm.tools; +- +-import aQute.bnd.header.Attrs; +-import aQute.bnd.header.Parameters; +-import aQute.bnd.osgi.Analyzer; +-import aQute.bnd.osgi.Constants; +-import aQute.bnd.osgi.EmbeddedResource; +-import aQute.bnd.service.AnalyzerPlugin; +-import org.objectweb.asm.ClassWriter; +-import org.objectweb.asm.ModuleVisitor; +-import org.objectweb.asm.Opcodes; +- +-/** +- * An biz.aQute.bnd plugin to generate a module-info class from the name, version, requires and +- * export properties of the bundle. +- * +- * @author Remi Forax +- */ +-public class ModuleInfoBndPlugin implements AnalyzerPlugin { +- private static final String MODULE_NAME = "Module-Name"; +- private static final String MODULE_VERSION = "Module-Version"; +- private static final String MODULE_REQUIRES = "Module-Requires"; +- private static final String MODULE_EXPORTS = "Module-Exports"; +- +- @Override +- public boolean analyzeJar(final Analyzer analyzer) throws Exception { +- ClassWriter classWriter = new ClassWriter(0); +- classWriter.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null, null); +- String moduleName = +- analyzer.getProperty(MODULE_NAME, analyzer.getProperty(Constants.BUNDLE_SYMBOLICNAME)); +- String moduleVersion = +- analyzer.getProperty(MODULE_VERSION, analyzer.getProperty(Constants.BUNDLE_VERSION)); +- ModuleVisitor moduleVisitor = +- classWriter.visitModule(moduleName, Opcodes.ACC_OPEN, moduleVersion); +- +- String requireModules = analyzer.getProperty(MODULE_REQUIRES); +- if (requireModules != null) { +- Parameters requireParams = analyzer.parseHeader(requireModules); +- for (String requireName : requireParams.keySet()) { +- Attrs attrs = requireParams.get(requireName); +- boolean isTransitive = attrs.containsKey("transitive"); +- boolean isStatic = attrs.containsKey("static"); +- moduleVisitor.visitRequire( +- requireName, +- (isTransitive ? Opcodes.ACC_TRANSITIVE : 0) | (isStatic ? Opcodes.ACC_STATIC_PHASE : 0), +- null); +- } +- } +- moduleVisitor.visitRequire("java.base", Opcodes.ACC_MANDATED, null); +- +- String exportPackages = +- analyzer.getProperty(MODULE_EXPORTS, analyzer.getProperty(Constants.EXPORT_PACKAGE)); +- if (exportPackages != null) { +- Parameters exportParams = analyzer.parseHeader(exportPackages); +- for (String packageName : exportParams.keySet()) { +- if (packageName.endsWith("*")) { +- throw new IllegalStateException("Unsupported wildcard packages " + packageName); +- } +- moduleVisitor.visitExport(packageName.replace('.', '/'), 0); +- } +- } +- moduleVisitor.visitEnd(); +- classWriter.visitEnd(); +- +- analyzer +- .getJar() +- .putResource( +- "module-info.class", +- new EmbeddedResource(classWriter.toByteArray(), System.currentTimeMillis())); +- return false; +- } +-} +diff --git a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java +index 2d017ed2..b3d51e63 100644 +--- a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java ++++ b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java +@@ -27,22 +27,33 @@ + // THE POSSIBILITY OF SUCH DAMAGE. + package org.objectweb.asm.tools; + ++import static java.lang.String.format; ++import static java.util.stream.Collectors.toSet; ++ + import java.io.BufferedReader; + import java.io.File; + import java.io.IOException; + import java.io.InputStream; + import java.io.InputStreamReader; + import java.io.LineNumberReader; +-import java.io.OutputStream; ++import java.lang.module.ModuleDescriptor; + import java.nio.file.Files; ++import java.nio.file.Path; ++import java.util.ArrayList; + import java.util.HashMap; + import java.util.HashSet; ++import java.util.List; ++import java.util.Set; ++import java.util.stream.Stream; + import java.util.zip.GZIPInputStream; + import org.objectweb.asm.ClassReader; + import org.objectweb.asm.ClassVisitor; + import org.objectweb.asm.ClassWriter; ++import org.objectweb.asm.FieldVisitor; + import org.objectweb.asm.Handle; ++import org.objectweb.asm.Label; + import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.ModuleVisitor; + import org.objectweb.asm.Opcodes; + import org.objectweb.asm.Type; + +@@ -57,6 +68,12 @@ import org.objectweb.asm.Type; + */ + public class Retrofitter { + ++ /** The name of the module-info file. */ ++ private static final String MODULE_INFO = "module-info.class"; ++ ++ /** The name of the java.base module. */ ++ private static final String JAVA_BASE_MODULE = "java.base"; ++ + /** + * The fields and methods of the JDK 1.5 API. Each string has the form + * "<owner><name><descriptor>". +@@ -68,12 +85,158 @@ public class Retrofitter { + */ + private final HashMap jdkHierarchy = new HashMap<>(); + ++ /** The internal names of the packages exported by the retrofitted classes. */ ++ private final HashSet exports = new HashSet<>(); ++ ++ /** The internal names of the packages imported by the retrofitted classes. */ ++ private final HashSet imports = new HashSet<>(); ++ ++ /** ++ * Transforms the class files in the given directory, in place, in order to make them compatible ++ * with the JDK 1.5. Also generates a module-info class in this directory, with the given module ++ * version. ++ * ++ * @param args a directory containing compiled classes and the ASM release version. ++ * @throws IOException if a file can't be read or written. ++ */ ++ public static void main(final String[] args) throws IOException { ++ if (args.length == 2) { ++ new Retrofitter().retrofit(new File(args[0]), args[1]); ++ } else { ++ System.err.println("Usage: Retrofitter "); // NOPMD ++ } ++ } ++ ++ /** ++ * Transforms the class files in the given directory, in place, in order to make them compatible ++ * with the JDK 1.5. Also generates a module-info class in this directory, with the given module ++ * version. ++ * ++ * @param classesDir a directory containing compiled classes. ++ * @param version the module-info version. ++ * @throws IOException if a file can't be read or written. ++ */ ++ public void retrofit(final File classesDir, final String version) throws IOException { ++ for (File classFile : getAllClasses(classesDir, new ArrayList())) { ++ ClassReader classReader = new ClassReader(Files.newInputStream(classFile.toPath())); ++ ClassWriter classWriter = new ClassWriter(0); ++ classReader.accept(new ClassRetrofitter(classWriter), ClassReader.SKIP_FRAMES); ++ Files.write(classFile.toPath(), classWriter.toByteArray()); ++ } ++ generateModuleInfoClass(classesDir, version); ++ } ++ + /** +- * Constructs a new {@link Retrofitter}. ++ * Verify that the class files in the given directory only use JDK 1.5 APIs, and that a ++ * module-info class is present with the expected content. + * +- * @throws IOException if the JDK API description file can't be read. ++ * @param classesDir a directory containing compiled classes. ++ * @param expectedVersion the expected module-info version. ++ * @param expectedExports the expected module-info exported packages. ++ * @param expectedRequires the expected module-info required modules. ++ * @throws IOException if a file can't be read. ++ * @throws IllegalArgumentException if the module-info class does not have the expected content. + */ +- public Retrofitter() throws IOException { ++ public void verify( ++ final File classesDir, ++ final String expectedVersion, ++ final List expectedExports, ++ final List expectedRequires) ++ throws IOException { ++ if (jdkApi.isEmpty()) { ++ readJdkApi(); ++ } ++ for (File classFile : getAllClasses(classesDir, new ArrayList())) { ++ if (!classFile.getName().equals(MODULE_INFO)) { ++ new ClassReader(Files.newInputStream(classFile.toPath())).accept(new ClassVerifier(), 0); ++ } ++ } ++ verifyModuleInfoClass( ++ classesDir, ++ expectedVersion, ++ new HashSet(expectedExports), ++ Stream.concat(expectedRequires.stream(), Stream.of(JAVA_BASE_MODULE)).collect(toSet())); ++ } ++ ++ private List getAllClasses(final File file, final List allClasses) ++ throws IOException { ++ if (file.isDirectory()) { ++ File[] children = file.listFiles(); ++ if (children == null) { ++ throw new IOException("Unable to read files of " + file); ++ } ++ for (File child : children) { ++ getAllClasses(child, allClasses); ++ } ++ } else if (file.getName().endsWith(".class")) { ++ allClasses.add(file); ++ } ++ return allClasses; ++ } ++ ++ private void generateModuleInfoClass(final File dstDir, final String version) throws IOException { ++ ClassWriter classWriter = new ClassWriter(0); ++ classWriter.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null, null); ++ ArrayList moduleNames = new ArrayList<>(); ++ for (String exportName : exports) { ++ if (isAsmModule(exportName)) { ++ moduleNames.add(exportName); ++ } ++ } ++ if (moduleNames.size() != 1) { ++ throw new IllegalArgumentException("Module name can't be infered from classes"); ++ } ++ ModuleVisitor moduleVisitor = ++ classWriter.visitModule(moduleNames.get(0), Opcodes.ACC_OPEN, version); ++ ++ for (String importName : imports) { ++ if (isAsmModule(importName) && !exports.contains(importName)) { ++ moduleVisitor.visitRequire(importName.replace('/', '.'), Opcodes.ACC_TRANSITIVE, null); ++ } ++ } ++ moduleVisitor.visitRequire(JAVA_BASE_MODULE, Opcodes.ACC_MANDATED, null); ++ ++ for (String exportName : exports) { ++ moduleVisitor.visitExport(exportName, 0); ++ } ++ moduleVisitor.visitEnd(); ++ classWriter.visitEnd(); ++ Files.write(Path.of(dstDir.getAbsolutePath(), MODULE_INFO), classWriter.toByteArray()); ++ } ++ ++ private void verifyModuleInfoClass( ++ final File dstDir, ++ final String expectedVersion, ++ final Set expectedExports, ++ final Set expectedRequires) ++ throws IOException { ++ ModuleDescriptor module = ++ ModuleDescriptor.read(Files.newInputStream(Path.of(dstDir.getAbsolutePath(), MODULE_INFO))); ++ String version = module.version().map(ModuleDescriptor.Version::toString).orElse(""); ++ if (!version.equals(expectedVersion)) { ++ throw new IllegalArgumentException( ++ format("Wrong module-info version '%s' (expected '%s')", version, expectedVersion)); ++ } ++ Set exports = ++ module.exports().stream().map(ModuleDescriptor.Exports::source).collect(toSet()); ++ if (!exports.equals(expectedExports)) { ++ throw new IllegalArgumentException( ++ format("Wrong module-info exports %s (expected %s)", exports, expectedExports)); ++ } ++ Set requires = ++ module.requires().stream().map(ModuleDescriptor.Requires::name).collect(toSet()); ++ if (!requires.equals(expectedRequires)) { ++ throw new IllegalArgumentException( ++ format("Wrong module-info requires %s (expected %s)", requires, expectedRequires)); ++ } ++ } ++ ++ private static boolean isAsmModule(final String packageName) { ++ return packageName.startsWith("org/objectweb/asm") ++ && !packageName.equals("org/objectweb/asm/signature"); ++ } ++ ++ private void readJdkApi() throws IOException { + try (InputStream inputStream = + new GZIPInputStream( + Retrofitter.class.getClassLoader().getResourceAsStream("jdk1.5.0.12.txt.gz")); +@@ -97,56 +260,8 @@ public class Retrofitter { + } + } + +- /** +- * Transforms the source class file, or if it is a directory, its files (recursively), in place, +- * in order to make them compatible with the JDK 1.5. +- * +- * @param src source file or directory. +- * @throws IOException if the source files can't be read or written. +- */ +- public void retrofit(final File src) throws IOException { +- retrofit(src, null); +- } +- +- /** +- * Transforms the source class file, or if it is a directory, its files (recursively), either in +- * place or into the destination file or directory, in order to make them compatible with the JDK +- * 1.5. +- * +- * @param src source file or directory. +- * @param dst optional destination file or directory. +- * @throws IOException if the source or destination file can't be read or written. +- */ +- public void retrofit(final File src, final File dst) throws IOException { +- if (src.isDirectory()) { +- File[] files = src.listFiles(); +- if (files == null) { +- throw new IOException("Unable to read files of " + src); +- } +- for (File file : files) { +- retrofit(file, dst == null ? null : new File(dst, file.getName())); +- } +- } else if (src.getName().endsWith(".class")) { +- if (dst == null || !dst.exists() || dst.lastModified() < src.lastModified()) { +- ClassReader classReader = new ClassReader(Files.newInputStream(src.toPath())); +- ClassWriter classWriter = new ClassWriter(0); +- ClassVerifier classVerifier = new ClassVerifier(classWriter); +- ClassRetrofitter classRetrofitter = new ClassRetrofitter(classVerifier); +- classReader.accept(classRetrofitter, ClassReader.SKIP_FRAMES); +- +- if (dst != null && !dst.getParentFile().exists() && !dst.getParentFile().mkdirs()) { +- throw new IOException("Cannot create directory " + dst.getParentFile()); +- } +- try (OutputStream outputStream = +- Files.newOutputStream((dst == null ? src : dst).toPath())) { +- outputStream.write(classWriter.toByteArray()); +- } +- } +- } +- } +- + /** A ClassVisitor that retrofits classes to 1.5 version. */ +- static class ClassRetrofitter extends ClassVisitor { ++ class ClassRetrofitter extends ClassVisitor { + + public ClassRetrofitter(final ClassVisitor classVisitor) { + super(/* latest api =*/ Opcodes.ASM8, classVisitor); +@@ -160,9 +275,21 @@ public class Retrofitter { + final String signature, + final String superName, + final String[] interfaces) { ++ addPackageReferences(Type.getObjectType(name), /* export = */ true); + super.visit(Opcodes.V1_5, access, name, signature, superName, interfaces); + } + ++ @Override ++ public FieldVisitor visitField( ++ final int access, ++ final String name, ++ final String descriptor, ++ final String signature, ++ final Object value) { ++ addPackageReferences(Type.getType(descriptor), /* export = */ false); ++ return super.visitField(access, name, descriptor, signature, value); ++ } ++ + @Override + public MethodVisitor visitMethod( + final int access, +@@ -170,9 +297,17 @@ public class Retrofitter { + final String descriptor, + final String signature, + final String[] exceptions) { ++ addPackageReferences(Type.getType(descriptor), /* export = */ false); + return new MethodVisitor( + api, super.visitMethod(access, name, descriptor, signature, exceptions)) { + ++ @Override ++ public void visitFieldInsn( ++ final int opcode, final String owner, final String name, final String descriptor) { ++ addPackageReferences(Type.getType(descriptor), /* export = */ false); ++ super.visitFieldInsn(opcode, owner, name, descriptor); ++ } ++ + @Override + public void visitMethodInsn( + final int opcode, +@@ -180,6 +315,7 @@ public class Retrofitter { + final String name, + final String descriptor, + final boolean isInterface) { ++ addPackageReferences(Type.getType(descriptor), /* export = */ false); + // Remove the addSuppressed() method calls generated for try-with-resources statements. + // This method is not defined in JDK1.5. + if (owner.equals("java/lang/Throwable") +@@ -190,8 +326,52 @@ public class Retrofitter { + super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); + } + } ++ ++ @Override ++ public void visitTypeInsn(final int opcode, final String type) { ++ addPackageReferences(Type.getObjectType(type), /* export = */ false); ++ super.visitTypeInsn(opcode, type); ++ } ++ ++ @Override ++ public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) { ++ addPackageReferences(Type.getType(descriptor), /* export = */ false); ++ super.visitMultiANewArrayInsn(descriptor, numDimensions); ++ } ++ ++ @Override ++ public void visitTryCatchBlock( ++ final Label start, final Label end, final Label handler, final String type) { ++ if (type != null) { ++ addPackageReferences(Type.getObjectType(type), /* export = */ false); ++ } ++ super.visitTryCatchBlock(start, end, handler, type); ++ } + }; + } ++ ++ private void addPackageReferences(final Type type, final boolean export) { ++ switch (type.getSort()) { ++ case Type.ARRAY: ++ addPackageReferences(type.getElementType(), export); ++ break; ++ case Type.METHOD: ++ for (Type argumentType : type.getArgumentTypes()) { ++ addPackageReferences(argumentType, export); ++ } ++ addPackageReferences(type.getReturnType(), export); ++ break; ++ case Type.OBJECT: ++ String internalName = type.getInternalName(); ++ int lastSlashIndex = internalName.lastIndexOf('/'); ++ if (lastSlashIndex != -1) { ++ (export ? exports : imports).add(internalName.substring(0, lastSlashIndex)); ++ } ++ break; ++ default: ++ break; ++ } ++ } + } + + /** +@@ -199,18 +379,18 @@ public class Retrofitter { + */ + class ClassVerifier extends ClassVisitor { + +- /** The name of the visited class. */ ++ /** The internal name of the visited class. */ + String className; + + /** The name of the currently visited method. */ + String currentMethodName; + +- public ClassVerifier(final ClassVisitor classVisitor) { ++ public ClassVerifier() { + // Make sure use we don't use Java 9 or higher classfile features. + // We also want to make sure we don't use Java 6, 7 or 8 classfile + // features (invokedynamic), but this can't be done in the same way. + // Instead, we use manual checks below. +- super(Opcodes.ASM4, classVisitor); ++ super(Opcodes.ASM4, null); + } + + @Override +@@ -222,10 +402,9 @@ public class Retrofitter { + final String superName, + final String[] interfaces) { + if ((version & 0xFFFF) > Opcodes.V1_5) { +- throw new IllegalArgumentException("ERROR: " + name + " version is newer than 1.5"); ++ throw new IllegalArgumentException(format("ERROR: %d version is newer than 1.5", version)); + } + className = name; +- super.visit(version, access, name, signature, superName, interfaces); + } + + @Override +@@ -243,7 +422,6 @@ public class Retrofitter { + public void visitFieldInsn( + final int opcode, final String owner, final String name, final String descriptor) { + check(owner, name); +- super.visitFieldInsn(opcode, owner, name, descriptor); + } + + @Override +@@ -254,7 +432,6 @@ public class Retrofitter { + final String descriptor, + final boolean isInterface) { + check(owner, name + descriptor); +- super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); + } + + @Override +@@ -263,21 +440,16 @@ public class Retrofitter { + int sort = ((Type) value).getSort(); + if (sort == Type.METHOD) { + throw new IllegalArgumentException( +- "ERROR: ldc with a MethodType called in " +- + className +- + ' ' +- + currentMethodName +- + " is not available in JDK 1.5"); ++ format( ++ "ERROR: ldc with a MethodType called in %s %s is not available in JDK 1.5", ++ className, currentMethodName)); + } + } else if (value instanceof Handle) { + throw new IllegalArgumentException( +- "ERROR: ldc with a MethodHandle called in " +- + className +- + ' ' +- + currentMethodName +- + " is not available in JDK 1.5"); ++ format( ++ "ERROR: ldc with a MethodHandle called in %s %s is not available in JDK 1.5", ++ className, currentMethodName)); + } +- super.visitLdcInsn(value); + } + + @Override +@@ -287,11 +459,9 @@ public class Retrofitter { + final Handle bootstrapMethodHandle, + final Object... bootstrapMethodArguments) { + throw new IllegalArgumentException( +- "ERROR: invokedynamic called in " +- + className +- + ' ' +- + currentMethodName +- + " is not available in JDK 1.5"); ++ format( ++ "ERROR: invokedynamic called in %s %s is not available in JDK 1.5", ++ className, currentMethodName)); + } + }; + } +@@ -302,7 +472,7 @@ public class Retrofitter { + * @param owner A class name. + * @param member A field name or a method name and descriptor. + */ +- void check(final String owner, final String member) { ++ private void check(final String owner, final String member) { + if (owner.startsWith("java/")) { + String currentOwner = owner; + while (currentOwner != null) { +@@ -312,15 +482,9 @@ public class Retrofitter { + currentOwner = jdkHierarchy.get(currentOwner); + } + throw new IllegalArgumentException( +- "ERROR: " +- + owner +- + ' ' +- + member +- + " called in " +- + className +- + ' ' +- + currentMethodName +- + " is not defined in the JDK 1.5 API"); ++ format( ++ "ERROR: %s %s called in %s %s is not defined in the JDK 1.5 API", ++ owner, member, className, currentMethodName)); + } + } + } +-- +2.37.1 + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ab4502f..3cc6ade 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -20,11 +20,21 @@ Source6: https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/a Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom # The source contains binary jars that cannot be verified for licensing and could be proprietary Source9: generate-tarball.sh +Source10: tools-retrofitter.pom + +# This patch makes it possible to generate module-info.class files without +# needing to use bnd-maven-plugin during the build. The replacement is an added +# main method that has to be invoked manually. +# Patch already applied in upstream master +# https://gitlab.ow2.org/asm/asm/-/commit/5921eb2a141f0dcc83c6a5d7dcd5035a30c5edfc +Patch1: 0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.ow2.asm:asm) %endif # Explicit javapackages-tools requires since asm-processor script uses @@ -47,20 +57,28 @@ This package provides %{summary}. %prep %setup -q +%patch1 -p1 + # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml +%pom_xpath_set pom:project/pom:version %{version} + +cp -p %{SOURCE10} tools/retrofitter/pom.xml # Insert poms into modules for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do - cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml - %pom_remove_parent $pom + cp -p ${RPM_SOURCE_DIR}/${pom}-%{version}.pom ${pom}/pom.xml + %pom_add_dep org.ow2.asm:tools-retrofitter::provided ${pom} + %pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin ${pom} + %pom_set_parent org.ow2.asm:asm-aggregator:%{version} ${pom} + %pom_xpath_inject pom:parent '..' ${pom} done -# No need to ship the custom parent pom -%mvn_package :asm-aggregator __noinstall # Don't ship the test framework to avoid runtime dep on junit %mvn_package :asm-test __noinstall +%mvn_package :tools-retrofitter __noinstall + %build %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 @@ -77,6 +95,10 @@ done %license LICENSE.txt %changelog +* Mon Aug 29 2022 Marian Koncek - 9.3-3 +- Generate module-info without bnd-plugin +- Resolves: rhbz#2106272 + * Fri Jul 22 2022 Fedora Release Engineering - 9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/parent.pom b/parent.pom index 86a53b6..83012ff 100644 --- a/parent.pom +++ b/parent.pom @@ -5,15 +5,51 @@ org.ow2.asm asm-aggregator - 1 + pom + + UTF-8 + + asm asm-analysis asm-commons asm-tree asm-util + tools/retrofitter + + + + + + org.apache.maven.plugins + maven-antrun-plugin + any + + + process-classes + + run + + + + + + + + + + + + + + + + + + diff --git a/tools-retrofitter.pom b/tools-retrofitter.pom new file mode 100644 index 0000000..5e24dda --- /dev/null +++ b/tools-retrofitter.pom @@ -0,0 +1,19 @@ + + + 4.0.0 + + org.ow2.asm + tools-retrofitter + any + + jar + + + + org.ow2.asm + asm + any + + + From defa5f5301a42fc841a252c45ceab32eea2ea483 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 29 Aug 2022 15:42:50 +0200 Subject: [PATCH 087/121] Add javapackages tests --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 3f843be34056f332dea730cea458be5f29cdcc97 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 2 Sep 2022 11:26:10 +0200 Subject: [PATCH 088/121] Fix wrong generated module infos --- ...sh-for-dot-in-generated-module-infos.patch | 27 +++++++++++++++++++ objectweb-asm.spec | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0002-Replace-slash-for-dot-in-generated-module-infos.patch diff --git a/0002-Replace-slash-for-dot-in-generated-module-infos.patch b/0002-Replace-slash-for-dot-in-generated-module-infos.patch new file mode 100644 index 0000000..3b7faba --- /dev/null +++ b/0002-Replace-slash-for-dot-in-generated-module-infos.patch @@ -0,0 +1,27 @@ +From b4a0366b3c17fcc0d8187cffbcdd2e1bd61ab0fb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= +Date: Fri, 2 Sep 2022 09:41:23 +0200 +Subject: [PATCH] Replace slash for dot in generated module infos + +Forwarded: no + +--- + .../src/main/java/org/objectweb/asm/tools/Retrofitter.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java +index b3d51e63..43002cea 100644 +--- a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java ++++ b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java +@@ -187,7 +187,7 @@ public class Retrofitter { + throw new IllegalArgumentException("Module name can't be infered from classes"); + } + ModuleVisitor moduleVisitor = +- classWriter.visitModule(moduleNames.get(0), Opcodes.ACC_OPEN, version); ++ classWriter.visitModule(moduleNames.get(0).replace('/', '.'), Opcodes.ACC_OPEN, version); + + for (String importName : imports) { + if (isAsmModule(importName) && !exports.contains(importName)) { +-- +2.37.2 + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 3cc6ade..692bbef 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -29,6 +29,9 @@ Source10: tools-retrofitter.pom # https://gitlab.ow2.org/asm/asm/-/commit/5921eb2a141f0dcc83c6a5d7dcd5035a30c5edfc Patch1: 0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch +# Attempted fix for: https://gitlab.ow2.org/asm/asm/-/issues/317983 +Patch2: 0002-Replace-slash-for-dot-in-generated-module-infos.patch + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -58,6 +61,7 @@ This package provides %{summary}. %setup -q %patch1 -p1 +%patch2 -p1 # A custom parent pom to aggregate the build cp -p %{SOURCE1} pom.xml @@ -95,6 +99,9 @@ done %license LICENSE.txt %changelog +* Fri Sep 02 2022 Marian Koncek - 9.3-4 +- Fix wrong generated module infos + * Mon Aug 29 2022 Marian Koncek - 9.3-3 - Generate module-info without bnd-plugin - Resolves: rhbz#2106272 From 9686fe857986a972c4bd402fe78e5c3167b46b58 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Nov 2022 10:50:46 +0100 Subject: [PATCH 089/121] Bootstrap build --- objectweb-asm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 692bbef..d087e2d 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: objectweb-asm Version: 9.3 From cf1b2e40e8ffad041b614047620e26b7a260a56d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Nov 2022 10:52:40 +0100 Subject: [PATCH 090/121] Non-bootstrap build --- objectweb-asm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index d087e2d..692bbef 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: objectweb-asm Version: 9.3 From 9ae9aa1ac1c0834888c615d499086a583f5a1a94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:58:25 +0000 Subject: [PATCH 091/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 692bbef..4fdf808 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -99,6 +99,9 @@ done %license LICENSE.txt %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Sep 02 2022 Marian Koncek - 9.3-4 - Fix wrong generated module infos From 45272a6e20ac2d30d2252e4060be65e722c30336 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 23 Feb 2023 11:50:59 +0100 Subject: [PATCH 092/121] Refactor poms --- parent.pom => aggregator.pom | 11 +++++++---- objectweb-asm.spec | 15 ++++++++------- tools-retrofitter.pom | 3 +-- 3 files changed, 16 insertions(+), 13 deletions(-) rename parent.pom => aggregator.pom (84%) diff --git a/parent.pom b/aggregator.pom similarity index 84% rename from parent.pom rename to aggregator.pom index 83012ff..f267e26 100644 --- a/parent.pom +++ b/aggregator.pom @@ -3,10 +3,9 @@ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> 4.0.0 - org.ow2.asm - asm-aggregator - - + org.fedoraproject.xmvn.objectweb-asm + aggregator + any pom @@ -25,6 +24,10 @@ + org.apache.maven.plugins maven-antrun-plugin diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4fdf808..0e25897 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -11,7 +11,7 @@ ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -Source1: parent.pom +Source1: aggregator.pom Source2: https://repo1.maven.org/maven2/org/ow2/asm/asm/%{version}/asm-%{version}.pom Source3: https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/%{version}/asm-analysis-%{version}.pom Source4: https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}/asm-commons-%{version}.pom @@ -63,26 +63,27 @@ This package provides %{summary}. %patch1 -p1 %patch2 -p1 -# A custom parent pom to aggregate the build +# A custom pom to aggregate the build cp -p %{SOURCE1} pom.xml -%pom_xpath_set pom:project/pom:version %{version} cp -p %{SOURCE10} tools/retrofitter/pom.xml # Insert poms into modules for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do cp -p ${RPM_SOURCE_DIR}/${pom}-%{version}.pom ${pom}/pom.xml - %pom_add_dep org.ow2.asm:tools-retrofitter::provided ${pom} + %pom_add_dep org.fedoraproject.xmvn.objectweb-asm:tools-retrofitter::provided ${pom} %pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin ${pom} - %pom_set_parent org.ow2.asm:asm-aggregator:%{version} ${pom} + %pom_set_parent org.fedoraproject.xmvn.objectweb-asm:aggregator:any ${pom} %pom_xpath_inject pom:parent '..' ${pom} done +# Don't ship poms used for build only +%mvn_package :aggregator __noinstall +%mvn_package :tools-retrofitter __noinstall + # Don't ship the test framework to avoid runtime dep on junit %mvn_package :asm-test __noinstall -%mvn_package :tools-retrofitter __noinstall - %build %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 diff --git a/tools-retrofitter.pom b/tools-retrofitter.pom index 5e24dda..bd1f813 100644 --- a/tools-retrofitter.pom +++ b/tools-retrofitter.pom @@ -3,10 +3,9 @@ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> 4.0.0 - org.ow2.asm + org.fedoraproject.xmvn.objectweb-asm tools-retrofitter any - jar From a9f7552ac0da19cd19c94a88321b9a2eca96be8d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 23 Feb 2023 11:51:22 +0100 Subject: [PATCH 093/121] Update to upstream version 9.4 --- .gitignore | 6 + ...ule-info-classes-without-Bnd.-Delete.patch | 614 ------------------ ...sh-for-dot-in-generated-module-infos.patch | 27 - objectweb-asm.spec | 20 +- sources | 14 +- 5 files changed, 18 insertions(+), 663 deletions(-) delete mode 100644 0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch delete mode 100644 0002-Replace-slash-for-dot-in-generated-module-infos.patch diff --git a/.gitignore b/.gitignore index 6211337..9c6a2d3 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,9 @@ /asm-test-9.3.pom /asm-tree-9.3.pom /asm-util-9.3.pom +/asm-9.4.pom +/asm-analysis-9.4.pom +/asm-commons-9.4.pom +/asm-test-9.4.pom +/asm-tree-9.4.pom +/asm-util-9.4.pom diff --git a/0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch b/0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch deleted file mode 100644 index 8d4a837..0000000 --- a/0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch +++ /dev/null @@ -1,614 +0,0 @@ -From 5921eb2a141f0dcc83c6a5d7dcd5035a30c5edfc Mon Sep 17 00:00:00 2001 -From: Eric Bruneton -Date: Sun, 31 Jul 2022 12:21:41 +0000 -Subject: [PATCH] Generate the module info classes without Bnd. Delete the Bnd - plugin. - ---- - .../asm/tools/ModuleInfoBndPlugin.java | 99 ------ - .../org/objectweb/asm/tools/Retrofitter.java | 336 +++++++++++++----- - 4 files changed, 267 insertions(+), 206 deletions(-) - delete mode 100644 tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java - -diff --git a/tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java b/tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java -deleted file mode 100644 -index ee91bdc1..00000000 ---- a/tools/bnd-module-plugin/src/main/java/org/objectweb/asm/tools/ModuleInfoBndPlugin.java -+++ /dev/null -@@ -1,99 +0,0 @@ --// ASM: a very small and fast Java bytecode manipulation framework --// Copyright (c) 2000-2011 INRIA, France Telecom --// All rights reserved. --// --// Redistribution and use in source and binary forms, with or without --// modification, are permitted provided that the following conditions --// are met: --// 1. Redistributions of source code must retain the above copyright --// notice, this list of conditions and the following disclaimer. --// 2. Redistributions in binary form must reproduce the above copyright --// notice, this list of conditions and the following disclaimer in the --// documentation and/or other materials provided with the distribution. --// 3. Neither the name of the copyright holders nor the names of its --// contributors may be used to endorse or promote products derived from --// this software without specific prior written permission. --// --// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF --// THE POSSIBILITY OF SUCH DAMAGE. --package org.objectweb.asm.tools; -- --import aQute.bnd.header.Attrs; --import aQute.bnd.header.Parameters; --import aQute.bnd.osgi.Analyzer; --import aQute.bnd.osgi.Constants; --import aQute.bnd.osgi.EmbeddedResource; --import aQute.bnd.service.AnalyzerPlugin; --import org.objectweb.asm.ClassWriter; --import org.objectweb.asm.ModuleVisitor; --import org.objectweb.asm.Opcodes; -- --/** -- * An biz.aQute.bnd plugin to generate a module-info class from the name, version, requires and -- * export properties of the bundle. -- * -- * @author Remi Forax -- */ --public class ModuleInfoBndPlugin implements AnalyzerPlugin { -- private static final String MODULE_NAME = "Module-Name"; -- private static final String MODULE_VERSION = "Module-Version"; -- private static final String MODULE_REQUIRES = "Module-Requires"; -- private static final String MODULE_EXPORTS = "Module-Exports"; -- -- @Override -- public boolean analyzeJar(final Analyzer analyzer) throws Exception { -- ClassWriter classWriter = new ClassWriter(0); -- classWriter.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null, null); -- String moduleName = -- analyzer.getProperty(MODULE_NAME, analyzer.getProperty(Constants.BUNDLE_SYMBOLICNAME)); -- String moduleVersion = -- analyzer.getProperty(MODULE_VERSION, analyzer.getProperty(Constants.BUNDLE_VERSION)); -- ModuleVisitor moduleVisitor = -- classWriter.visitModule(moduleName, Opcodes.ACC_OPEN, moduleVersion); -- -- String requireModules = analyzer.getProperty(MODULE_REQUIRES); -- if (requireModules != null) { -- Parameters requireParams = analyzer.parseHeader(requireModules); -- for (String requireName : requireParams.keySet()) { -- Attrs attrs = requireParams.get(requireName); -- boolean isTransitive = attrs.containsKey("transitive"); -- boolean isStatic = attrs.containsKey("static"); -- moduleVisitor.visitRequire( -- requireName, -- (isTransitive ? Opcodes.ACC_TRANSITIVE : 0) | (isStatic ? Opcodes.ACC_STATIC_PHASE : 0), -- null); -- } -- } -- moduleVisitor.visitRequire("java.base", Opcodes.ACC_MANDATED, null); -- -- String exportPackages = -- analyzer.getProperty(MODULE_EXPORTS, analyzer.getProperty(Constants.EXPORT_PACKAGE)); -- if (exportPackages != null) { -- Parameters exportParams = analyzer.parseHeader(exportPackages); -- for (String packageName : exportParams.keySet()) { -- if (packageName.endsWith("*")) { -- throw new IllegalStateException("Unsupported wildcard packages " + packageName); -- } -- moduleVisitor.visitExport(packageName.replace('.', '/'), 0); -- } -- } -- moduleVisitor.visitEnd(); -- classWriter.visitEnd(); -- -- analyzer -- .getJar() -- .putResource( -- "module-info.class", -- new EmbeddedResource(classWriter.toByteArray(), System.currentTimeMillis())); -- return false; -- } --} -diff --git a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java -index 2d017ed2..b3d51e63 100644 ---- a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java -+++ b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java -@@ -27,22 +27,33 @@ - // THE POSSIBILITY OF SUCH DAMAGE. - package org.objectweb.asm.tools; - -+import static java.lang.String.format; -+import static java.util.stream.Collectors.toSet; -+ - import java.io.BufferedReader; - import java.io.File; - import java.io.IOException; - import java.io.InputStream; - import java.io.InputStreamReader; - import java.io.LineNumberReader; --import java.io.OutputStream; -+import java.lang.module.ModuleDescriptor; - import java.nio.file.Files; -+import java.nio.file.Path; -+import java.util.ArrayList; - import java.util.HashMap; - import java.util.HashSet; -+import java.util.List; -+import java.util.Set; -+import java.util.stream.Stream; - import java.util.zip.GZIPInputStream; - import org.objectweb.asm.ClassReader; - import org.objectweb.asm.ClassVisitor; - import org.objectweb.asm.ClassWriter; -+import org.objectweb.asm.FieldVisitor; - import org.objectweb.asm.Handle; -+import org.objectweb.asm.Label; - import org.objectweb.asm.MethodVisitor; -+import org.objectweb.asm.ModuleVisitor; - import org.objectweb.asm.Opcodes; - import org.objectweb.asm.Type; - -@@ -57,6 +68,12 @@ import org.objectweb.asm.Type; - */ - public class Retrofitter { - -+ /** The name of the module-info file. */ -+ private static final String MODULE_INFO = "module-info.class"; -+ -+ /** The name of the java.base module. */ -+ private static final String JAVA_BASE_MODULE = "java.base"; -+ - /** - * The fields and methods of the JDK 1.5 API. Each string has the form - * "<owner><name><descriptor>". -@@ -68,12 +85,158 @@ public class Retrofitter { - */ - private final HashMap jdkHierarchy = new HashMap<>(); - -+ /** The internal names of the packages exported by the retrofitted classes. */ -+ private final HashSet exports = new HashSet<>(); -+ -+ /** The internal names of the packages imported by the retrofitted classes. */ -+ private final HashSet imports = new HashSet<>(); -+ -+ /** -+ * Transforms the class files in the given directory, in place, in order to make them compatible -+ * with the JDK 1.5. Also generates a module-info class in this directory, with the given module -+ * version. -+ * -+ * @param args a directory containing compiled classes and the ASM release version. -+ * @throws IOException if a file can't be read or written. -+ */ -+ public static void main(final String[] args) throws IOException { -+ if (args.length == 2) { -+ new Retrofitter().retrofit(new File(args[0]), args[1]); -+ } else { -+ System.err.println("Usage: Retrofitter "); // NOPMD -+ } -+ } -+ -+ /** -+ * Transforms the class files in the given directory, in place, in order to make them compatible -+ * with the JDK 1.5. Also generates a module-info class in this directory, with the given module -+ * version. -+ * -+ * @param classesDir a directory containing compiled classes. -+ * @param version the module-info version. -+ * @throws IOException if a file can't be read or written. -+ */ -+ public void retrofit(final File classesDir, final String version) throws IOException { -+ for (File classFile : getAllClasses(classesDir, new ArrayList())) { -+ ClassReader classReader = new ClassReader(Files.newInputStream(classFile.toPath())); -+ ClassWriter classWriter = new ClassWriter(0); -+ classReader.accept(new ClassRetrofitter(classWriter), ClassReader.SKIP_FRAMES); -+ Files.write(classFile.toPath(), classWriter.toByteArray()); -+ } -+ generateModuleInfoClass(classesDir, version); -+ } -+ - /** -- * Constructs a new {@link Retrofitter}. -+ * Verify that the class files in the given directory only use JDK 1.5 APIs, and that a -+ * module-info class is present with the expected content. - * -- * @throws IOException if the JDK API description file can't be read. -+ * @param classesDir a directory containing compiled classes. -+ * @param expectedVersion the expected module-info version. -+ * @param expectedExports the expected module-info exported packages. -+ * @param expectedRequires the expected module-info required modules. -+ * @throws IOException if a file can't be read. -+ * @throws IllegalArgumentException if the module-info class does not have the expected content. - */ -- public Retrofitter() throws IOException { -+ public void verify( -+ final File classesDir, -+ final String expectedVersion, -+ final List expectedExports, -+ final List expectedRequires) -+ throws IOException { -+ if (jdkApi.isEmpty()) { -+ readJdkApi(); -+ } -+ for (File classFile : getAllClasses(classesDir, new ArrayList())) { -+ if (!classFile.getName().equals(MODULE_INFO)) { -+ new ClassReader(Files.newInputStream(classFile.toPath())).accept(new ClassVerifier(), 0); -+ } -+ } -+ verifyModuleInfoClass( -+ classesDir, -+ expectedVersion, -+ new HashSet(expectedExports), -+ Stream.concat(expectedRequires.stream(), Stream.of(JAVA_BASE_MODULE)).collect(toSet())); -+ } -+ -+ private List getAllClasses(final File file, final List allClasses) -+ throws IOException { -+ if (file.isDirectory()) { -+ File[] children = file.listFiles(); -+ if (children == null) { -+ throw new IOException("Unable to read files of " + file); -+ } -+ for (File child : children) { -+ getAllClasses(child, allClasses); -+ } -+ } else if (file.getName().endsWith(".class")) { -+ allClasses.add(file); -+ } -+ return allClasses; -+ } -+ -+ private void generateModuleInfoClass(final File dstDir, final String version) throws IOException { -+ ClassWriter classWriter = new ClassWriter(0); -+ classWriter.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null, null); -+ ArrayList moduleNames = new ArrayList<>(); -+ for (String exportName : exports) { -+ if (isAsmModule(exportName)) { -+ moduleNames.add(exportName); -+ } -+ } -+ if (moduleNames.size() != 1) { -+ throw new IllegalArgumentException("Module name can't be infered from classes"); -+ } -+ ModuleVisitor moduleVisitor = -+ classWriter.visitModule(moduleNames.get(0), Opcodes.ACC_OPEN, version); -+ -+ for (String importName : imports) { -+ if (isAsmModule(importName) && !exports.contains(importName)) { -+ moduleVisitor.visitRequire(importName.replace('/', '.'), Opcodes.ACC_TRANSITIVE, null); -+ } -+ } -+ moduleVisitor.visitRequire(JAVA_BASE_MODULE, Opcodes.ACC_MANDATED, null); -+ -+ for (String exportName : exports) { -+ moduleVisitor.visitExport(exportName, 0); -+ } -+ moduleVisitor.visitEnd(); -+ classWriter.visitEnd(); -+ Files.write(Path.of(dstDir.getAbsolutePath(), MODULE_INFO), classWriter.toByteArray()); -+ } -+ -+ private void verifyModuleInfoClass( -+ final File dstDir, -+ final String expectedVersion, -+ final Set expectedExports, -+ final Set expectedRequires) -+ throws IOException { -+ ModuleDescriptor module = -+ ModuleDescriptor.read(Files.newInputStream(Path.of(dstDir.getAbsolutePath(), MODULE_INFO))); -+ String version = module.version().map(ModuleDescriptor.Version::toString).orElse(""); -+ if (!version.equals(expectedVersion)) { -+ throw new IllegalArgumentException( -+ format("Wrong module-info version '%s' (expected '%s')", version, expectedVersion)); -+ } -+ Set exports = -+ module.exports().stream().map(ModuleDescriptor.Exports::source).collect(toSet()); -+ if (!exports.equals(expectedExports)) { -+ throw new IllegalArgumentException( -+ format("Wrong module-info exports %s (expected %s)", exports, expectedExports)); -+ } -+ Set requires = -+ module.requires().stream().map(ModuleDescriptor.Requires::name).collect(toSet()); -+ if (!requires.equals(expectedRequires)) { -+ throw new IllegalArgumentException( -+ format("Wrong module-info requires %s (expected %s)", requires, expectedRequires)); -+ } -+ } -+ -+ private static boolean isAsmModule(final String packageName) { -+ return packageName.startsWith("org/objectweb/asm") -+ && !packageName.equals("org/objectweb/asm/signature"); -+ } -+ -+ private void readJdkApi() throws IOException { - try (InputStream inputStream = - new GZIPInputStream( - Retrofitter.class.getClassLoader().getResourceAsStream("jdk1.5.0.12.txt.gz")); -@@ -97,56 +260,8 @@ public class Retrofitter { - } - } - -- /** -- * Transforms the source class file, or if it is a directory, its files (recursively), in place, -- * in order to make them compatible with the JDK 1.5. -- * -- * @param src source file or directory. -- * @throws IOException if the source files can't be read or written. -- */ -- public void retrofit(final File src) throws IOException { -- retrofit(src, null); -- } -- -- /** -- * Transforms the source class file, or if it is a directory, its files (recursively), either in -- * place or into the destination file or directory, in order to make them compatible with the JDK -- * 1.5. -- * -- * @param src source file or directory. -- * @param dst optional destination file or directory. -- * @throws IOException if the source or destination file can't be read or written. -- */ -- public void retrofit(final File src, final File dst) throws IOException { -- if (src.isDirectory()) { -- File[] files = src.listFiles(); -- if (files == null) { -- throw new IOException("Unable to read files of " + src); -- } -- for (File file : files) { -- retrofit(file, dst == null ? null : new File(dst, file.getName())); -- } -- } else if (src.getName().endsWith(".class")) { -- if (dst == null || !dst.exists() || dst.lastModified() < src.lastModified()) { -- ClassReader classReader = new ClassReader(Files.newInputStream(src.toPath())); -- ClassWriter classWriter = new ClassWriter(0); -- ClassVerifier classVerifier = new ClassVerifier(classWriter); -- ClassRetrofitter classRetrofitter = new ClassRetrofitter(classVerifier); -- classReader.accept(classRetrofitter, ClassReader.SKIP_FRAMES); -- -- if (dst != null && !dst.getParentFile().exists() && !dst.getParentFile().mkdirs()) { -- throw new IOException("Cannot create directory " + dst.getParentFile()); -- } -- try (OutputStream outputStream = -- Files.newOutputStream((dst == null ? src : dst).toPath())) { -- outputStream.write(classWriter.toByteArray()); -- } -- } -- } -- } -- - /** A ClassVisitor that retrofits classes to 1.5 version. */ -- static class ClassRetrofitter extends ClassVisitor { -+ class ClassRetrofitter extends ClassVisitor { - - public ClassRetrofitter(final ClassVisitor classVisitor) { - super(/* latest api =*/ Opcodes.ASM8, classVisitor); -@@ -160,9 +275,21 @@ public class Retrofitter { - final String signature, - final String superName, - final String[] interfaces) { -+ addPackageReferences(Type.getObjectType(name), /* export = */ true); - super.visit(Opcodes.V1_5, access, name, signature, superName, interfaces); - } - -+ @Override -+ public FieldVisitor visitField( -+ final int access, -+ final String name, -+ final String descriptor, -+ final String signature, -+ final Object value) { -+ addPackageReferences(Type.getType(descriptor), /* export = */ false); -+ return super.visitField(access, name, descriptor, signature, value); -+ } -+ - @Override - public MethodVisitor visitMethod( - final int access, -@@ -170,9 +297,17 @@ public class Retrofitter { - final String descriptor, - final String signature, - final String[] exceptions) { -+ addPackageReferences(Type.getType(descriptor), /* export = */ false); - return new MethodVisitor( - api, super.visitMethod(access, name, descriptor, signature, exceptions)) { - -+ @Override -+ public void visitFieldInsn( -+ final int opcode, final String owner, final String name, final String descriptor) { -+ addPackageReferences(Type.getType(descriptor), /* export = */ false); -+ super.visitFieldInsn(opcode, owner, name, descriptor); -+ } -+ - @Override - public void visitMethodInsn( - final int opcode, -@@ -180,6 +315,7 @@ public class Retrofitter { - final String name, - final String descriptor, - final boolean isInterface) { -+ addPackageReferences(Type.getType(descriptor), /* export = */ false); - // Remove the addSuppressed() method calls generated for try-with-resources statements. - // This method is not defined in JDK1.5. - if (owner.equals("java/lang/Throwable") -@@ -190,8 +326,52 @@ public class Retrofitter { - super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); - } - } -+ -+ @Override -+ public void visitTypeInsn(final int opcode, final String type) { -+ addPackageReferences(Type.getObjectType(type), /* export = */ false); -+ super.visitTypeInsn(opcode, type); -+ } -+ -+ @Override -+ public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) { -+ addPackageReferences(Type.getType(descriptor), /* export = */ false); -+ super.visitMultiANewArrayInsn(descriptor, numDimensions); -+ } -+ -+ @Override -+ public void visitTryCatchBlock( -+ final Label start, final Label end, final Label handler, final String type) { -+ if (type != null) { -+ addPackageReferences(Type.getObjectType(type), /* export = */ false); -+ } -+ super.visitTryCatchBlock(start, end, handler, type); -+ } - }; - } -+ -+ private void addPackageReferences(final Type type, final boolean export) { -+ switch (type.getSort()) { -+ case Type.ARRAY: -+ addPackageReferences(type.getElementType(), export); -+ break; -+ case Type.METHOD: -+ for (Type argumentType : type.getArgumentTypes()) { -+ addPackageReferences(argumentType, export); -+ } -+ addPackageReferences(type.getReturnType(), export); -+ break; -+ case Type.OBJECT: -+ String internalName = type.getInternalName(); -+ int lastSlashIndex = internalName.lastIndexOf('/'); -+ if (lastSlashIndex != -1) { -+ (export ? exports : imports).add(internalName.substring(0, lastSlashIndex)); -+ } -+ break; -+ default: -+ break; -+ } -+ } - } - - /** -@@ -199,18 +379,18 @@ public class Retrofitter { - */ - class ClassVerifier extends ClassVisitor { - -- /** The name of the visited class. */ -+ /** The internal name of the visited class. */ - String className; - - /** The name of the currently visited method. */ - String currentMethodName; - -- public ClassVerifier(final ClassVisitor classVisitor) { -+ public ClassVerifier() { - // Make sure use we don't use Java 9 or higher classfile features. - // We also want to make sure we don't use Java 6, 7 or 8 classfile - // features (invokedynamic), but this can't be done in the same way. - // Instead, we use manual checks below. -- super(Opcodes.ASM4, classVisitor); -+ super(Opcodes.ASM4, null); - } - - @Override -@@ -222,10 +402,9 @@ public class Retrofitter { - final String superName, - final String[] interfaces) { - if ((version & 0xFFFF) > Opcodes.V1_5) { -- throw new IllegalArgumentException("ERROR: " + name + " version is newer than 1.5"); -+ throw new IllegalArgumentException(format("ERROR: %d version is newer than 1.5", version)); - } - className = name; -- super.visit(version, access, name, signature, superName, interfaces); - } - - @Override -@@ -243,7 +422,6 @@ public class Retrofitter { - public void visitFieldInsn( - final int opcode, final String owner, final String name, final String descriptor) { - check(owner, name); -- super.visitFieldInsn(opcode, owner, name, descriptor); - } - - @Override -@@ -254,7 +432,6 @@ public class Retrofitter { - final String descriptor, - final boolean isInterface) { - check(owner, name + descriptor); -- super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); - } - - @Override -@@ -263,21 +440,16 @@ public class Retrofitter { - int sort = ((Type) value).getSort(); - if (sort == Type.METHOD) { - throw new IllegalArgumentException( -- "ERROR: ldc with a MethodType called in " -- + className -- + ' ' -- + currentMethodName -- + " is not available in JDK 1.5"); -+ format( -+ "ERROR: ldc with a MethodType called in %s %s is not available in JDK 1.5", -+ className, currentMethodName)); - } - } else if (value instanceof Handle) { - throw new IllegalArgumentException( -- "ERROR: ldc with a MethodHandle called in " -- + className -- + ' ' -- + currentMethodName -- + " is not available in JDK 1.5"); -+ format( -+ "ERROR: ldc with a MethodHandle called in %s %s is not available in JDK 1.5", -+ className, currentMethodName)); - } -- super.visitLdcInsn(value); - } - - @Override -@@ -287,11 +459,9 @@ public class Retrofitter { - final Handle bootstrapMethodHandle, - final Object... bootstrapMethodArguments) { - throw new IllegalArgumentException( -- "ERROR: invokedynamic called in " -- + className -- + ' ' -- + currentMethodName -- + " is not available in JDK 1.5"); -+ format( -+ "ERROR: invokedynamic called in %s %s is not available in JDK 1.5", -+ className, currentMethodName)); - } - }; - } -@@ -302,7 +472,7 @@ public class Retrofitter { - * @param owner A class name. - * @param member A field name or a method name and descriptor. - */ -- void check(final String owner, final String member) { -+ private void check(final String owner, final String member) { - if (owner.startsWith("java/")) { - String currentOwner = owner; - while (currentOwner != null) { -@@ -312,15 +482,9 @@ public class Retrofitter { - currentOwner = jdkHierarchy.get(currentOwner); - } - throw new IllegalArgumentException( -- "ERROR: " -- + owner -- + ' ' -- + member -- + " called in " -- + className -- + ' ' -- + currentMethodName -- + " is not defined in the JDK 1.5 API"); -+ format( -+ "ERROR: %s %s called in %s %s is not defined in the JDK 1.5 API", -+ owner, member, className, currentMethodName)); - } - } - } --- -2.37.1 - diff --git a/0002-Replace-slash-for-dot-in-generated-module-infos.patch b/0002-Replace-slash-for-dot-in-generated-module-infos.patch deleted file mode 100644 index 3b7faba..0000000 --- a/0002-Replace-slash-for-dot-in-generated-module-infos.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b4a0366b3c17fcc0d8187cffbcdd2e1bd61ab0fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= -Date: Fri, 2 Sep 2022 09:41:23 +0200 -Subject: [PATCH] Replace slash for dot in generated module infos - -Forwarded: no - ---- - .../src/main/java/org/objectweb/asm/tools/Retrofitter.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java -index b3d51e63..43002cea 100644 ---- a/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java -+++ b/tools/retrofitter/src/main/java/org/objectweb/asm/tools/Retrofitter.java -@@ -187,7 +187,7 @@ public class Retrofitter { - throw new IllegalArgumentException("Module name can't be infered from classes"); - } - ModuleVisitor moduleVisitor = -- classWriter.visitModule(moduleNames.get(0), Opcodes.ACC_OPEN, version); -+ classWriter.visitModule(moduleNames.get(0).replace('/', '.'), Opcodes.ACC_OPEN, version); - - for (String importName : imports) { - if (isAsmModule(importName) && !exports.contains(importName)) { --- -2.37.2 - diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 0e25897..bdbb0f9 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.3 -Release: 5%{?dist} +Version: 9.4 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -22,16 +22,6 @@ Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/a Source9: generate-tarball.sh Source10: tools-retrofitter.pom -# This patch makes it possible to generate module-info.class files without -# needing to use bnd-maven-plugin during the build. The replacement is an added -# main method that has to be invoked manually. -# Patch already applied in upstream master -# https://gitlab.ow2.org/asm/asm/-/commit/5921eb2a141f0dcc83c6a5d7dcd5035a30c5edfc -Patch1: 0001-Generate-the-module-info-classes-without-Bnd.-Delete.patch - -# Attempted fix for: https://gitlab.ow2.org/asm/asm/-/issues/317983 -Patch2: 0002-Replace-slash-for-dot-in-generated-module-infos.patch - %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -60,9 +50,6 @@ This package provides %{summary}. %prep %setup -q -%patch1 -p1 -%patch2 -p1 - # A custom pom to aggregate the build cp -p %{SOURCE1} pom.xml @@ -100,6 +87,9 @@ done %license LICENSE.txt %changelog +* Thu Feb 23 2023 Marian Koncek - 9.4-1 +- Update to upstream version 9.4 + * Thu Jan 19 2023 Fedora Release Engineering - 9.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index e89e1c4..cd07e26 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.3.tar.gz) = ec23e717f17789fee264a6a08b3d52c2ec46d39270b38e0804ea18f1abebdddc738c7ff788d2ab348af8345b41c827021dec4e843b18ede04965eac77697e72b -SHA512 (asm-9.3.pom) = a354aaa4a45f6e6c3d24e28b8a9e4490bd0a5e43a33a45dd712daefaab33a65f45cd9ae11d57e38c45082053efbe03e6ab7d5c3882d50f1e6a5d6984f477ce86 -SHA512 (asm-analysis-9.3.pom) = e32fd3696ac4770f109a4abaf38e56cb4c8ad4f5131f8d24ff54505798279593c602402363c18b580f5453717a35fc7820fbe18e3b34ed780aa0c7025087d8cd -SHA512 (asm-commons-9.3.pom) = 1446c1528e07110c5a5894365c5c84063d264ec833532d894e3238bdb027f98a72398bc763fb89785a6f757e1d195f2934505ab63f75eb4538532fbed1ef0af9 -SHA512 (asm-test-9.3.pom) = 6c99662ac0701653dc76619e651ed3969c20ccd92a3f61eda9f785cceae446e6a4cf74e67f90835125719ce220d0639887f3047525c697203f3804e27dae8ff0 -SHA512 (asm-tree-9.3.pom) = f066513d4dba672edc85e9b457d827c16d55a321cb02f4f5faf6e02f59594c44fe3eae23006e6a7310151ff88ea53e654e27fdced6b0af85dcb24ab276279ca2 -SHA512 (asm-util-9.3.pom) = 283675d07165cd635d0417eed078be18aae09ec8960e370d5d56b5b7845d74e150330f21e4610c0c4ca391843d7dd21bcd341604763924f102d65875df8ff927 +SHA512 (objectweb-asm-9.4.tar.gz) = 33f45238f5d029f08bb1093388333e8e6a33f5dd29660eee2986a73f2965d3a732cc99e05b6fd96d7e9b11385e6d008846bf55fdd933496b5c3f579e03d83d92 +SHA512 (asm-9.4.pom) = 711c595da7e141d5a6ee6b63d574abc752679363c8ea1068db4acba9a34723500cc02c573883d87edfe2a33654506e77a9f59c957c337bbc34f7b32008d1ef48 +SHA512 (asm-analysis-9.4.pom) = 28489b2496cfefcd20a900bd4d107969c7dfeba8da5156f3bf487504ce563fe89d5aa6c871e0d610cfc5f9f21d5762339645da6841776175b85256b7feee4681 +SHA512 (asm-commons-9.4.pom) = 2c7103334bf26e5881ffcee948edb99e4694cd5794762d683d15b78c330b8bea61e5379a7dfc156685b93c8f070c13eaf34b5d6440012584c76255867ae618ea +SHA512 (asm-test-9.4.pom) = 2d427d54223769a1b57ddaee687ec2dc531a8504ba93607cfef86aa7aa1053caa19946b6da7feb7ab3ac212556f8f2b560d76cff71245d4826608cece436626a +SHA512 (asm-tree-9.4.pom) = 52f75f8d5fa2eb7af9e0e96d6c834bf131461d12db0a01d01c53d63edf10c6d33a8355cea58326a0c5f09ca948d946cc05906a9a745757553471a2719d8f3dc5 +SHA512 (asm-util-9.4.pom) = 99de2d813a29d812de45763a01e59f5bbe2ad44503afdbecc311119eeece9bd6d8afc587c22e6f12958f155ebcd08534e75d3f53947f81d276052de2791dd57a From 02920f8b46f62d0d3e999a1066d5c1c0ca66eac5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 5 Jun 2023 12:45:35 +0200 Subject: [PATCH 094/121] Update to upstream version 9.5 --- .gitignore | 6 ++++++ objectweb-asm.spec | 5 ++++- sources | 14 +++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9c6a2d3..d02a20b 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,9 @@ /asm-test-9.4.pom /asm-tree-9.4.pom /asm-util-9.4.pom +/asm-9.5.pom +/asm-analysis-9.5.pom +/asm-commons-9.5.pom +/asm-test-9.5.pom +/asm-tree-9.5.pom +/asm-util-9.5.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index bdbb0f9..e681fb7 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.4 +Version: 9.5 Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD @@ -87,6 +87,9 @@ done %license LICENSE.txt %changelog +* Mon Jun 05 2023 Marian Koncek - 9.5-1 +- Update to upstream version 9.5 + * Thu Feb 23 2023 Marian Koncek - 9.4-1 - Update to upstream version 9.4 diff --git a/sources b/sources index cd07e26..9484e05 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.4.tar.gz) = 33f45238f5d029f08bb1093388333e8e6a33f5dd29660eee2986a73f2965d3a732cc99e05b6fd96d7e9b11385e6d008846bf55fdd933496b5c3f579e03d83d92 -SHA512 (asm-9.4.pom) = 711c595da7e141d5a6ee6b63d574abc752679363c8ea1068db4acba9a34723500cc02c573883d87edfe2a33654506e77a9f59c957c337bbc34f7b32008d1ef48 -SHA512 (asm-analysis-9.4.pom) = 28489b2496cfefcd20a900bd4d107969c7dfeba8da5156f3bf487504ce563fe89d5aa6c871e0d610cfc5f9f21d5762339645da6841776175b85256b7feee4681 -SHA512 (asm-commons-9.4.pom) = 2c7103334bf26e5881ffcee948edb99e4694cd5794762d683d15b78c330b8bea61e5379a7dfc156685b93c8f070c13eaf34b5d6440012584c76255867ae618ea -SHA512 (asm-test-9.4.pom) = 2d427d54223769a1b57ddaee687ec2dc531a8504ba93607cfef86aa7aa1053caa19946b6da7feb7ab3ac212556f8f2b560d76cff71245d4826608cece436626a -SHA512 (asm-tree-9.4.pom) = 52f75f8d5fa2eb7af9e0e96d6c834bf131461d12db0a01d01c53d63edf10c6d33a8355cea58326a0c5f09ca948d946cc05906a9a745757553471a2719d8f3dc5 -SHA512 (asm-util-9.4.pom) = 99de2d813a29d812de45763a01e59f5bbe2ad44503afdbecc311119eeece9bd6d8afc587c22e6f12958f155ebcd08534e75d3f53947f81d276052de2791dd57a +SHA512 (objectweb-asm-9.5.tar.gz) = 7bb4ae4f338fae691a4814afd87cb0791fb67a07f895b12c06a848fb890bf914f94491bb076d3046e8ac8d033271e7f01229fcaf9d662269106401b1adaf8ac3 +SHA512 (asm-9.5.pom) = b6ea03bf7fb679e9335d4ed3e9789b7f8e33d284e09406073558c8b46042e08270723cbc03a947ea905ad19eb0c095adfcb760f7413f3a327c9b439a564dae47 +SHA512 (asm-analysis-9.5.pom) = 496a487954eded9b9a77b0b68a261b3545aa9121fa7f2230435924e4c0d263dc81dded368c9eda51acb1298455df50e879df5cbced2049b2bf9f2b3e4818c167 +SHA512 (asm-commons-9.5.pom) = 6c2602836de91bc9e83dc07dd3a50807c75f1589c5501d858cfc6ebe7dffdc44036877a96c058936c977abdc29f1e6570ab2af4a84564e916799adc93ad92d64 +SHA512 (asm-test-9.5.pom) = 9f4bf361a8307f994da0ec069ca49a11325f2dff213244c49003a85b7e7ded77cf4464732f3b9f2e712ed164377264e01592546445c956fcee3bd4183b8a1cee +SHA512 (asm-tree-9.5.pom) = 03e90d6fc778cd40d360df26de6a7f18cc6039d72f19b73669cbea4b6e68013df681cd83298c2a4abda825203e39831c97b41f6fbc200d32d8435b4212465ebc +SHA512 (asm-util-9.5.pom) = 693a18baa2a10656c4bac04958b8e4911a7055338c1ef0f6499f335fec09761f98a573690bf5e862944b26fd1a0fe7dcf1e341f9c2ce34bc94f408221ff8a8a5 From c54a17c4a1ebaf9ed85b4551a01cac4b71973717 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:05:19 +0000 Subject: [PATCH 095/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index e681fb7..6e05661 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD URL: https://asm.ow2.org/ @@ -87,6 +87,9 @@ done %license LICENSE.txt %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 05 2023 Marian Koncek - 9.5-1 - Update to upstream version 9.5 From bf2574cbb04a162558c326ae53eac8bbfd08d7e0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:49:28 +0200 Subject: [PATCH 096/121] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- objectweb-asm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 6e05661..a2fa85b 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,9 +2,9 @@ Name: objectweb-asm Version: 9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework -License: BSD +License: BSD-3-Clause URL: https://asm.ow2.org/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -87,6 +87,9 @@ done %license LICENSE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 9.5-3 +- Convert License tag to SPDX format + * Thu Jul 20 2023 Fedora Release Engineering - 9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 53e5053675584e7276e0aa60e9322e2ec281e5c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 097/121] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From b2b5372547953e1d95a57668e4b85e253622aaba Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 11 Dec 2023 14:58:02 +0100 Subject: [PATCH 098/121] Update to upstream version 9.6 --- .gitignore | 6 ++++++ objectweb-asm.spec | 9 +++++++-- sources | 14 +++++++------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index d02a20b..b42cfb9 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,9 @@ /asm-test-9.5.pom /asm-tree-9.5.pom /asm-util-9.5.pom +/asm-9.6.pom +/asm-analysis-9.6.pom +/asm-commons-9.6.pom +/asm-test-9.6.pom +/asm-tree-9.6.pom +/asm-util-9.6.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index a2fa85b..0671368 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.5 -Release: 3%{?dist} +Version: 9.6 +Release: 1%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause URL: https://asm.ow2.org/ @@ -64,6 +64,8 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do %pom_xpath_inject pom:parent '..' ${pom} done +%pom_add_dep org.ow2.asm:asm-tree:%{version} asm-analysis + # Don't ship poms used for build only %mvn_package :aggregator __noinstall %mvn_package :tools-retrofitter __noinstall @@ -87,6 +89,9 @@ done %license LICENSE.txt %changelog +* Mon Dec 11 2023 Marian Koncek - 9.6-1 +- Update to upstream version 9.6 + * Fri Sep 01 2023 Mikolaj Izdebski - 9.5-3 - Convert License tag to SPDX format diff --git a/sources b/sources index 9484e05..7ab1573 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.5.tar.gz) = 7bb4ae4f338fae691a4814afd87cb0791fb67a07f895b12c06a848fb890bf914f94491bb076d3046e8ac8d033271e7f01229fcaf9d662269106401b1adaf8ac3 -SHA512 (asm-9.5.pom) = b6ea03bf7fb679e9335d4ed3e9789b7f8e33d284e09406073558c8b46042e08270723cbc03a947ea905ad19eb0c095adfcb760f7413f3a327c9b439a564dae47 -SHA512 (asm-analysis-9.5.pom) = 496a487954eded9b9a77b0b68a261b3545aa9121fa7f2230435924e4c0d263dc81dded368c9eda51acb1298455df50e879df5cbced2049b2bf9f2b3e4818c167 -SHA512 (asm-commons-9.5.pom) = 6c2602836de91bc9e83dc07dd3a50807c75f1589c5501d858cfc6ebe7dffdc44036877a96c058936c977abdc29f1e6570ab2af4a84564e916799adc93ad92d64 -SHA512 (asm-test-9.5.pom) = 9f4bf361a8307f994da0ec069ca49a11325f2dff213244c49003a85b7e7ded77cf4464732f3b9f2e712ed164377264e01592546445c956fcee3bd4183b8a1cee -SHA512 (asm-tree-9.5.pom) = 03e90d6fc778cd40d360df26de6a7f18cc6039d72f19b73669cbea4b6e68013df681cd83298c2a4abda825203e39831c97b41f6fbc200d32d8435b4212465ebc -SHA512 (asm-util-9.5.pom) = 693a18baa2a10656c4bac04958b8e4911a7055338c1ef0f6499f335fec09761f98a573690bf5e862944b26fd1a0fe7dcf1e341f9c2ce34bc94f408221ff8a8a5 +SHA512 (objectweb-asm-9.6.tar.gz) = ba2df9d7a74527892c1b42ce2b7b6df4e6eda6810d0560a482cd1ba61f3a77d6e14e54d1f2436935fd1269b7c39a27734b875dc3933231a8f144ad1b9dd9d0ba +SHA512 (asm-9.6.pom) = 5dd8959a84442b271be1861110d065a991e7fdacd7298f4cdda4faf8580cfcf6703285cf17736b30aa95ce81edae40f5c2b845f39d92cf31823907bd1b7d1b7c +SHA512 (asm-analysis-9.6.pom) = 8f6a9dc6037cd19d92f5d4a0527cf1cd25d6f16e1b51cb1142f430be62a9405f6c2bf550c13acb3abe0e5ad3e4e4b1f71dac80d5ceddec03d4503bb7abef7edd +SHA512 (asm-commons-9.6.pom) = 4bc1148607c5e12f1ab0873f2651dfc6521113d4edfae2b23b8543aff040f2a0011f4770bb22c01ac512520a50cd9e6e43ac7cbb2e3a20d28172cab81117f7b2 +SHA512 (asm-test-9.6.pom) = 473db827e2a61a2e58b85baec18e7abf7d6279d35abfb054eb3ea9f1346b5faeeff18e01f47de8e62aebcd01a4b0f7e4ca3094fd8c3782673cbaaf0b60a9a26a +SHA512 (asm-tree-9.6.pom) = fe590914903a128f1ade2ecc990d161a08bf6fcd9988f7f19a0b99b1d45b0391c0b5d717a21e5668d52f368df85dca165e30739b5cf88473c4d0152401f3a4d8 +SHA512 (asm-util-9.6.pom) = cab3a25a6b744c7f3501ea28c12eda34a7e0707ee1e2005a919b7b137139b0757e00a1f01f0e468373a6dd53410700ef1041b1e6315ee65717372dd950d6cf82 From a9fdd9e0333c1974a9dfaf890ea69ee8be398851 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:06:02 +0000 Subject: [PATCH 099/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 0671368..070f52f 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause URL: https://asm.ow2.org/ @@ -89,6 +89,9 @@ done %license LICENSE.txt %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 11 2023 Marian Koncek - 9.6-1 - Update to upstream version 9.6 From 8ec8a40225d43f000df81b4d92ce034b4edbf900 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:39:21 +0000 Subject: [PATCH 100/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 070f52f..7379168 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause URL: https://asm.ow2.org/ @@ -89,6 +89,9 @@ done %license LICENSE.txt %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 9.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c77875267b3db320a4ef0d7f5ee469ba5827ab93 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:33:02 +0100 Subject: [PATCH 101/121] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 7379168..05151ad 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause URL: https://asm.ow2.org/ @@ -89,6 +89,9 @@ done %license LICENSE.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 9.6-4 +- bump of release for for java-21-openjdk as system jdk + * Thu Jan 25 2024 Fedora Release Engineering - 9.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5dc6bf7550ee4bd2a59e5e876fa272e33006bd60 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:30:06 +0100 Subject: [PATCH 102/121] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 05151ad..1564cc4 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause URL: https://asm.ow2.org/ @@ -89,6 +89,9 @@ done %license LICENSE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 9.6-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 9.6-4 - bump of release for for java-21-openjdk as system jdk From 3d439650c6088cd548db962b63be93685b5bb78a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:56:15 +0000 Subject: [PATCH 103/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- objectweb-asm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 1564cc4..e702da0 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause URL: https://asm.ow2.org/ @@ -89,6 +89,9 @@ done %license LICENSE.txt %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 9.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 9.6-5 - Rebuilt for java-21-openjdk as system jdk From f57c95f4c2b46feaaedb03f8989e834e71be2e0b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 104/121] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From d154cfdc3fc6039df910b8c7a34ef150efedafd4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 105/121] Switch from %setup to %autosetup --- objectweb-asm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index e702da0..8508510 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -48,7 +48,7 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q +%autosetup -p1 -C # A custom pom to aggregate the build cp -p %{SOURCE1} pom.xml From 39bb44826202e5762a141ad2e0d345cb4b1bf65a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:16 +0200 Subject: [PATCH 106/121] Convert to %autorelease and %autochangelog --- changelog | 309 ++++++++++++++++++++++++++++++++++++++++++++ objectweb-asm.spec | 312 +-------------------------------------------- 2 files changed, 311 insertions(+), 310 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..2f5cd2a --- /dev/null +++ b/changelog @@ -0,0 +1,309 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 9.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 9.6-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 9.6-4 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 11 2023 Marian Koncek - 9.6-1 +- Update to upstream version 9.6 + +* Fri Sep 01 2023 Mikolaj Izdebski - 9.5-3 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 05 2023 Marian Koncek - 9.5-1 +- Update to upstream version 9.5 + +* Thu Feb 23 2023 Marian Koncek - 9.4-1 +- Update to upstream version 9.4 + +* Thu Jan 19 2023 Fedora Release Engineering - 9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Sep 02 2022 Marian Koncek - 9.3-4 +- Fix wrong generated module infos + +* Mon Aug 29 2022 Marian Koncek - 9.3-3 +- Generate module-info without bnd-plugin +- Resolves: rhbz#2106272 + +* Fri Jul 22 2022 Fedora Release Engineering - 9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 09 2022 Mikolaj Izdebski - 9.3-1 +- Update to upstream version 9.3 + +* Sat Feb 05 2022 Jiri Vanek - 9.2-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 9.2-1 +- Update to upstream version 9.2 + +* Thu Jul 22 2021 Fedora Release Engineering - 9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 9.1-2 +- Bootstrap build +- Non-bootstrap build + +* Fri May 14 2021 Marian Koncek - 9.1-1 +- Update to upstream version 9.1 + +* Fri Feb 19 2021 Mat Booth - 9.1-1 +- Update to latest upstream release + +* Tue Jan 26 2021 Fedora Release Engineering - 8.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 25 2020 Marian Koncek - 9.0-1 +- Update to upstream version 9.0 + +* Fri Aug 14 2020 Jerry James - 8.0.1-1 +- Version 8.0.1 +- Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test +- Make generate-tarball.sh actually compress the tarball + +* Tue Jul 28 2020 Fedora Release Engineering - 7.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 7.3.1-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jun 22 2020 Marian Koncek - 8.0.1-1 +- Update to upstream version 8.0.1 + +* Wed May 06 2020 Mat Booth - 7.3.1-2 +- Revert an upstream change to prevent breaking API change + +* Thu Feb 27 2020 Jayashree Huttanagoudat - 7.3.1-1 +- Upgraded to upstream version 7.3.1. + +* Wed Jan 29 2020 Fedora Release Engineering - 7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 21 2020 Marian Koncek - 7.3.1-1 +- Update to upstream version 7.3.1 + +* Tue Nov 05 2019 Mikolaj Izdebski - 7.2-2 +- Mass rebuild for javapackages-tools 201902 + +* Thu Oct 17 2019 Marian Koncek - 7.2-1 +- Update to upstream version 7.2 + +* Thu Jul 25 2019 Fedora Release Engineering - 7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 7.1-2 +- Mass rebuild for javapackages-tools 201901 + +* Mon May 06 2019 Severin Gehwolf - 7.1-1 +- Update to latest upstream 7.1 release. + +* Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Nov 21 2018 Severin Gehwolf - 7.0-1 +- Update to latest upstream 7.0 release. +- Removes package asm-xml (deprecated since 6.1). + +* Tue Sep 11 2018 Mat Booth - 6.2.1-1 +- Update to latest upstream release +- Fix test suite execution + +* Fri Aug 03 2018 Michael Simacek - 6.2-5 +- Repack the tarball without binaries + +* Wed Aug 01 2018 Severin Gehwolf - 6.2-4 +- Explicitly require javapackages-tools for asm-processor script + which uses java-functions. + +* Wed Aug 01 2018 Severin Gehwolf - 6.2-3 +- Allow conditionally building without OSGi + metadata. + +* Fri Jul 13 2018 Fedora Release Engineering - 6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Michael Simacek - 6.2-1 +- Update to upstream version 6.2 + +* Sat Jun 30 2018 Mikolaj Izdebski - 6.1.1-4 +- Relax versioned self-build-requirement a bit + +* Fri Jun 29 2018 Mikolaj Izdebski - 6.1.1-3 +- Add objectweb-asm to BND pluginpath + +* Thu Jun 28 2018 Mikolaj Izdebski - 6.1.1-2 +- Allow conditionally building without junit5 + +* Wed Apr 25 2018 Mat Booth - 6.1.1-1 +- Update to latest upstream relase for Java 10 support +- Switch to maven build +- Now executing test suites + +* Thu Feb 08 2018 Fedora Release Engineering - 6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 25 2017 Michael Simacek - 6.0-1 +- Update to upstream version 6.0 + +* Tue Sep 12 2017 Mikolaj Izdebski - 6.0-0.2.beta +- Fix invalid OSGi metadata +- Resolves: rhbz#1490817 + +* Mon Sep 11 2017 Mikolaj Izdebski - 6.0-0.1.beta +- Update to upstream version 6.0 beta + +* Thu Jul 27 2017 Fedora Release Engineering - 5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Oct 10 2016 Mikolaj Izdebski - 5.1-6 +- Use OSGi API JARs to run BND classpath, instead of Eclipse + +* Sat Sep 24 2016 Mikolaj Izdebski - 5.1-5 +- Update to current packaging guidelines +- Remove obsoletes and provides for objectweb-asm4 + +* Wed Jun 15 2016 Mikolaj Izdebski - 5.1-4 +- Add missing build-requires + +* Wed Jun 1 2016 Mikolaj Izdebski - 5.1-3 +- Avoid calling XMvn from build-classpath + +* Tue May 31 2016 Mikolaj Izdebski - 5.1-2 +- Add missing JARs to BND classpath + +* Thu Mar 24 2016 Mikolaj Izdebski - 5.1-1 +- Update to upstream version 5.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Aug 06 2015 Michael Simacek - 5.0.4-1 +- Update to upstream version 5.0.4 + +* Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 +- Update to upstream version 5.0.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 +- Update to upstream version 5.0.2 + +* Mon Apr 14 2014 Mat Booth - 5.0.1-2 +- SCL-ize package. +- Fix bogus dates in changelog. + +* Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 +- Update to upstream version 5.0.1 + +* Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta +- Enable asm-debug-all module + +* Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta +- Remove Eclipse Orbit alias + +* Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta +- Update to 5.0 beta + +* Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 +- Make jetty orbit depmap point to asm-all jar +- Resolves: rhbz#917625 + +* Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 +- Add depmap for org.eclipse.jetty.orbit +- Resolves: rhbz#917625 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 +- Use poms produced by the build not foreign ones. +- Adpat to current guidelines. + +* Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 +- Upgrade to 3.3.1 + +* Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 +- Change depmap parent id to asm (bug #606659) + +* Thu Apr 15 2010 Fernando Nasser 0:3.2.1 +- Upgrade to 3.2 + +* Sat Jul 25 2009 Fedora Release Engineering - 0:3.1-7.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:3.1-6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Oct 23 2008 David Walluck 0:3.1-5.1 +- build for Fedora + +* Thu Oct 23 2008 David Walluck 0:3.1-5 +- add OSGi manifest (Alexander Kurtakov) + +* Mon Oct 20 2008 David Walluck 0:3.1-4 +- remove Class-Path from MANIFEST.MF +- add unversioned javadoc symlink +- remove javadoc scriptlets +- fix directory ownership +- remove build requirement on dos2unix + +* Fri Feb 08 2008 Ralph Apel - 0:3.1-3jpp +- Add poms and depmap frags with groupId of org.objectweb.asm ! +- Add asm-all.jar +- Add -javadoc Requires post and postun +- Restore Vendor, Distribution + +* Thu Nov 22 2007 Fernando Nasser - 0:3.1-2jpp +- Fix EOL of txt files +- Add dependency on jaxp + +* Thu Nov 22 2007 Fernando Nasser - 0:3.1-1jpp +- Upgrade to 3.1 + +* Wed Aug 22 2007 Fernando Nasser - 0:3.0-1jpp +- Upgrade to 3.0 +- Rename to include objectweb- prefix as requested by ObjectWeb + +* Thu Jan 05 2006 Fernando Nasser - 0:2.1-2jpp +- First JPP 1.7 build + +* Thu Oct 06 2005 Ralph Apel 0:2.1-1jpp +- Upgrade to 2.1 + +* Fri Mar 11 2005 Sebastiano Vigna 0:2.0.RC1-1jpp +- First release of the 2.0 line. diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 8508510..79a3aa2 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -2,7 +2,7 @@ Name: objectweb-asm Version: 9.6 -Release: 6%{?dist} +Release: %autorelease Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause URL: https://asm.ow2.org/ @@ -89,312 +89,4 @@ done %license LICENSE.txt %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 9.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 9.6-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 9.6-4 -- bump of release for for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 9.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 9.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 11 2023 Marian Koncek - 9.6-1 -- Update to upstream version 9.6 - -* Fri Sep 01 2023 Mikolaj Izdebski - 9.5-3 -- Convert License tag to SPDX format - -* Thu Jul 20 2023 Fedora Release Engineering - 9.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 05 2023 Marian Koncek - 9.5-1 -- Update to upstream version 9.5 - -* Thu Feb 23 2023 Marian Koncek - 9.4-1 -- Update to upstream version 9.4 - -* Thu Jan 19 2023 Fedora Release Engineering - 9.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Sep 02 2022 Marian Koncek - 9.3-4 -- Fix wrong generated module infos - -* Mon Aug 29 2022 Marian Koncek - 9.3-3 -- Generate module-info without bnd-plugin -- Resolves: rhbz#2106272 - -* Fri Jul 22 2022 Fedora Release Engineering - 9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon May 09 2022 Mikolaj Izdebski - 9.3-1 -- Update to upstream version 9.3 - -* Sat Feb 05 2022 Jiri Vanek - 9.2-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 9.2-1 -- Update to upstream version 9.2 - -* Thu Jul 22 2021 Fedora Release Engineering - 9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 9.1-2 -- Bootstrap build -- Non-bootstrap build - -* Fri May 14 2021 Marian Koncek - 9.1-1 -- Update to upstream version 9.1 - -* Fri Feb 19 2021 Mat Booth - 9.1-1 -- Update to latest upstream release - -* Tue Jan 26 2021 Fedora Release Engineering - 8.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Sep 25 2020 Marian Koncek - 9.0-1 -- Update to upstream version 9.0 - -* Fri Aug 14 2020 Jerry James - 8.0.1-1 -- Version 8.0.1 -- Add 0002-Catch-CompileException-in-test.patch to fix compilation of a test -- Make generate-tarball.sh actually compress the tarball - -* Tue Jul 28 2020 Fedora Release Engineering - 7.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 7.3.1-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Jun 22 2020 Marian Koncek - 8.0.1-1 -- Update to upstream version 8.0.1 - -* Wed May 06 2020 Mat Booth - 7.3.1-2 -- Revert an upstream change to prevent breaking API change - -* Thu Feb 27 2020 Jayashree Huttanagoudat - 7.3.1-1 -- Upgraded to upstream version 7.3.1. - -* Wed Jan 29 2020 Fedora Release Engineering - 7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 21 2020 Marian Koncek - 7.3.1-1 -- Update to upstream version 7.3.1 - -* Tue Nov 05 2019 Mikolaj Izdebski - 7.2-2 -- Mass rebuild for javapackages-tools 201902 - -* Thu Oct 17 2019 Marian Koncek - 7.2-1 -- Update to upstream version 7.2 - -* Thu Jul 25 2019 Fedora Release Engineering - 7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 7.1-2 -- Mass rebuild for javapackages-tools 201901 - -* Mon May 06 2019 Severin Gehwolf - 7.1-1 -- Update to latest upstream 7.1 release. - -* Fri Feb 01 2019 Fedora Release Engineering - 7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 21 2018 Severin Gehwolf - 7.0-1 -- Update to latest upstream 7.0 release. -- Removes package asm-xml (deprecated since 6.1). - -* Tue Sep 11 2018 Mat Booth - 6.2.1-1 -- Update to latest upstream release -- Fix test suite execution - -* Fri Aug 03 2018 Michael Simacek - 6.2-5 -- Repack the tarball without binaries - -* Wed Aug 01 2018 Severin Gehwolf - 6.2-4 -- Explicitly require javapackages-tools for asm-processor script - which uses java-functions. - -* Wed Aug 01 2018 Severin Gehwolf - 6.2-3 -- Allow conditionally building without OSGi - metadata. - -* Fri Jul 13 2018 Fedora Release Engineering - 6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Michael Simacek - 6.2-1 -- Update to upstream version 6.2 - -* Sat Jun 30 2018 Mikolaj Izdebski - 6.1.1-4 -- Relax versioned self-build-requirement a bit - -* Fri Jun 29 2018 Mikolaj Izdebski - 6.1.1-3 -- Add objectweb-asm to BND pluginpath - -* Thu Jun 28 2018 Mikolaj Izdebski - 6.1.1-2 -- Allow conditionally building without junit5 - -* Wed Apr 25 2018 Mat Booth - 6.1.1-1 -- Update to latest upstream relase for Java 10 support -- Switch to maven build -- Now executing test suites - -* Thu Feb 08 2018 Fedora Release Engineering - 6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 25 2017 Michael Simacek - 6.0-1 -- Update to upstream version 6.0 - -* Tue Sep 12 2017 Mikolaj Izdebski - 6.0-0.2.beta -- Fix invalid OSGi metadata -- Resolves: rhbz#1490817 - -* Mon Sep 11 2017 Mikolaj Izdebski - 6.0-0.1.beta -- Update to upstream version 6.0 beta - -* Thu Jul 27 2017 Fedora Release Engineering - 5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 5.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 10 2016 Mikolaj Izdebski - 5.1-6 -- Use OSGi API JARs to run BND classpath, instead of Eclipse - -* Sat Sep 24 2016 Mikolaj Izdebski - 5.1-5 -- Update to current packaging guidelines -- Remove obsoletes and provides for objectweb-asm4 - -* Wed Jun 15 2016 Mikolaj Izdebski - 5.1-4 -- Add missing build-requires - -* Wed Jun 1 2016 Mikolaj Izdebski - 5.1-3 -- Avoid calling XMvn from build-classpath - -* Tue May 31 2016 Mikolaj Izdebski - 5.1-2 -- Add missing JARs to BND classpath - -* Thu Mar 24 2016 Mikolaj Izdebski - 5.1-1 -- Update to upstream version 5.1 - -* Thu Feb 04 2016 Fedora Release Engineering - 5.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Aug 06 2015 Michael Simacek - 5.0.4-1 -- Update to upstream version 5.0.4 - -* Wed Jun 17 2015 Fedora Release Engineering - 5.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jul 20 2014 Mikolaj Izdebski - 5.0.3-1 -- Update to upstream version 5.0.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 5.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 5 2014 Mikolaj Izdebski - 5.0.2-1 -- Update to upstream version 5.0.2 - -* Mon Apr 14 2014 Mat Booth - 5.0.1-2 -- SCL-ize package. -- Fix bogus dates in changelog. - -* Mon Mar 24 2014 Mikolaj Izdebski - 5.0.1-1 -- Update to upstream version 5.0.1 - -* Wed Mar 19 2014 Mikolaj Izdebski - 5.0-0.3.beta -- Enable asm-debug-all module - -* Mon Jan 20 2014 Mikolaj Izdebski - 5.0-0.2.beta -- Remove Eclipse Orbit alias - -* Tue Dec 3 2013 Mikolaj Izdebski - 5.0-0.1.beta -- Update to 5.0 beta - -* Sat Aug 03 2013 Fedora Release Engineering - 0:3.3.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Mar 6 2013 Mikolaj Izdebski - 0:3.3.1-7 -- Make jetty orbit depmap point to asm-all jar -- Resolves: rhbz#917625 - -* Mon Mar 4 2013 Mikolaj Izdebski - 0:3.3.1-6 -- Add depmap for org.eclipse.jetty.orbit -- Resolves: rhbz#917625 - -* Thu Feb 14 2013 Fedora Release Engineering - 0:3.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Fedora Release Engineering - 0:3.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0:3.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Sep 16 2011 Alexander Kurtakov 0:3.3.1-2 -- Use poms produced by the build not foreign ones. -- Adpat to current guidelines. - -* Mon Apr 04 2011 Chris Aniszczyk 0:3.3.1 -- Upgrade to 3.3.1 - -* Tue Feb 08 2011 Fedora Release Engineering - 0:3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jul 13 2010 Orion Poplawski 0:3.2.1-2 -- Change depmap parent id to asm (bug #606659) - -* Thu Apr 15 2010 Fernando Nasser 0:3.2.1 -- Upgrade to 3.2 - -* Sat Jul 25 2009 Fedora Release Engineering - 0:3.1-7.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:3.1-6.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 23 2008 David Walluck 0:3.1-5.1 -- build for Fedora - -* Thu Oct 23 2008 David Walluck 0:3.1-5 -- add OSGi manifest (Alexander Kurtakov) - -* Mon Oct 20 2008 David Walluck 0:3.1-4 -- remove Class-Path from MANIFEST.MF -- add unversioned javadoc symlink -- remove javadoc scriptlets -- fix directory ownership -- remove build requirement on dos2unix - -* Fri Feb 08 2008 Ralph Apel - 0:3.1-3jpp -- Add poms and depmap frags with groupId of org.objectweb.asm ! -- Add asm-all.jar -- Add -javadoc Requires post and postun -- Restore Vendor, Distribution - -* Thu Nov 22 2007 Fernando Nasser - 0:3.1-2jpp -- Fix EOL of txt files -- Add dependency on jaxp - -* Thu Nov 22 2007 Fernando Nasser - 0:3.1-1jpp -- Upgrade to 3.1 - -* Wed Aug 22 2007 Fernando Nasser - 0:3.0-1jpp -- Upgrade to 3.0 -- Rename to include objectweb- prefix as requested by ObjectWeb - -* Thu Jan 05 2006 Fernando Nasser - 0:2.1-2jpp -- First JPP 1.7 build - -* Thu Oct 06 2005 Ralph Apel 0:2.1-1jpp -- Upgrade to 2.1 - -* Fri Mar 11 2005 Sebastiano Vigna 0:2.0.RC1-1jpp -- First release of the 2.0 line. +%autochangelog From 094db5c1bddf15a1a1e9e7d11508e4d5cc883ead Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 05:55:03 +0200 Subject: [PATCH 107/121] Update to upstream version 9.7 - Resolves: rhbz#2271211 --- .gitignore | 6 ++++++ objectweb-asm.spec | 2 +- sources | 14 +++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b42cfb9..44de096 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,9 @@ /asm-test-9.6.pom /asm-tree-9.6.pom /asm-util-9.6.pom +/asm-9.7.pom +/asm-analysis-9.7.pom +/asm-commons-9.7.pom +/asm-test-9.7.pom +/asm-tree-9.7.pom +/asm-util-9.7.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 79a3aa2..0fdcf5a 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.6 +Version: 9.7 Release: %autorelease Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause diff --git a/sources b/sources index 7ab1573..99fd76f 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.6.tar.gz) = ba2df9d7a74527892c1b42ce2b7b6df4e6eda6810d0560a482cd1ba61f3a77d6e14e54d1f2436935fd1269b7c39a27734b875dc3933231a8f144ad1b9dd9d0ba -SHA512 (asm-9.6.pom) = 5dd8959a84442b271be1861110d065a991e7fdacd7298f4cdda4faf8580cfcf6703285cf17736b30aa95ce81edae40f5c2b845f39d92cf31823907bd1b7d1b7c -SHA512 (asm-analysis-9.6.pom) = 8f6a9dc6037cd19d92f5d4a0527cf1cd25d6f16e1b51cb1142f430be62a9405f6c2bf550c13acb3abe0e5ad3e4e4b1f71dac80d5ceddec03d4503bb7abef7edd -SHA512 (asm-commons-9.6.pom) = 4bc1148607c5e12f1ab0873f2651dfc6521113d4edfae2b23b8543aff040f2a0011f4770bb22c01ac512520a50cd9e6e43ac7cbb2e3a20d28172cab81117f7b2 -SHA512 (asm-test-9.6.pom) = 473db827e2a61a2e58b85baec18e7abf7d6279d35abfb054eb3ea9f1346b5faeeff18e01f47de8e62aebcd01a4b0f7e4ca3094fd8c3782673cbaaf0b60a9a26a -SHA512 (asm-tree-9.6.pom) = fe590914903a128f1ade2ecc990d161a08bf6fcd9988f7f19a0b99b1d45b0391c0b5d717a21e5668d52f368df85dca165e30739b5cf88473c4d0152401f3a4d8 -SHA512 (asm-util-9.6.pom) = cab3a25a6b744c7f3501ea28c12eda34a7e0707ee1e2005a919b7b137139b0757e00a1f01f0e468373a6dd53410700ef1041b1e6315ee65717372dd950d6cf82 +SHA512 (objectweb-asm-9.7.tar.gz) = fdb26d9fe1e93f9ecee11dc138379a76eda5e22ca1434ac18cb6f101f928c76982c05b2ffb258afb41aff7aff06ecd545110c629ee940896ec09ba422b3eacf5 +SHA512 (asm-9.7.pom) = d9f4743ff9cb8233051658cc32ed8eb271b6085fe3e58a60bea01358b5e9b67d2c39c3f063ef5d554a07195ab8c80c9f66d5ede7d09de75b0c842ddc54dfc0c3 +SHA512 (asm-analysis-9.7.pom) = eabb0dd0c7f716e2dd19db3f070dc12b4fdeee47586867287c90dbb43ec63cef620d31e88e208c76ce55410f20bc4c5e56e4fd2b478bb1204785e8c4f0a5fcc5 +SHA512 (asm-commons-9.7.pom) = da65aada200175f2d910a82c6334f07390571542cdf43493b081cb71dea5e1a6bc6ad877a0e232914029c11bfbd3ac22476482e5bf5e9b59a5f457c567806637 +SHA512 (asm-test-9.7.pom) = 03f9b5e3f540c8860556246e86911504938b333ce80c23d346d5a883d0f266bd4ed314c79d29e2b4d28739068bde48709b8a4aa0f0b978088f283600ccc1de71 +SHA512 (asm-tree-9.7.pom) = 85c7f7dcf732956a5a2a23cc239361c82671dbce34111aea7a323f00590617622a9ada704fea7b2d50afb52adf4e99daa1a2b794e0f1cc7562b508bb8e727a50 +SHA512 (asm-util-9.7.pom) = 5fc41d8ecf4791520ae47f38be6b4a37761f6ecb608a27dec11a15e91fe7ff3e5d4f2ba24255a8f96c0f058b8e9a1a9381c872ce2f2d7cd8bf32acab5b3e5c6b From ccf59a8c73ec1aec30391eab880a3017eb8aceb2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 7 Oct 2024 10:16:38 +0200 Subject: [PATCH 108/121] Update to upstream version 9.7.1 - Resolves: rhbz#2316766 --- .gitignore | 6 ++++++ objectweb-asm.spec | 2 +- sources | 14 +++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 44de096..e9c8456 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,9 @@ /asm-test-9.7.pom /asm-tree-9.7.pom /asm-util-9.7.pom +/asm-9.7.1.pom +/asm-analysis-9.7.1.pom +/asm-commons-9.7.1.pom +/asm-test-9.7.1.pom +/asm-tree-9.7.1.pom +/asm-util-9.7.1.pom diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 0fdcf5a..c6147a2 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: objectweb-asm -Version: 9.7 +Version: 9.7.1 Release: %autorelease Summary: Java bytecode manipulation and analysis framework License: BSD-3-Clause diff --git a/sources b/sources index 99fd76f..e1a2064 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (objectweb-asm-9.7.tar.gz) = fdb26d9fe1e93f9ecee11dc138379a76eda5e22ca1434ac18cb6f101f928c76982c05b2ffb258afb41aff7aff06ecd545110c629ee940896ec09ba422b3eacf5 -SHA512 (asm-9.7.pom) = d9f4743ff9cb8233051658cc32ed8eb271b6085fe3e58a60bea01358b5e9b67d2c39c3f063ef5d554a07195ab8c80c9f66d5ede7d09de75b0c842ddc54dfc0c3 -SHA512 (asm-analysis-9.7.pom) = eabb0dd0c7f716e2dd19db3f070dc12b4fdeee47586867287c90dbb43ec63cef620d31e88e208c76ce55410f20bc4c5e56e4fd2b478bb1204785e8c4f0a5fcc5 -SHA512 (asm-commons-9.7.pom) = da65aada200175f2d910a82c6334f07390571542cdf43493b081cb71dea5e1a6bc6ad877a0e232914029c11bfbd3ac22476482e5bf5e9b59a5f457c567806637 -SHA512 (asm-test-9.7.pom) = 03f9b5e3f540c8860556246e86911504938b333ce80c23d346d5a883d0f266bd4ed314c79d29e2b4d28739068bde48709b8a4aa0f0b978088f283600ccc1de71 -SHA512 (asm-tree-9.7.pom) = 85c7f7dcf732956a5a2a23cc239361c82671dbce34111aea7a323f00590617622a9ada704fea7b2d50afb52adf4e99daa1a2b794e0f1cc7562b508bb8e727a50 -SHA512 (asm-util-9.7.pom) = 5fc41d8ecf4791520ae47f38be6b4a37761f6ecb608a27dec11a15e91fe7ff3e5d4f2ba24255a8f96c0f058b8e9a1a9381c872ce2f2d7cd8bf32acab5b3e5c6b +SHA512 (objectweb-asm-9.7.1.tar.gz) = 201c490ac71196b1a47a73d7311a22efca833c92377d02d9071cabc2429032aaa7eb636dfbf8182b71af60830d65792dd8f0b423208fcaba78a800228717aee5 +SHA512 (asm-9.7.1.pom) = 9d69abaf9c15b97d37484246c951acc55d4a944496ab47079dc600b3cd90353090b4a3579f1f7eb2e6d778e6900a5e1427f1690a4459253f3b9270c01713f54d +SHA512 (asm-analysis-9.7.1.pom) = 860702b32e5034109beee7cfb9269e33a55fe50ee3ef8c7fe6c71d9916b2be8865991aab64618f9e03be88879bb410e07db74cf91bd7364956cd34d0fbf9231b +SHA512 (asm-commons-9.7.1.pom) = d4bd178cfde200ed04915e581dd1e7009b1960ef40c86e9c22d88ef141d4a32c7e6131ee2e48f92eba45d523006799c8be53312dc50c67ed7b8bb8b90175e480 +SHA512 (asm-test-9.7.1.pom) = e36d8f602a9e9e24547af4f8b0aa0a57f79123c7075ae4085d80e93d3b8ea63730f59e85ee81a4dff45b8749ded0c1ab787620bb5c9820460761fde9578b8868 +SHA512 (asm-tree-9.7.1.pom) = f66d75d0897916d0e3a7ffe4dedd2ca4a363cba0430cc464a358e71be19e8413ba9f26b313f6eb7c0fcc631487e5a420f7bcf6af63c07e3d9880e8adc83922b7 +SHA512 (asm-util-9.7.1.pom) = 6a67ceafce03eb0582dd1addf79ff69cf2a94824f860161cd9b5c808580fd28ce2deb4e25b2b977a70da86732d20de1e895005c824e49d6148637c2211374ff4 From b45839cccff7240a8854d5c634cf3550e3cc573b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:52:57 +0100 Subject: [PATCH 109/121] Drop explicit requires on javapackages-tools --- objectweb-asm.spec | 4 ---- plans/javapackages.fmf | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index c6147a2..9ceaaa4 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -30,10 +30,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif -# Explicit javapackages-tools requires since asm-processor script uses -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - %description ASM is an all purpose Java bytecode manipulation and analysis framework. It can be used to modify existing classes or dynamically diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From b465e00d923c4fc6b597b2debf122123cdc5938c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 110/121] Unify spec style with the rest of Java/Maven packages [skip changelog] --- objectweb-asm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 9ceaaa4..2b4b6e8 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -37,10 +37,10 @@ generate classes, directly in binary form. Provided common transformations and analysis algorithms allow to easily assemble custom complex transformations and code analysis tools. -%package javadoc +%package javadoc Summary: API documentation for %{name} -%description javadoc +%description javadoc This package provides %{summary}. %prep From e2963c07b68806fe2dd4649b603ab1e491326132 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 111/121] Update javadoc package description [skip changelog] --- objectweb-asm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 2b4b6e8..882ce16 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -41,7 +41,7 @@ custom complex transformations and code analysis tools. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %prep %autosetup -p1 -C From e35d109a84aab78d60ef74a1d150a1d8534453c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:37:11 +0000 Subject: [PATCH 112/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7daee230d743ff393572e343b77d6185bc20e1db Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 14 Feb 2025 08:51:28 +0100 Subject: [PATCH 113/121] Remove bogus dependency --- objectweb-asm.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 882ce16..e94d68a 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -60,8 +60,6 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do %pom_xpath_inject pom:parent '..' ${pom} done -%pom_add_dep org.ow2.asm:asm-tree:%{version} asm-analysis - # Don't ship poms used for build only %mvn_package :aggregator __noinstall %mvn_package :tools-retrofitter __noinstall From 968c256e6661dda7748fa0b5db120565eb7a7c13 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 19 Feb 2025 07:44:23 +0100 Subject: [PATCH 114/121] Add support of Java 25 --- 0001-Add-support-of-Java-25.patch | 64 +++++++++++++++++++++++++++++++ objectweb-asm.spec | 2 + 2 files changed, 66 insertions(+) create mode 100644 0001-Add-support-of-Java-25.patch diff --git a/0001-Add-support-of-Java-25.patch b/0001-Add-support-of-Java-25.patch new file mode 100644 index 0000000..fda2675 --- /dev/null +++ b/0001-Add-support-of-Java-25.patch @@ -0,0 +1,64 @@ +From 756ccf40723d9ba68872252810f3dbb2b186be0c Mon Sep 17 00:00:00 2001 +From: forax +Date: Tue, 10 Dec 2024 11:11:49 +0100 +Subject: [PATCH] Add support of Java 25 + +--- + asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java | 1 + + asm/src/main/java/org/objectweb/asm/ClassReader.java | 2 +- + asm/src/main/java/org/objectweb/asm/Opcodes.java | 1 + + asm/src/test/java/org/objectweb/asm/ConstantsTest.java | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java b/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java +index 4ede9201..9ce9f1c6 100644 +--- a/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java ++++ b/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java +@@ -114,6 +114,7 @@ public class ASMifier extends Printer { + classVersions.put(Opcodes.V22, "V22"); + classVersions.put(Opcodes.V23, "V23"); + classVersions.put(Opcodes.V24, "V24"); ++ classVersions.put(Opcodes.V25, "V25"); + CLASS_VERSIONS = Collections.unmodifiableMap(classVersions); + } + +diff --git a/asm/src/main/java/org/objectweb/asm/ClassReader.java b/asm/src/main/java/org/objectweb/asm/ClassReader.java +index 33b2a300..5f66ed2b 100644 +--- a/asm/src/main/java/org/objectweb/asm/ClassReader.java ++++ b/asm/src/main/java/org/objectweb/asm/ClassReader.java +@@ -195,7 +195,7 @@ public class ClassReader { + this.b = classFileBuffer; + // Check the class' major_version. This field is after the magic and minor_version fields, which + // use 4 and 2 bytes respectively. +- if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V24) { ++ if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V25) { + throw new IllegalArgumentException( + "Unsupported class file major version " + readShort(classFileOffset + 6)); + } +diff --git a/asm/src/main/java/org/objectweb/asm/Opcodes.java b/asm/src/main/java/org/objectweb/asm/Opcodes.java +index 9aa8a3b0..4ed95869 100644 +--- a/asm/src/main/java/org/objectweb/asm/Opcodes.java ++++ b/asm/src/main/java/org/objectweb/asm/Opcodes.java +@@ -290,6 +290,7 @@ public interface Opcodes { + int V22 = 0 << 16 | 66; + int V23 = 0 << 16 | 67; + int V24 = 0 << 16 | 68; ++ int V25 = 0 << 16 | 69; + + /** + * Version flag indicating that the class is using 'preview' features. +diff --git a/asm/src/test/java/org/objectweb/asm/ConstantsTest.java b/asm/src/test/java/org/objectweb/asm/ConstantsTest.java +index e7af1d04..543ba044 100644 +--- a/asm/src/test/java/org/objectweb/asm/ConstantsTest.java ++++ b/asm/src/test/java/org/objectweb/asm/ConstantsTest.java +@@ -257,6 +257,7 @@ class ConstantsTest { + case "V22": + case "V23": + case "V24": ++ case "V25": + return ConstantType.CLASS_VERSION; + case "ACC_PUBLIC": + case "ACC_PRIVATE": +-- +2.48.1 + diff --git a/objectweb-asm.spec b/objectweb-asm.spec index e94d68a..7fea98e 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -22,6 +22,8 @@ Source7: https://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/a Source9: generate-tarball.sh Source10: tools-retrofitter.pom +Patch: 0001-Add-support-of-Java-25.patch + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else From b04b61bcf16a30c9cc0635d362c33604e1f2e368 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 115/121] Remove javadoc subpackage --- objectweb-asm.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 7fea98e..906d6b7 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -31,6 +31,8 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 9.7.1-9 %description ASM is an all purpose Java bytecode manipulation and analysis @@ -39,12 +41,6 @@ generate classes, directly in binary form. Provided common transformations and analysis algorithms allow to easily assemble custom complex transformations and code analysis tools. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -70,7 +66,7 @@ done %mvn_package :asm-test __noinstall %build -%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -j -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -81,8 +77,5 @@ done %license LICENSE.txt %{_bindir}/%{name}-processor -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt - %changelog %autochangelog From 3aa1b63e94fbb12eded17096a818670081f0ab36 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 18 Mar 2025 12:34:48 +0100 Subject: [PATCH 116/121] Remove bogus objectweb-asm-processor script --- objectweb-asm.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 906d6b7..ffba5d2 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -71,11 +71,8 @@ done %install %mvn_install -%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util %{name}-processor true - %files -f .mfiles %license LICENSE.txt -%{_bindir}/%{name}-processor %changelog %autochangelog From 2b5a60ae7747b173d1a31e042a3f2319bcfecadb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 117/121] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 0cb675ac1a0a79b22f2307f095555b8850429caf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 118/121] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From a76282016de7b6415258b74fac210352722c075b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 119/121] Build with OpenJDK 25 --- objectweb-asm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ffba5d2..27e6805 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -27,7 +27,7 @@ Patch: 0001-Add-support-of-Java-25.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif From e019a019b2c57d156e86175d3072210b907ace8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:04:49 +0000 Subject: [PATCH 120/121] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a768ff118a5b068289c4604e36827b8ac7c55ece Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:50:05 +0200 Subject: [PATCH 121/121] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that.