From 662adb73b8ebdcde92c070e1757af29324b59ee7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/14] 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 d9f5014a360434431eaad12a0ba3a7277f088b5f Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Mon, 6 May 2019 12:15:41 +0200 Subject: [PATCH 02/14] 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 03/14] 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 9105f964fc16519d853606ca8b9799714332a68a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Oct 2019 14:29:11 +0200 Subject: [PATCH 04/14] 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 05/14] 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 06/14] 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 07/14] 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 d3561a5e2de779c7f8d4e7c6912db9ba9b779197 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 Apr 2020 15:12:33 +0200 Subject: [PATCH 08/14] 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 ed0b433dbdcdce11a0fd89b5c12950d8f54c793b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 10:05:26 +0200 Subject: [PATCH 09/14] 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 10/14] 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 aa30cccee326d6bb4de96b2f1b6c9f34a6a65434 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 25 Sep 2020 10:00:58 +0200 Subject: [PATCH 11/14] 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 985b4838d0d18570c9c6764d305a24fc10a7711e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 12/14] 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 13/14] 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 14/14] 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