On Mon, 13 May 2024 15:13:20 GMT, Andy Goryachev <ango...@openjdk.org> wrote:
>> The backport is almost clean. >> While cherry picking the mainline commit, a minor merge conflict was shown >> in a the file `tests/system/src/test/.classpath` : The mainline file has a >> few additional exports compared to 22u. >> >> Test passes on windows. > > tests/system/src/test/.classpath line 17: > >> 15: <attributes> >> 16: <attribute name="module" value="true"/> >> 17: <attribute name="add-exports" >> value="javafx.graphics/com.sun.glass.ui=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED:javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED:javafx.graphics/com.sun.prism.impl=ALL-UNNAMED:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED:javafx.graphics/com.sun.glass.events=ALL-UNNAMED:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.mac=ALL-UNNAMED:javafx.graphics/com.sun.glass.ui.win=ALL-UNNAMED"/> > > I wonder if we should just copy this attribute from the master branch, to > avoid future conflicts? Probably not as part of this backport. Also, the fact that they are different suggests that there might be another fix that is in mainline but not in jfx22u (and we wouldn't choose to backport another fix just to avoid a merge conflict). ------------- PR Review Comment: https://git.openjdk.org/jfx22u/pull/28#discussion_r1598703396
