Merge

openjdk · Oct 4, 2019 · 1325f11 · 1325f11
2 parents f759dd9 + a4bc22d
commit 1325f11
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 36 deletions.
diff --git a/apps/samples/Ensemble8/UPDATING-lucene.txt b/apps/samples/Ensemble8/UPDATING-lucene.txt
@@ -22,7 +22,7 @@ $ cd apps/samples/Ensemble8
 $ rm -rf src/generated/resources/ensemble/search/index
 $ ant -Dplatforms.JDK_1.9.home=$JAVA_HOME clean ensemble-generate-search-index jar
 $ rm src/generated/resources/ensemble/search/index/write.lock
-$ hg addremove src/generated/resources/ensemble/search/index
+$ git add --all src/generated/resources/ensemble/search/index
 
 
 4. Test it by running Ensemble and entering text into the search box (upper right)
diff --git a/build.gradle b/build.gradle
@@ -5170,32 +5170,6 @@ compileTargets { t ->
     }
 }
 
-task checkrepo() {
-    doLast {
-        logger.info("checking for whitespace (open)");
-        exec {
-            if (IS_WINDOWS) {
-                commandLine  'bash', 'tools/scripts/checkWhiteSpace'
-            } else {
-                commandLine  'bash', 'tools/scripts/checkWhiteSpace', '-x'
-            }
-        }
-    }
-}
-
-task checkrepoall() {
-    doLast {
-        logger.info("checking for all whitespace (open)");
-        exec {
-            if (IS_WINDOWS) {
-                commandLine  'bash', 'tools/scripts/checkWhiteSpace', '-a'
-            } else {
-                commandLine  'bash', 'tools/scripts/checkWhiteSpace', '-x', '-a'
-            }
-        }
-    }
-}
-
 /******************************************************************************
  *                                                                            *
  *                              BUILD_CLOSED                                  *

diff --git a/modules/javafx.media/src/main/legal/glib.md b/modules/javafx.media/src/main/legal/glib.md
@@ -15,11 +15,11 @@ this library:
    - On Windows systems: delete $(JAVA_HOME)\bin\glib-lite.dll
 
 A copy of the Oracle modified GNU Glib library source code is located
-in the following OpenJDK Mercurial repository:
+in the following OpenJDK git repository:
 
-   http:https://hg.openjdk.java.net/openjfx/jfx/rt
+   https:https://github.com/openjdk/jfx
 
-You can use Mercurial to clone the repository or you can browse the
+You can use git to clone the repository or you can browse the
 source using a web browser. The root directory of the GNU Glib source
 code is here:
 

diff --git a/modules/javafx.media/src/main/legal/gstreamer.md b/modules/javafx.media/src/main/legal/gstreamer.md
@@ -15,11 +15,11 @@ this library:
    - On Windows systems: delete $(JAVA_HOME)\bin\gstreamer-lite.dll
 
 A copy of the Oracle modified GStreamer library source code is located
-in the following OpenJDK Mercurial repository:
+in the following OpenJDK git repository:
 
-   http:https://hg.openjdk.java.net/openjfx/jfx/rt
+   https:https://github.com/openjdk/jfx
 
-You can use Mercurial to clone the repository or you can browse the
+You can use git to clone the repository or you can browse the
 source using a web browser. The root directory of the GStreamer source
 code is here:
 

diff --git a/modules/javafx.web/src/main/legal/webkit.md b/modules/javafx.web/src/main/legal/webkit.md
@@ -15,11 +15,11 @@ this library:
    - On Windows systems: delete $(JAVA_HOME)\bin\jfxwebkit.dll
 
 A copy of the Oracle modified WebKit library source code is located
-in the following OpenJDK Mercurial repository:
+in the following OpenJDK git repository:
 
-   http:https://hg.openjdk.java.net/openjfx/jfx/rt
+   https:https://github.com/openjdk/jfx
 
-You can use Mercurial to clone the repository or you can browse the
+You can use git to clone the repository or you can browse the
 source using a web browser. The root directory of the WebKit source
 code is here: