rpms / objectweb-asm

Clone
Source Code
GIT

#4 Upgrade to upstream release 7.3.1
Merged 4 years ago by jerboaa. Opened 4 years ago by jhuttana.
rpms/ jhuttana/objectweb-asm master  into  master

file modified
+18 -12 
@@ -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 @@ 
 

  # ./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 @@ 
 

  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 @@ 
 

  %license LICENSE.txt
 

  

  %changelog
 

+ * Thu Feb 27 2020 Jayashree Huttanagoudat <jhuttana@redhat.com> - 7.3.1-1
 

+ - Upgraded to upstream version 7.3.1.
 

+ 

  * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-4
 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

file modified
+7 -7 
@@ -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

Made changes to files: spec, sources and generate-tarball.sh to upgrade the package to upstream release 7.3.1.

Why has this been commented out?

Release should reset to 1 on version bump. 7.3.1 > 7.0. No need for release to be higher too.

I think we could drop this comment. Or change it to something like: "No longer disable BasicInterpreterTest as it runs fine". Or something like that.

1 new commit added

  • Addressed review comments
4 years ago

Why has this been commented out?

In the upgraded version the source contains two new test classes
https://gitlab.ow2.org/asm/asm/blob/master/asm/src/test/java/org/objectweb/asm/ClassWriterTest.java#L373

These new classes get deleted and that leads to ClassWriterTest.java failure.
Now I have made suitable change to existing command not to delete those two new test class files.

Release should reset to 1 on version bump. 7.3.1 > 7.0. No need for release to be higher too.

Release should reset to 1 on version bump. 7.3.1 > 7.0. No need for release to be higher too.

Typo: ClassWriterTest.java

However, it does not make sense to keep those .class files since in %prep ClassWriterTest is being disabled via the @org.junit.jupiter.api.Disabled annotation. If it's not test testReadAndWriteWithComputeMaxsAndLargeSubroutines that is failing in ClassWriterTest we should disable the failing test in a similar way than was done previously.

--^ This is what I mean with disabled test in ClassWriterTest.java

Should change to 1, not be kept at 4.

Why has this been commented out?

In the upgraded version the source contains two new test classes
https://gitlab.ow2.org/asm/asm/blob/master/asm/src/test/java/org/objectweb/asm/ClassWriterTest.java#L373
These new classes get deleted and that leads to ClassWriterTest.java failure.
Now I have made suitable change to existing command not to delete those two new test class files.

Thanks for the explanation. I've added another comment. We should disable the test that is failing as it's unclear what license those class files have.

Release should reset to 1 on version bump. 7.3.1 > 7.0. No need for release to be higher too.

This hasn't been addressed yet.

1 new commit added

  • Addressed comments on Release number reset and Disabling unlicensed classes
4 years ago

1 new commit added

  • Test source file name BasicInterpreterTest has changed to AnalyzerWithBasicInterpreterTest. Related changes in spec file are restored accordingly
4 years ago

Should change to 1, not be kept at 4.

This is done now :)

--^ This is what I mean with disabled test in ClassWriterTest.java

Thank you for pointing this. In new source most of the test name and test source names are changed. Looks like the aim is to make it more modular and readable.

I have made the suitable changes now. Please give your comments.

Why has this been commented out?
In the upgraded version the source contains two new test classes
https://gitlab.ow2.org/asm/asm/blob/master/asm/src/test/java/org/objectweb/asm/ClassWriterTest.java#L373
These new classes get deleted and that leads to ClassWriterTest.java failure.
Now I have made suitable change to existing command not to delete those two new test class files.

Thanks for the explanation. I've added another comment. We should disable the test that is failing as it's unclear what license those class files have.

Release should reset to 1 on version bump. 7.3.1 > 7.0. No need for release to be higher too.

This hasn't been addressed yet.

Now it is addressed :)

Typo: ClassWriterTest.java
However, it does not make sense to keep those .class files since in %prep ClassWriterTest is being disabled via the @org.junit.jupiter.api.Disabled annotation. If it's not test testReadAndWriteWithComputeMaxsAndLargeSubroutines that is failing in ClassWriterTest we should disable the failing test in a similar way than was done previously.

This explanation helped me!

This comment is no longer true, please remove.

Should be ... redhat.com> - 7.3.1-1. Changelog format is <Version>-<Release>. And sometimes <Epoch>:<Version>-<Release>

1 new commit added

  • Addressed review comments for changelog content and comment line which is no longer true
4 years ago

A mockbuild of this fails for me with:

[ERROR] Tests run: 31, Failures: 0, Errors: 5, Skipped: 0, Time elapsed: 0.085 s <<< FAILURE! - in org.objectweb.asm.commons.SerialVersionUidAdderTest
[ERROR] testAllMethods_interface  Time elapsed: 0.006 s  <<< ERROR!
java.io.IOException: Class not found
    at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_interface(SerialVersionUidAdderTest.java:83)

[ERROR] testAllMethods_anonymousInnerClass  Time elapsed: 0 s  <<< ERROR!
java.io.IOException: Class not found
    at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_anonymousInnerClass(SerialVersionUidAdderTest.java:72)

[ERROR] testAllMethods_class  Time elapsed: 0.001 s  <<< ERROR!
java.io.IOException: Class not found
    at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_class(SerialVersionUidAdderTest.java:61)

