Merge

build.gradle

@@ -3810,6 +3810,7 @@ allprojects {
         project.jar.enabled = false
 
         // and redirect the resources into the module
+        project.sourceSets.main.output.resourcesDir = project.moduleDir
         project.processResources.destinationDir = project.moduleDir
     }
 
@@ -3843,6 +3844,7 @@ 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)

build.properties

@@ -85,7 +85,7 @@ jfx.build.jdk.buildnum.min=28
 # The jfx.gradle.version.min property defines the minimum version of gradle
 # that is supported. It must be <= jfx.gradle.version.
 jfx.gradle.version=5.3
-jfx.gradle.version.min=4.8
+jfx.gradle.version.min=5.3
 
 # Toolchains
 jfx.build.linux.gcc.version=gcc8.2.0-OL6.4+1.0

buildSrc/crosslibs/crosslibs-armv6hf.sh

@@ -228,7 +228,7 @@ installLibs() {
 
     getPackages  \
         $DESTINATION \
-        http://ftp.us.debian.org/debian/ wheezy main armhf \
+        http://archive.debian.org/debian/ wheezy main armhf \
             libatk1.0-dev \
             libatk1.0-0 \
             libc6 \
@@ -389,7 +389,7 @@ installLibs() {
     # get some rapberry Pi specials
     getPackages  \
         $DESTINATION \
-        http://archive.raspbian.org/raspbian wheezy firmware armhf \
+        http://legacy.raspbian.org/raspbian wheezy firmware armhf \
         libraspberrypi-dev
 }
 

settings.gradle

@@ -35,10 +35,6 @@ project(":web").projectDir = file("modules/javafx.web")
 project(":media").projectDir = file("modules/javafx.media")
 project(":systemTests").projectDir = file("tests/system")
 
-// 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')
-
 def closedDir = file("../rt-closed")
 def buildClosed = closedDir.isDirectory()