Merge

build.gradle

@@ -1833,7 +1833,10 @@ allprojects {
         repositories {
             ivy {
                 url JFX_DEPS_URL
-                layout "pattern", {
+                metadataSources {
+                    artifact()
+                }
+                patternLayout {
                     artifact "[artifact]-[revision](-[classifier]).[ext]"
                     artifact "[artifact].[ext]"
                 }
@@ -1846,7 +1849,10 @@ allprojects {
             mavenCentral()
             ivy {
                 url "https://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
-                layout "pattern", {
+                metadataSources {
+                    artifact()
+                }
+                patternLayout {
                     artifact "[artifact].[ext]"
                 }
             }
@@ -1857,13 +1863,19 @@ allprojects {
         repositories {
             ivy {
                 url libAVRepositoryURL
-                layout "pattern", {
+                metadataSources {
+                    artifact()
+                }
+                patternLayout {
                     artifact "[artifact].[ext]"
                 }
             }
             ivy {
                 url FFmpegRepositoryURL
-                layout "pattern", {
+                metadataSources {
+                    artifact()
+                }
+                patternLayout {
                     artifact "[artifact].[ext]"
                 }
             }

build.properties

@@ -84,12 +84,12 @@ jfx.build.jdk.buildnum.min=28
 # 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=5.3
+jfx.gradle.version=6.0
 jfx.gradle.version.min=5.3
 
 # Toolchains
-jfx.build.linux.gcc.version=gcc8.2.0-OL6.4+1.0
-jfx.build.windows.msvc.version=VS2017-15.9.6+1.0
+jfx.build.linux.gcc.version=gcc8.3.0-OL6.4+1.0
+jfx.build.windows.msvc.version=VS2017-15.9.16+1.0
 jfx.build.macosx.xcode.version=Xcode10.1-MacOSX10.14+1.0
 
 # Build tools

buildSrc/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,10 @@ repositories {
     if (buildClosed) {
         ivy {
             url jfxRepositoryURL
-            layout "pattern", {
+            metadataSources {
+                artifact()
+            }
+            patternLayout {
                 artifact "[artifact]-[revision].[ext]"
                 artifact "[artifact].[ext]"
             }

gradle/legal/gradle.md

@@ -1,4 +1,4 @@
-## Gradle v5.3
+## Gradle v6.0
 
 ### Apache 2.0 License
 ```

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanBooleanPropertyBuilder.java

@@ -62,8 +62,9 @@ public final class JavaBeanBooleanPropertyBuilder {
     private final JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
 
     /**
-     * <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
      */
+    @Deprecated(since="14", forRemoval=true)
     public JavaBeanBooleanPropertyBuilder() {}
 
     /**

modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanDoublePropertyBuilder.java

@@ -62,8 +62,9 @@ public final class JavaBeanDoublePropertyBuilder {
     private final JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
 
     /**
-     * <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
      */
+    @Deprecated(since="14", forRemoval=true)
     public JavaBeanDoublePropertyBuilder() {}
 
     /**

modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanFloatPropertyBuilder.java

@@ -62,8 +62,9 @@ public final class JavaBeanFloatPropertyBuilder {
     private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
 
     /**
-     * <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
      */
+    @Deprecated(since="14", forRemoval=true)
     public JavaBeanFloatPropertyBuilder() {}
 
     /**

modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanIntegerPropertyBuilder.java

@@ -62,8 +62,9 @@ public final class JavaBeanIntegerPropertyBuilder {
     private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
 
     /**
-     * <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
      */
+    @Deprecated(since="14", forRemoval=true)
     public JavaBeanIntegerPropertyBuilder() {}
 
     /**

modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanLongPropertyBuilder.java

@@ -62,8 +62,9 @@ public final class JavaBeanLongPropertyBuilder {
     private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
 
     /**
-     * <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
      */
+    @Deprecated(since="14", forRemoval=true)
     public JavaBeanLongPropertyBuilder() {}
 
     /**

modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectPropertyBuilder.java

@@ -64,8 +64,9 @@ public final class JavaBeanObjectPropertyBuilder<T> {
     private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
 
     /**
-     * <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
      */
+    @Deprecated(since="14", forRemoval=true)
     public JavaBeanObjectPropertyBuilder() {}
 
     /**

modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanStringPropertyBuilder.java

@@ -62,8 +62,9 @@ public final class JavaBeanStringPropertyBuilder {
     private JavaBeanPropertyBuilderHelper helper = new JavaBeanPropertyBuilderHelper();
 
     /**
-     * <b>Do not use this constructor.</b> It will be deprecated in the next version. Use {@link #create()} instead.
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
      */
+    @Deprecated(since="14", forRemoval=true)
     public JavaBeanStringPropertyBuilder() {}
 
     /**

modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanBooleanPropertyBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanBooleanPropertyBuilder {
 
     private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
 
+    /**
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
+     */
+    @Deprecated(since="14", forRemoval=true)
+    public ReadOnlyJavaBeanBooleanPropertyBuilder() {}
+
     /**
      * Create a new instance of {@code ReadOnlyJavaBeanBooleanPropertyBuilder}
      *

modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanDoublePropertyBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanDoublePropertyBuilder {
 
     private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
 
+    /**
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
+     */
+    @Deprecated(since="14", forRemoval=true)
+    public ReadOnlyJavaBeanDoublePropertyBuilder() {}
+
     /**
      * Create a new instance of {@code ReadOnlyJavaBeanDoublePropertyBuilder}
      *

modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanFloatPropertyBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanFloatPropertyBuilder {
 
     private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
 
+    /**
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
+     */
+    @Deprecated(since="14", forRemoval=true)
+    public ReadOnlyJavaBeanFloatPropertyBuilder() {}
+
     /**
      * Create a new instance of {@code ReadOnlyJavaBeanFloatPropertyBuilder}
      *

modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanIntegerPropertyBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanIntegerPropertyBuilder {
 
     private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
 
+    /**
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
+     */
+    @Deprecated(since="14", forRemoval=true)
+    public ReadOnlyJavaBeanIntegerPropertyBuilder() {}
+
     /**
      * Create a new instance of {@code ReadOnlyJavaBeanIntegerPropertyBuilder}
      *

modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanLongPropertyBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanLongPropertyBuilder {
 
     private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
 
+    /**
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
+     */
+    @Deprecated(since="14", forRemoval=true)
+    public ReadOnlyJavaBeanLongPropertyBuilder() {}
+
     /**
      * Create a new instance of {@code ReadOnlyJavaBeanLongPropertyBuilder}
      *

modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanObjectPropertyBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,12 @@ public final class ReadOnlyJavaBeanObjectPropertyBuilder<T> {
 
     private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
 
+    /**
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
+     */
+    @Deprecated(since="14", forRemoval=true)
+    public ReadOnlyJavaBeanObjectPropertyBuilder() {}
+
     /**
      * Create a new instance of {@code ReadOnlyJavaBeanObjectPropertyBuilder}
      *

modules/javafx.base/src/main/java/javafx/beans/property/adapter/ReadOnlyJavaBeanStringPropertyBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,12 @@ public final class ReadOnlyJavaBeanStringPropertyBuilder {
 
     private final ReadOnlyJavaBeanPropertyBuilderHelper helper = new ReadOnlyJavaBeanPropertyBuilderHelper();
 
+    /**
+     * @deprecated This constructor was exposed erroneously and will be removed in the next version. Use {@link #create()} instead.
+     */
+    @Deprecated(since="14", forRemoval=true)
+    public ReadOnlyJavaBeanStringPropertyBuilder() {}
+
     /**
      * Create a new instance of {@code ReadOnlyJavaBeanStringPropertyBuilder}
      *

modules/javafx.controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -859,7 +859,7 @@ public void defaultConverterCanHandleIncorrectType_2() {
         assertTrue(sm.isSelected(2));
     }
 
-    @Ignore("Test not working as the heights being returned are not accurate")
+    @Ignore("JDK-8091127 Test not working as the heights being returned are not accurate")
     @Test public void test_rt20106() {
         comboBox.getItems().addAll("0","1","2","3","4","5","6","7","8","9");
 
@@ -948,7 +948,6 @@ public void defaultConverterCanHandleIncorrectType_2() {
         assertEquals("TO_STRING", cell.getText());
     }
 
-    @Ignore
     @Test public void test_rt20189() {
         comboBox.getItems().addAll("0","1","2","3","4","5","6","7","8","9");
 
@@ -958,8 +957,6 @@ public void defaultConverterCanHandleIncorrectType_2() {
         comboBox.applyCss();
         comboBox.show();
 
-        SelectionModel sm = getListView().getSelectionModel();
-
         comboBox.getSelectionModel().select(2);
         Object item = sm.getSelectedItem();
         assertEquals("2", item);
@@ -1200,7 +1197,6 @@ public void defaultConverterCanHandleIncorrectType_2() {
     }
 
     private int test_rt34603_count = 0;
-    @Ignore("Bug has not yet been resolved")
     @Test public void test_rt34603() {
         assertEquals(0, test_rt34603_count);
 

modules/javafx.controls/src/test/java/test/javafx/scene/control/HyperlinkTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@
 import javafx.scene.shape.Rectangle;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class HyperlinkTest {
@@ -176,29 +175,6 @@ public class HyperlinkTest {
         }
     }
 
-    @Ignore ("replaced by visitedPropertyIsNotStyleable")
-    @Test public void whenVisitedIsBound_impl_cssSettable_ReturnsFalse() {
-        // will return null!
-        CssMetaData styleable = ((StyleableProperty)link.visitedProperty()).getCssMetaData();
-        assertFalse(styleable.isSettable(link));
-        BooleanProperty other = new SimpleBooleanProperty(true);
-        link.visitedProperty().bind(other);
-    }
-
-    @Ignore ("replaced by visitedPropertyIsNotStyleable")
-    @Test public void whenVisitedIsSpecifiedViaCSSAndIsNotBound_impl_cssSettable_ReturnsFalse() {
-        // will return null!
-        CssMetaData styleable = ((StyleableProperty)link.visitedProperty()).getCssMetaData();
-        assertFalse(styleable.isSettable(link));
-    }
-
-    @Ignore ("replaced by visitedPropertyIsNotStyleable")
-    @Test public void cannotSpecifyVisitedViaCSS() {
-        // will return null!
-        ((StyleableProperty)link.visitedProperty()).applyStyle(null, Boolean.TRUE);
-        assertFalse(link.isVisited());
-    }
-
     @Test public void settingVisitedSetsPseudoClass() {
         link.setVisited(true);
         assertPseudoClassExists(link, "visited");