[ERROR] testAllMethods_enum  Time elapsed: 0.001 s  <<< ERROR!
java.io.IOException: Class not found
    at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_enum(SerialVersionUidAdderTest.java:105)

[ERROR] testAllMethods_emptyInterface  Time elapsed: 0.001 s  <<< ERROR!
java.io.IOException: Class not found
    at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_emptyInterface(SerialVersionUidAdderTest.java:94)

[INFO] Running org.objectweb.asm.commons.GeneratorAdapterTest
[INFO] Tests run: 73, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 s - in org.objectweb.asm.commons.GeneratorAdapterTest

It needed this extra bit in %prep:

# Remove failing test SerialVersionUidAdderTest due to missing class files
rm asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java

Also the spec file references sources with http URLs over https. Please change to the latter. The former don't work any more.

A mockbuild of this fails for me with:
[ERROR] Tests run: 31, Failures: 0, Errors: 5, Skipped: 0, Time elapsed: 0.085 s <<< FAILURE! - in org.objectweb.asm.commons.SerialVersionUidAdderTest
[ERROR] testAllMethods_interface Time elapsed: 0.006 s <<< ERROR!
java.io.IOException: Class not found
at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_interface(SerialVersionUidAdderTest.java:83)

[ERROR] testAllMethods_anonymousInnerClass Time elapsed: 0 s <<< ERROR!
java.io.IOException: Class not found
at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_anonymousInnerClass(SerialVersionUidAdderTest.java:72)

[ERROR] testAllMethods_class Time elapsed: 0.001 s <<< ERROR!
java.io.IOException: Class not found
at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_class(SerialVersionUidAdderTest.java:61)

[ERROR] testAllMethods_enum Time elapsed: 0.001 s <<< ERROR!
java.io.IOException: Class not found
at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_enum(SerialVersionUidAdderTest.java:105)

[ERROR] testAllMethods_emptyInterface Time elapsed: 0.001 s <<< ERROR!
java.io.IOException: Class not found
at org.objectweb.asm.commons.SerialVersionUidAdderTest.testAllMethods_emptyInterface(SerialVersionUidAdderTest.java:94)

[INFO] Running org.objectweb.asm.commons.GeneratorAdapterTest
[INFO] Tests run: 73, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 s - in org.objectweb.asm.commons.GeneratorAdapterTest

It needed this extra bit in %prep:

Remove failing test SerialVersionUidAdderTest due to missing class files

rm asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java

This exception I faced only when I tried to pull from this branch twon days back.
Then when you explained about "fedpkg new-sources" I thought it could be spurious issue :)
Otherwise in my primary work area build is going fine.

My concern is that, removing this test will lead to skipping some functionality check.
Please correct me if my understanding is wrong :)

Also the spec file references sources with http URLs over https. Please change to the latter. The former don't work any more.

Thanks for pointing this out :)
And sorry I missed this previously.
Since I downloaded the build sources and updated sha512sum value manually.
At that time even I also had to use https and forgot to add it on spec.

1 new commit added

  • Addressed review comments for spec file
4 years ago

@jhuttana please change the has to 8b7523a7a56d1bf802c6bc476e8fbd23911952143c619cfce9b976e66aa6b5dbce5eda4567060c020ab098821942acd9c0539e00ba0c445548da9b67ff932cd4 as this is the source which I've uploaded for you into the lookaside cache.

Please revert this change. It's a no-op :)

@jhuttana Please fix the above issues and clean up the commits (squash them into one), then this should be good to go. Scratch build in rawhide:
https://koji.fedoraproject.org/koji/taskinfo?taskID=42797909

rebased onto 1cd66b9
4 years ago

@jhuttana Please fix the above issues and clean up the commits (squash them into one), then this should be good to go. Scratch build in rawhide:
https://koji.fedoraproject.org/koji/taskinfo?taskID=42797909

Thank you for the review comments :)

I have addressed the comments please review and provide me the comments.

@jhuttana Please fix the above issues and clean up the commits (squash them into one), then this should be good to go. Scratch build in rawhide:
https://koji.fedoraproject.org/koji/taskinfo?taskID=42797909

Thank you for the review comments :)
I have addressed the comments please review and provide me the comments.

@jhuttana This looks good. Please also try sanity check this by building in mock (fedpkg mockbuild should work).

I'll merge this next week.

@jhuttana Please fix the above issues and clean up the commits (squash them into one), then this should be good to go. Scratch build in rawhide:
https://koji.fedoraproject.org/koji/taskinfo?taskID=42797909
Thank you for the review comments :)
I have addressed the comments please review and provide me the comments.

@jhuttana This looks good. Please also try sanity check this by building in mock (fedpkg mockbuild should work).

@jerboaa Sanity check is successful!!...

I'll merge this next week.

Sure :) Thank you so much!...

@jhuttana Please fix the email in your commit message. It currently is jhuttana@localhost.localdomain. Then this is good to go.

rebased onto fde76b9
4 years ago

@jhuttana Please fix the email in your commit message. It currently is jhuttana@localhost.localdomain. Then this is good to go.

Thank you severin! I have fixed the email in commit.

Looks good. Thanks!

Pull-Request has been merged by jerboaa
4 years ago
Changes Summary 2
+18 -12
file changed
objectweb-asm.spec
+7 -7
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.