On Sun, 22 Aug 2021 11:32:58 GMT, Ambarish Rapte <ara...@openjdk.org> wrote:
>> There were two minor merge conflicts in `build.gradle` and one conflict in >> `gradle/wrapper/gradle-wrapper.properties` while cherry picking the change. >> And it also required similar changes to be made for project fxpackager. The >> [first >> commit](https://github.com/openjdk/jfx11u/pull/49/commits/7700a6d1a7c82df8fc269f1de6f3bd5119fb3397) >> is the original cherry pick and [second >> commit](https://github.com/openjdk/jfx11u/pull/49/commits/cea09bdfc96374ce00560c13e6730ab76f8b20e9) >> is the additional changes for fxpackager. >> Verified the build on all three platforms with gradle 7.0.1 and apache ant >> 1.10.5 > > Ambarish Rapte has updated the pull request incrementally with one additional > commit since the last revision: > > use antpluginImplementation Marked as reviewed by kcr (Lead). ------------- PR: https://git.openjdk.java.net/jfx11u/pull/49
