On Fri, 20 Aug 2021 20:13:18 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 Looks fine with a couple comments. I tested it with the older gradle `6.3` as well as `7.0.1`. build.gradle line 2758: > 2756: > 2757: dependencies { > 2758: implementation group: "org.apache.ant", name: "ant", version: > "1.8.2" Shouldn't this be `antpluginImplementation`? It may not matter as much, since we don't build fxpackager by default in FX 11, but I still think it should be fixed. gradle/wrapper/gradle-wrapper.properties line 4: > 2: distributionPath=wrapper/dists > 3: > distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip > 4: > distributionSha256Sum=dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb By adding this line in, you have effectively backported [JDK-8262236](https://bugs.openjdk.java.net/browse/JDK-8262236). I don't see a problem with that, since the fix for that issue was the one-line addition of this checksum. It might be cleaner from a bookkeeping standpoint to include that issue in this PR (i.e., `/issue add 8262236`)? ------------- PR: https://git.openjdk.java.net/jfx11u/pull/49
