From f595cc19dd6f1b22ea48ee6d0e99c7bd03e245e1 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Thu, 3 Oct 2019 16:58:02 +0000 Subject: [PATCH 1/3] 8231735: gradle checkrepo is obsolete and doesn't work with git Reviewed-by: aghaisas --- build.gradle | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/build.gradle b/build.gradle index f33bb243fc5..22063aa24d7 100644 --- 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 * From 0a0d34a052815e362e85ec1e077c9758a91f5ac7 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Thu, 3 Oct 2019 21:48:44 +0000 Subject: [PATCH 2/3] 8231590: Update location of jfx repo to GitHub in third-party legal files Reviewed-by: almatvee --- modules/javafx.media/src/main/legal/glib.md | 2 +- modules/javafx.media/src/main/legal/gstreamer.md | 2 +- modules/javafx.web/src/main/legal/webkit.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/javafx.media/src/main/legal/glib.md b/modules/javafx.media/src/main/legal/glib.md index e366117b94b..6c98bb6ce16 100644 --- a/modules/javafx.media/src/main/legal/glib.md +++ b/modules/javafx.media/src/main/legal/glib.md @@ -17,7 +17,7 @@ this library: A copy of the Oracle modified GNU Glib library source code is located in the following OpenJDK Mercurial repository: - http://hg.openjdk.java.net/openjfx/jfx/rt + https://github.com/openjdk/jfx You can use Mercurial to clone the repository or you can browse the source using a web browser. The root directory of the GNU Glib source diff --git a/modules/javafx.media/src/main/legal/gstreamer.md b/modules/javafx.media/src/main/legal/gstreamer.md index 54f80b41f89..ace65dfff3b 100644 --- a/modules/javafx.media/src/main/legal/gstreamer.md +++ b/modules/javafx.media/src/main/legal/gstreamer.md @@ -17,7 +17,7 @@ this library: A copy of the Oracle modified GStreamer library source code is located in the following OpenJDK Mercurial repository: - http://hg.openjdk.java.net/openjfx/jfx/rt + https://github.com/openjdk/jfx You can use Mercurial to clone the repository or you can browse the source using a web browser. The root directory of the GStreamer source diff --git a/modules/javafx.web/src/main/legal/webkit.md b/modules/javafx.web/src/main/legal/webkit.md index 456c3c2fe0e..072e12b8c5a 100644 --- a/modules/javafx.web/src/main/legal/webkit.md +++ b/modules/javafx.web/src/main/legal/webkit.md @@ -17,7 +17,7 @@ this library: A copy of the Oracle modified WebKit library source code is located in the following OpenJDK Mercurial repository: - http://hg.openjdk.java.net/openjfx/jfx/rt + https://github.com/openjdk/jfx You can use Mercurial to clone the repository or you can browse the source using a web browser. The root directory of the WebKit source From c6eb0918b223c232b33b27800a9a8ee294ecf9ce Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Fri, 4 Oct 2019 12:59:35 +0000 Subject: [PATCH 3/3] 8231854: Change Mercurial to git in various README files Reviewed-by: ghb --- apps/samples/Ensemble8/UPDATING-lucene.txt | 2 +- modules/javafx.media/src/main/legal/glib.md | 4 ++-- modules/javafx.media/src/main/legal/gstreamer.md | 4 ++-- modules/javafx.web/src/main/legal/webkit.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/samples/Ensemble8/UPDATING-lucene.txt b/apps/samples/Ensemble8/UPDATING-lucene.txt index 07480bac5e4..b8058d9eefb 100644 --- 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/modules/javafx.media/src/main/legal/glib.md b/modules/javafx.media/src/main/legal/glib.md index 6c98bb6ce16..d71d0ab7366 100644 --- 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: 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 index ace65dfff3b..a5837c12924 100644 --- 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: 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 index 072e12b8c5a..e4cbc1e2d90 100644 --- 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: 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: