Update to upstream's 7.0 release.

.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

asm-all.pom

@@ -36,11 +36,6 @@
       <artifactId>asm-tree</artifactId>
       <version>@VERSION@</version>
     </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-xml</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

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 <sgehwolf@redhat.com> - 7.0-1
+- Update to latest upstream 7.0 release.
+- Removes package asm-xml (deprecated since 6.1).
+
 * Tue Sep 11 2018 Mat Booth <mat.booth@redhat.com> - 6.2.1-1
 - Update to latest upstream release
 - Fix test suite execution

parent.pom

@@ -16,7 +16,6 @@
       <module>asm-test</module>
       <module>asm-tree</module>
       <module>asm-util</module>
-      <module>asm-xml</module>
       <module>asm-all</module>
     </modules>
 </project>

sources

@@ -1,8 +1,7 @@
-SHA512 (objectweb-asm-6.2.1.tar.gz) = 203d36483d068beb26e2139ad535f4b386b043f1a5a5e7e6e5f29c1fc04dd0905e22f5746594d5c4bff9c94a90fb7ce1a3d566c3d312a728c14693ed6cc9af97
+SHA512 (objectweb-asm-7.0.tar.gz) = 696935563bffad143653f9cde722fcb16e93271c95918731a8eb08a15b783985848c42ba74a65990489638132fbae3fdf7892889545abb548834f10db3f27ed4
-SHA512 (asm-6.2.1.pom) = 3d5f1c68c1eb9b4b92655138a611f3ce5fded9183a1abe37473a349f226e2e83b2bf7caa5f7a53a93ab16a392f3ebaa962b1630dd0e9cdc41dc99de975270c40
+SHA512 (asm-7.0.pom) = a7a2060b33710202034e1f025a687a40ec97232213bf21a8aeb70e23d8b2200a0f7c33697d0adaf942c1ac2852d7b5a4032a43132a89b5692fa68a26ce32c77e
-SHA512 (asm-analysis-6.2.1.pom) = 6bd4328c59ee0e30af88f2036fb22ba2256013ac97572ae149b8368df2f550e8a356ae86d8cbf172865d7f884366efad76473079bcc77e46ad1c089ad4443856
+SHA512 (asm-analysis-7.0.pom) = b2ad03aedcd027e02d493bfb39ad454ad1f969f420af9a27531ca2650b9720375e3f65657820bd5e4b3095625cd9e5c30543a2be14abb9f04b9928514cfdcb99
-SHA512 (asm-commons-6.2.1.pom) = d91a12ea460fbde0c6e8984daf33abac9c724893c5a2de7b2de7e741162fd358b47f4be398bd6813168a65878d0f948d1853d2fcb8f3b9a575f130b1c02acecf
+SHA512 (asm-commons-7.0.pom) = a092e8dbb0ae7417c3a245ba022485b84432fbb7c072ea1100f60266346cc94e9d4176c25f981c3e05a86e0e0c8348ae6ea0856cf29ead310946fa982bd70ec4
-SHA512 (asm-test-6.2.1.pom) = 273a26015bdecf945df3a30729b9628eed779c0218f9d343c39c1349e947133d9e87e0dc6865a6429a01bf8178e03b86e1c874e3bb1b3c175e3d38c8d6c1941a
+SHA512 (asm-test-7.0.pom) = 34f8fe64d4db1f6e2e07dc8e39d00aecb072f8c260b094047cd9c7aa6754927a95ea9cde51494d6d3dbda427fb3b1d8583f92f9ad034925d5eba2745253cbb88
-SHA512 (asm-tree-6.2.1.pom) = 4f3150dd6737ca05862769de49df55d8f66882ddeea2bfaaa04852862e4c07ad51ab14a87a92bea55dd611ec5886123331d756cb8fc511c8c0a5b3cba400c033
+SHA512 (asm-tree-7.0.pom) = e88f0d20160061e9b6eba203a80d50471deb53ece26c256388d06a8026a455c0463c2cc9463c427e88797bd075ddaa8e9f1594fe2f0939997677c629e86f6cca
-SHA512 (asm-util-6.2.1.pom) = e257f5fe8f32c5c35c9ac1b307e1f9a69141a6ed66aa28a0e76b12560b6441b59c84ff3dbd0da185f53bd57517edb95e1b0517b19d0e2299ef4271818e66056b
+SHA512 (asm-util-7.0.pom) = c2b8ef7eb326b76b7fca816ec21da04d69426f2c04028b127a1b517a6b23ae92985d6328d37c80b84a5c3e8b503df7623504c761b382f31dce6b80ae4d193302
-SHA512 (asm-xml-6.2.1.pom) = cef15584c25df9e07aa3c1121134545b7e79e678b58340e6d34b7f28c0b9b8c61768dc0d501299c5b489a9f26d28511adc1cbae757a2973201852c28de45d25b