PR#1: Rebase to 3.21.0 - rpms/javassist

rpms / javassist

#1 Rebase to 3.21.0

Merged 4 years ago by dmoluguw. Opened 4 years ago by dmoluguw.

rpms/ dmoluguw/javassist master into master

Dinesh Prasanth M K • 4 years ago

590f80f

.gitignore

file modified

		`@@ -3,3 +3,4 @@`
		`javassist-3.15.0-GA.zip`
		`/javassist-3.16.1-GA.zip`
		`/rel_3_18_1_ga.tar.gz`
		`+ /rel_3_21_0_ga.tar.gz`

javassist-buildfile-nosource1.4-nosrcjar.patch

file removed

-23

		`@@ -1,23 +0,0 @@`
		`- --- build.xml.old 2008-10-09 19:51:16.000000000 +0200`
		`- +++ build.xml 2008-12-09 16:27:29.000000000 +0100`
		`- @@ -155,17 +155,19 @@`
		`- to ${build.classes.dir}.</echo>`
		`- </target>`
		`-`
		`- - <target name="jar" depends="compile14">`
		`- + <target name="jar" depends="compile">`
		`- <jar jarfile="${target.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">`
		`- <fileset dir="${build.classes.dir}">`
		`- <include name="*/.class"/>`
		`- </fileset>`
		`- </jar>`
		`- + <!--`
		`- <jar jarfile="${target-src.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">`
		`- <fileset dir="${src.dir}">`
		`- <include name="javassist/**"/>`
		`- </fileset>`
		`- </jar>`
		`- + -->`
		`- </target>`
		`-`
		`- <target name="javadocs">`

javassist.spec

file modified

+7 -4

		`@@ -1,14 +1,14 @@`
		`%global upstream_version rel_%(sed s/\\\\./_/g <<<"%{version}")_ga`

		`Name: javassist`
		`- Version: 3.18.1`
		`- Release: 12%{?dist}`
		`+ Version: 3.21.0`
		`+ Release: 1%{?dist}`
		`Summary: The Java Programming Assistant provides simple Java bytecode manipulation`
		`License: MPLv1.1 or LGPLv2+ or ASL 2.0`
		`- URL: http://www.csg.is.titech.ac.jp/~chiba/%{name}/`
		`+ URL: https://www.javassist.org/`
		`BuildArch: noarch`

		`- Source0: http://github.com/jboss-%{name}/%{name}/archive/%{upstream_version}.tar.gz`
		`+ Source0: https://github.com/jboss-%{name}/%{name}/archive/%{upstream_version}.tar.gz`

		`Patch0: 0001-Remove-usage-of-junit.awtui-and-junit.swingui.patch`

		`@@ -61,6 +61,9 @@`
		`%doc License.html`

		`%changelog`
		`+ * Wed Mar 25 2020 Dinesh Prasanth <dmoluguw@redhat.com> - 3.21.0-1`
		`+ - Rebase to 3.21.0`
		`+`
		`* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.1-12`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 1d8a0dbf392146f6db0964dec9bf3841 rel_3_18_1_ga.tar.gz`
		`+ SHA512 (rel_3_21_0_ga.tar.gz) = 5dd855be18629306348f5a3a2d738880e6b79ac7a570ff16ddd22a5b3d23581fea1bf54b099d88c543b7045e9ff69d1e5e8fc6a323faa3dc1aa2076b164e5323`

dmoluguw commented 4 years ago

Note: javassist cannot be rebased beyond this version unless Fedora
updates the default jdk to >=10. Coz, from 3.22.0
java.lang.invoke.MethodHandles.Lookup.dropLookupMode is being used
which does not exist in jdk 8

Test builds in COPR: https://copr.fedorainfracloud.org/coprs/dmoluguw/javassist/builds/

All build failures currently exists. No new build failures.

Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>

Metadata Update from @dmoluguw:
- Request assigned

4 years ago

decathorpe commented 4 years ago

I'll look at this tomorrow. Thanks for working on it!

decathorpe commented 4 years ago

Looks good from my POV. I assume you ran review_pr.py to do the rebuilds? If so, rebuilds look good as well. Feel free to merge and build for rawhide.

decathorpe commented 4 years ago

PS: I assume the removed Patch was an orphaned file that was no longer necessary?

dmoluguw commented 4 years ago

Yes, I used review_pr.py to run the COPR rebuilds.

I never saw the patch getting executed inside .spec file. So, I assumed it was an orphan and so deleted it

Thanks for the review

Edited 4 years ago by dmoluguw

Pull-Request has been merged by dmoluguw

4 years ago