> 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 ------------- Changes: - all: https://git.openjdk.java.net/jfx11u/pull/49/files - new: https://git.openjdk.java.net/jfx11u/pull/49/files/cea09bdf..1dc05179 Webrevs: - full: https://webrevs.openjdk.java.net/?repo=jfx11u&pr=49&range=01 - incr: https://webrevs.openjdk.java.net/?repo=jfx11u&pr=49&range=00-01 Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod Patch: https://git.openjdk.java.net/jfx11u/pull/49.diff Fetch: git fetch https://git.openjdk.java.net/jfx11u pull/49/head:pull/49 PR: https://git.openjdk.java.net/jfx11u/pull/49
