Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjfx for openSUSE:Factory checked in at 2021-07-27 14:32:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjfx (Old) and /work/SRC/openSUSE:Factory/.openjfx.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openjfx" Tue Jul 27 14:32:13 2021 rev:5 rq:908528 version:11.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/openjfx/openjfx.changes 2021-04-27 21:34:30.675968885 +0200 +++ /work/SRC/openSUSE:Factory/.openjfx.new.1899/openjfx.changes 2021-07-27 14:32:33.815454300 +0200 @@ -1,0 +2,112 @@ +Tue Jul 27 07:26:19 UTC 2021 - Fridrich Strba <[email protected]> + +- Update to upstream version 11.0.12, including April 2021 and + July 2021 CPU security fixes) + * Fixes of 11.0.11+1 + + JDK-8248126: JavaFX ignores HiDPI scaling settings on some + linux platforms + + JDK-8261460: Incorrect CSS applied to ContextMenu + on DialogPane + + JDK-8252099: JavaFX does not render Myanmar script correctly + + JDK-8249737: java.lang.RuntimeException: Too many touch + points reported + + JDK-8256283: IndexOutOfBoundsException when sorting a + TreeTableView + + JDK-8258592: Control labels in Dialogs are truncated at + certain DPI scaling levels + + JDK-8260165: CSSFilterTest.testCSSFilterRendering system test + fails + + JDK-8260257: [Linux] WebView no longer reacts to some mouse + events + + JDK-8213135: HTMLEditorTest.checkStyleProperty fails + intermittently + + JDK-8261927: WebKit build fails with Visual Studio 2017 + + JDK-8254836: Cherry pick GTK WebKit 2.30.3 changes + + JDK-8260163: IrresponsiveScriptTest.testInfiniteLoopInScript + unit test fails on Windows + + JDK-8259635: Update to 610.2 version of WebKit + + JDK-8242361: JavaFX Web View crashes with Segmentation Fault, + when HTML contains Data-URIs + + JDK-8253356: JavaFX Terminology Refresh + + JDK-8257897: Fix webkit build for XCode 12 + + JDK-8233678: [macos 10.15] System menu bar does not work + initially on macOS Catalina + + JDK-8254049: Update WebView to public suffix list 2020-04-24 + + JDK-8242861: Update ImagePattern to apply SVG pattern + transforms + + JDK-8202990: javafx webview css filter property with display + scaling + + JDK-8260519: Change JavaFX release version in 11-dev to + 11.0.11 + * Fixes of 11.0.12+4 + + JDK-8267314: Loading some animated GIFs fails with + ArrayIndexOutOfBoundsException: Index 4096 out of bounds for + length 4096 + + JDK-8210199: [linux / macOS] fileChooser can't handle emojis + + JDK-8216377: JavaFX: memoryleak for initial nodes of Window + + JDK-8207837: Indeterminate ProgressBar does not animate if + content is added after scene is set on window + + JDK-8268152: gstmpegaudioparse does not provides timestamps + for HLS MP3 streams + + JDK-8266554: Change default macOS min version for aarch64 to + 11.0 + + JDK-8257895: Allow building of JavaFX media libs for Apple + Silicon + + JDK-8266966: Wrong CSS properties are applied to other nodes + after fix for JDK-8204568 + + JDK-8257758: Allow building of JavaFX native libs for Apple + Silicon + + JDK-8264536: Building OpenJFX on Apple AARCH64 not possible + + JDK-8264928: Update to Xcode 12.4 + + JDK-8262276: Debug build of WebKit fails + + JDK-8263788: JavaFX application freezes completely after some + time when using the WebView + + JDK-8264990: WebEngine crashes with segfault when not loaded + through system classloader + + JDK-8259356: MediaPlayer's seek freezes video + + JDK-8259555: Webkit crashes on Apple Silicon + + JDK-8211294: ScrollPane content is blurry with 125% scaling + + JDK-8258381: [macos] Exception when input emoji using Chinese + input method + + JDK-8239589: JavaFX UI will not repaint after reconnecting + via Remote Desktop + + JDK-8240539: Upgrade gradle to version 6.3 + + JDK-8232063: Upgrade gradle to version 6.0 + + JDK-8226754: FX build fails using gradle 5.6+ or 6 + + JDK-8204568: Relative CSS-Attributes don't work all time + + JDK-8263169: [macos] JavaFX windows open as tabs when system + preference for documents is set + + JDK-8259680: Need API to query states of CAPS LOCK and NUM + LOCK keys + + JDK-8260245: Update ICU4C to version 68.2 + + JDK-8232379: Need to remove large icudt64l.zip binary file + from source repository + + JDK-8262366: Update glib to version 2.66.7 8262365: Update + GStreamer to version 1.18.3 + + JDK-8263111: Enhance String Conclusions + + JDK-8265703: Change JavaFX release version in jfx11u to + 11.0.12 + + JDK-8265697: Add .jcheck/conf to jfx11u repo + + JDK-8265667: Add README.md and CONTRIBUTING.md to FX 11-dev/rt + repo + + JDK-8227920: Remove dummy README from FX repo + + JDK-8223719: Add .gitignore to repo + + JDK-8223722: Cleanup .gitignore file + + JDK-8231735: gradle checkrepo is obsolete and doesn't work + with git +- Modified patches: + * 0000-Fix-wait-call-in-PosixPlatform.patch + * 0001-Change-SWT-and-Lucene.patch + * 0002-Allow-build-to-work-on-newer-gradles.patch + * 0004-Fix-Compilation-Flags.patch + * 0005-fxpackager-extract-jre-accept-symlink.patch + * openjfx-antlr.patch + * openjfx-architectures.patch + * openjfx-nowerror.patch + * openjfx-pango.patch + * openjfx-rpm-build.patch + + rediff to changed context + * openjfx-gradle441.patch + + revert recent changes mandating at least gradle 5 + +------------------------------------------------------------------- Old: ---- 11.0.10+1.tar.bz2 New: ---- 11.0.12+4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openjfx.spec ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.503452629 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.507452626 +0200 @@ -17,14 +17,15 @@ %global priority 2105 -%global build_number 1 +%global build_number 4 +%global jfx_repo jfx11u Name: openjfx -Version: 11.0.10 +Version: 11.0.12 Release: 0 Summary: Rich client application platform for Java License: BSD-3-Clause AND GPL-2.0-only WITH Classpath-exception-2.0 URL: https://openjdk.java.net/projects/openjfx/ -Source0: http://hg.openjdk.java.net/openjfx/11-dev/rt/archive/%{version}+%{build_number}.tar.bz2 +Source0: https://github.com/openjdk/%{jfx_repo}/archive/refs/tags/%{version}+%{build_number}.tar.gz Patch0: 0000-Fix-wait-call-in-PosixPlatform.patch Patch1: 0001-Change-SWT-and-Lucene.patch Patch2: 0002-Allow-build-to-work-on-newer-gradles.patch @@ -89,7 +90,7 @@ This package contains javadoc for %{name}. %prep -%setup -q -n rt-%{version}+%{build_number} +%setup -q -n %{jfx_repo}-%{version}-%{build_number} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -161,15 +162,15 @@ done %files -f .mfiles -%license LICENSE -%doc README +%license LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION +%doc README.md %files devel %dir %{_datadir}/%{name} %{_datadir}/%{name}/lib %{_libdir}/%{name} -%license LICENSE -%doc README +%license LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION +%doc README.md %files src %dir %{_datadir}/%{name} @@ -181,6 +182,6 @@ %files javadoc %{_javadocdir}/%{name} -%license LICENSE +%license LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION %changelog ++++++ 0000-Fix-wait-call-in-PosixPlatform.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.523452609 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.527452605 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/modules/jdk.packager/src/main/native/library/common/PosixPlatform.cpp 2018-10-29 16:26:04.000000000 +0100 -+++ rt-11.0.6+2/modules/jdk.packager/src/main/native/library/common/PosixPlatform.cpp 2018-11-27 15:34:52.170181958 +0100 -@@ -380,10 +380,7 @@ +--- a/modules/jdk.packager/src/main/native/library/common/PosixPlatform.cpp ++++ b/modules/jdk.packager/src/main/native/library/common/PosixPlatform.cpp +@@ -380,10 +380,7 @@ bool PosixProcess::Wait() { int status = 0; pid_t wpid = 0; ++++++ 0001-Change-SWT-and-Lucene.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.535452598 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.535452598 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/build.gradle -+++ rt-11.0.6+2/build.gradle -@@ -2494,7 +2494,7 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -2548,7 +2548,7 @@ project(":swt") { commonModuleSetup(project, [ 'base', 'graphics' ]) dependencies { @@ -9,7 +9,7 @@ } classes { -@@ -4613,35 +4613,35 @@ +@@ -4680,35 +4680,35 @@ compileTargets { t -> project(":apps") { // The apps build is Ant based, we will exec ant from gradle. @@ -71,7 +71,7 @@ compileTargets { t -> List<String> params = [] -@@ -4656,7 +4656,7 @@ +@@ -4723,7 +4723,7 @@ project(":apps") { params << "-Drun.patch=@${rootProject.buildDir}/${RUNARGSFILE}" def appsJar = project.task("appsJar${t.capital}") { ++++++ 0002-Allow-build-to-work-on-newer-gradles.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.543452590 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.547452586 +0200 @@ -1,6 +1,6 @@ ---- rt-8u152-b05/buildSrc/build.gradle 2017-06-16 01:18:26.000000000 +0200 -+++ rt-8u152-b05-patched/buildSrc/build.gradle 2018-11-07 13:15:06.915893681 +0100 -@@ -57,6 +57,7 @@ +--- a/buildSrc/build.gradle ++++ b/buildSrc/build.gradle +@@ -57,6 +57,7 @@ apply plugin: "java" repositories { ++++++ 0004-Fix-Compilation-Flags.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.555452578 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.555452578 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/buildSrc/linux.gradle -+++ rt-11.0.6+2/buildSrc/linux.gradle -@@ -54,7 +54,7 @@ +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -58,7 +58,7 @@ if (IS_STATIC_BUILD) { def cppFlags = [ commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-ffunction-sections", "-fdata-sections", @@ -9,4 +9,3 @@ def cFlags = [cppFlags, "-Werror=implicit-function-declaration"].flatten() - ++++++ 0005-fxpackager-extract-jre-accept-symlink.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.563452570 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.567452566 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/modules/jdk.packager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java -+++ rt-11.0.6+2/modules/jdk.packager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java -@@ -116,8 +116,8 @@ +--- a/modules/jdk.packager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java ++++ b/modules/jdk.packager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java +@@ -120,8 +120,8 @@ public class LinuxAppBundler extends AbstractImageBundler { BundleParams.PARAM_RUNTIME, RelativeFileSet.class, params -> JreUtils.extractJreAsRelativeFileSet(System.getProperty("java.home"), @@ -11,4 +11,3 @@ ); @Override - ++++++ openjfx-antlr.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.579452554 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.579452554 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/build.gradle -+++ rt-11.0.6+2/build.gradle -@@ -1968,7 +1968,7 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -2008,7 +2008,7 @@ project(":graphics") { dependencies { stubCompile group: "junit", name: "junit", version: "4.8.2" ++++++ openjfx-architectures.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.595452538 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.595452538 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/build.gradle 2020-01-15 16:05:47.000000000 +0100 -+++ rt-11.0.6+2/build.gradle 2020-01-17 10:20:19.254959384 +0100 -@@ -291,7 +291,7 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -291,7 +291,7 @@ ext.MODULESOURCEPATH = "modulesourcepath.args" // this build running on a Mac, Windows, or Linux machine? 32 or 64 bit? ext.OS_NAME = System.getProperty("os.name").toLowerCase() ext.OS_ARCH = System.getProperty("os.arch") @@ -9,8 +9,8 @@ ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin") ext.IS_WINDOWS = OS_NAME.contains("windows") ext.IS_LINUX = OS_NAME.contains("linux") -@@ -308,7 +308,7 @@ - } else if (IS_MAC && OS_ARCH != "x86_64") { +@@ -308,7 +308,7 @@ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { + } else if (IS_MAC && OS_ARCH != "x86_64" && OS_ARCH != "aarch64") { fail("Unknown and unsupported build architecture: $OS_ARCH") } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") { - fail("Unknown and unsupported build architecture: $OS_ARCH") ++++++ openjfx-gradle441.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.607452526 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.611452522 +0200 @@ -1,11 +1,91 @@ ---- rt-11.0.6+2/settings.gradle 2020-01-15 16:05:47.000000000 +0100 -+++ rt-11.0.6+2/settings.gradle 2020-01-17 10:26:30.653142117 +0100 -@@ -39,7 +39,7 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -1772,10 +1772,7 @@ allprojects { + repositories { + ivy { + url JFX_DEPS_URL +- metadataSources { +- artifact() +- } +- patternLayout { ++ layout "pattern", { + artifact "[artifact]-[revision](-[classifier]).[ext]" + artifact "[artifact].[ext]" + } +@@ -1788,10 +1785,7 @@ allprojects { + mavenCentral() + ivy { + url "https://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/" +- metadataSources { +- artifact() +- } +- patternLayout { ++ layout "pattern", { + artifact "[artifact].[ext]" + } + } +@@ -1802,19 +1796,13 @@ allprojects { + repositories { + ivy { + url libAVRepositoryURL +- metadataSources { +- artifact() +- } +- patternLayout { ++ layout "pattern", { + artifact "[artifact].[ext]" + } + } + ivy { + url FFmpegRepositoryURL +- metadataSources { +- artifact() +- } +- patternLayout { ++ layout "pattern", { + artifact "[artifact].[ext]" + } + } +@@ -4351,7 +4339,6 @@ allprojects { + project.jar.enabled = false - // Stable publishing behavior is the default in gradle 5.x. - // This setting enables it in gradle 4.8 to help with the transition. --enableFeaturePreview('STABLE_PUBLISHING') -+// enableFeaturePreview('STABLE_PUBLISHING') + // and redirect the resources into the module +- project.sourceSets.main.output.resourcesDir = project.moduleDir + project.processResources.destinationDir = project.moduleDir + } - def closedDir = file("../rt-closed") - def buildClosed = closedDir.isDirectory() +@@ -4385,7 +4372,6 @@ allprojects { + project.sourceSets.shims.resources.srcDirs += project.sourceSets.main.resources.srcDirs + + // and redirect the resources into the module +- project.sourceSets.shims.output.resourcesDir = project.moduleShimsDir + project.processShimsResources.destinationDir = project.moduleShimsDir + + compileTestJava.dependsOn(copyGeneratedShimsTask) +--- a/build.properties ++++ b/build.properties +@@ -84,8 +84,8 @@ jfx.build.jdk.buildnum.min=46 + # gradle/legal/gradle.md. + # The jfx.gradle.version.min property defines the minimum version of gradle + # that is supported. It must be <= jfx.gradle.version. +-jfx.gradle.version=6.3 +-jfx.gradle.version.min=5.3 ++jfx.gradle.version=5.3 ++jfx.gradle.version.min=4.8 + + # Toolchains + jfx.build.linux.gcc.version=gcc10.2.0-OL6.4+1.0 +--- a/buildSrc/build.gradle ++++ b/buildSrc/build.gradle +@@ -61,10 +61,7 @@ repositories { + if (buildClosed) { + ivy { + url jfxRepositoryURL +- metadataSources { +- artifact() +- } +- patternLayout { ++ layout "pattern", { + artifact "[artifact]-[revision].[ext]" + artifact "[artifact].[ext]" + } ++++++ openjfx-nowerror.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.627452507 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.631452502 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/buildSrc/linux.gradle 2018-12-10 17:30:22.000000000 +0100 -+++ rt-11.0.6+2/buildSrc/linux.gradle 2019-11-20 22:23:57.289718124 +0100 -@@ -44,7 +44,7 @@ +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -44,7 +44,7 @@ LINUX.library = { name -> return (IS_STATIC_BUILD ? "lib${name}.a" : "lib${name} def commonFlags = [ "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags "-fstack-protector", @@ -9,7 +9,7 @@ if (!IS_64) { commonFlags += "-m32" -@@ -226,7 +226,7 @@ +@@ -226,7 +226,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g LINUX.glass.glass = [:] LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles() LINUX.glass.glass.compiler = compiler @@ -18,7 +18,7 @@ LINUX.glass.glass.linker = linker LINUX.glass.glass.linkFlags = IS_STATIC_BUILD? linkFlags : [linkFlags, "-lX11", "-ldl"].flatten() LINUX.glass.glass.lib = "glass" -@@ -236,7 +236,7 @@ +@@ -236,7 +236,7 @@ LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles() LINUX.glass.glassgtk2.compiler = compiler LINUX.glass.glassgtk2.ccFlags = IS_STATIC_BUILD ? ["-fno-threadsafe-statics", cppFlags, gtk2CCFlags].flatten() : @@ -27,7 +27,7 @@ LINUX.glass.glassgtk2.linker = linker LINUX.glass.glassgtk2.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk2LinkFlags].flatten() LINUX.glass.glassgtk2.lib = "glassgtk2" -@@ -246,7 +246,7 @@ +@@ -246,7 +246,7 @@ LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles() LINUX.glass.glassgtk3.compiler = compiler LINUX.glass.glassgtk3.ccFlags = IS_STATIC_BUILD ? ["-fno-threadsafe-statics", cppFlags, gtk3CCFlags].flatten() : ++++++ openjfx-pango.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.643452490 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.647452487 +0200 @@ -1,6 +1,6 @@ ---- rt-11.0.6+2/modules/javafx.graphics/src/main/native-font/pango.c 2020-01-15 16:05:47.000000000 +0100 -+++ rt-11.0.6+2/modules/javafx.graphics/src/main/native-font/pango.c 2020-01-17 10:13:40.784597380 +0100 -@@ -225,7 +225,7 @@ +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -243,7 +243,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) if (text) { // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); if (fp) { ++++++ openjfx-rpm-build.patch ++++++ --- /var/tmp/diff_new_pack.qHgZcc/_old 2021-07-27 14:32:35.659452475 +0200 +++ /var/tmp/diff_new_pack.qHgZcc/_new 2021-07-27 14:32:35.659452475 +0200 @@ -1,6 +1,6 @@ ---- a/build.gradle Wed Jan 15 16:07:02 2020 +0100 -+++ b/build.gradle Wed Jan 22 11:08:21 2020 +0100 -@@ -336,7 +336,7 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -336,7 +336,7 @@ defineProperty("JAVA", cygpathExe("$JDK_HOME/bin/java")) defineProperty("JAVAC", cygpathExe("$JDK_HOME/bin/javac")) defineProperty("JAVADOC", cygpathExe("$JDK_HOME/bin/javadoc")) defineProperty("JMOD", cygpathExe("$JDK_HOME/bin/jmod")) @@ -9,7 +9,7 @@ defineProperty("JDK_JMODS", cygpath(System.getenv("JDK_JMODS")) ?: cygpath(System.getenv("JDK_HOME") + "/jmods")) defineProperty("javaRuntimeVersion", System.getProperty("java.runtime.version")) -@@ -503,10 +503,10 @@ +@@ -516,10 +516,10 @@ if (IS_MAC) { // // The following properties should be left alone by developers and set only from Hudson. @@ -22,7 +22,7 @@ ext.IS_MILESTONE_FCS = Boolean.parseBoolean(MILESTONE_FCS) // The following properties define the product name for Oracle JDK and OpenJDK -@@ -541,8 +541,10 @@ +@@ -554,8 +554,10 @@ if (jfxReleasePatchVersion == "0") { defineProperty("RELEASE_VERSION", relVer) defineProperty("RELEASE_VERSION_PADDED", "${jfxReleaseMajorVersion}.${jfxReleaseMinorVersion}.${jfxReleaseSecurityVersion}.${jfxReleasePatchVersion}") @@ -35,7 +35,7 @@ defineProperty("BUILD_TIMESTAMP", buildTimestamp) def relSuffix = "" def relOpt = "" -@@ -555,7 +557,7 @@ +@@ -568,7 +570,7 @@ if (HUDSON_JOB_NAME == "not_hudson") { defineProperty("RELEASE_SUFFIX", relSuffix) defineProperty("RELEASE_VERSION_SHORT", "${RELEASE_VERSION}${RELEASE_SUFFIX}") defineProperty("RELEASE_VERSION_LONG", "${RELEASE_VERSION_SHORT}+${PROMOTED_BUILD_NUMBER}${relOpt}")
