[jfx21u] RFR: 8317370: JavaFX runtime version is wrong at runtime

[Kevin Rushforth]

On Tue, 21 Nov 2023 20:19:04 GMT, John Neffenger <jgneff at openjdk.org> wrote:

> Backport 16169240667876633895b27464eb90033abb6166
> 
> Please review this backport of openjdk/jfx#1253 to JavaFX 21. Please give me a day or two to test it again before starting your review.

The backport looks good and works as expected.

I verified that the patch is clean except for the version number (22 vs 21). When I diff the two commit patches (jfx/master and this PR), I see only the following expected difference:


@@ -154,7 +152,7 @@
  public class VersionInfoTest {
  
 +    // Increment this feature-release counter for every major release.
-+    private static final String FEATURE = "22";
++    private static final String FEATURE = "21";
 +
 +    // The working directory at runtime is 'modules/javafx.base'.
 +    private static final String PROPERTIES_FILE = "build/module-lib/javafx.properties";
@@ -191,7 +189,7 @@
          String version = VersionInfo.getVersion();
 -        // Need to update major version number when we develop the next
 -        // major release.
--        assertTrue(version.startsWith("22"));
+-        assertTrue(version.startsWith("21"));
 +        assertTrue(version.startsWith(FEATURE));
          String runtimeVersion = VersionInfo.getRuntimeVersion();
          assertTrue(runtimeVersion.startsWith(version));

-------------

Marked as reviewed by kcr (Lead).

PR Review: https://git.openjdk.org/jfx21u/pull/32#pullrequestreview-1750748509