java/eclipse: update to 4.15

PR:		244927
Submitted by:	Jonathan Chen <jonc@chen.org.nz>  (maintainer)

11 files changed, 91 insertions, 105 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index c28744e16323..93e6c0bd0229 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	eclipse
-PORTVERSION=	4.14
+PORTVERSION=	4.15
 CATEGORIES=	java devel
 
-# Update to git-tag on git.eclipse.org
-ECLIPSE_TAG=	R4_14
-ECLIPSE_TSTAMP=	20191220-0429
+# Update to eclipse.platform.releng.aggregator.git git-tag on git.eclipse.org
+ECLIPSE_TAG=	R4_15
+ECLIPSE_TSTAMP=	20200318-1047
 
 ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
 ECLIPSE_MODULES=jdt/eclipse.jdt \
@@ -45,7 +45,7 @@ DISTFILES+=	${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jonc@chen.org.nz
-COMMENT=	Eclipse IDE 2019-12
+COMMENT=	Eclipse IDE 2020-03
 
 LICENSE=	EPL
 
@@ -62,7 +62,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	daemonblade
 GH_PROJECT=	eclipse-maven-repo
 
-USE_JAVA=	8
+USE_JAVA=	11+
 
 DESKTOP_ENTRIES="Eclipse" \
 		"${COMMENT}" \
diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo
index acf0ef50bc64..ccf263f2461c 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,53 +1,53 @@
-TIMESTAMP = 1577767743
-SHA256 (eclipse/eclipse.jdt-R4_14.tar.xz) = 5f577c57eb8cb4994a5d0e1e084d0bbb2f4e7277f6660e55281a5cb5c4f49fe3
-SIZE (eclipse/eclipse.jdt-R4_14.tar.xz) = 37472
-SHA256 (eclipse/eclipse.jdt.core-R4_14.tar.xz) = 650cb2292e0be904ca8cea6658e598289e2c0f71a130e15bca742674d7f8db8e
-SIZE (eclipse/eclipse.jdt.core-R4_14.tar.xz) = 8532944
-SHA256 (eclipse/eclipse.jdt.core.binaries-R4_14.tar.xz) = 14c823ee07fbf8fb8dfc7c597640da66d05c205753c0ceca80fafa63d1844c79
-SIZE (eclipse/eclipse.jdt.core.binaries-R4_14.tar.xz) = 34417384
-SHA256 (eclipse/eclipse.jdt.debug-R4_14.tar.xz) = ae5901055a7e4fec14d4a01e4825ef68c0abd449e79c146bce89d33a6324fa05
-SIZE (eclipse/eclipse.jdt.debug-R4_14.tar.xz) = 1435944
-SHA256 (eclipse/eclipse.jdt.ui-R4_14.tar.xz) = 135bad844a43bf60c11d22ef4adf691445b35b06e24ad01304ae17d357b93325
-SIZE (eclipse/eclipse.jdt.ui-R4_14.tar.xz) = 15020316
-SHA256 (eclipse/eclipse.pde.build-R4_14.tar.xz) = 9a62bed3f0def46d1bb22cd0e59ee6e2827d7c74ef0b35576e14dea81efedd85
-SIZE (eclipse/eclipse.pde.build-R4_14.tar.xz) = 868360
-SHA256 (eclipse/eclipse.pde.ui-R4_14.tar.xz) = 8e6566eb0d6176e3ca7d1faef1b36504c450a7d894d9483597319b7b2bb1774c
-SIZE (eclipse/eclipse.pde.ui-R4_14.tar.xz) = 29827820
-SHA256 (eclipse/eclipse.platform-R4_14.tar.xz) = fccccc8818ce8d43fff0e1e089df29cf6a31d23f5b1234e398eb1f34c83f5724
-SIZE (eclipse/eclipse.platform-R4_14.tar.xz) = 1369868
-SHA256 (eclipse/eclipse.platform.common-R4_14.tar.xz) = d0ed5aa143f81c22f4a031a96179c70790a43239717a4a8f1543d91f9a33ed05
-SIZE (eclipse/eclipse.platform.common-R4_14.tar.xz) = 34297556
-SHA256 (eclipse/eclipse.platform.debug-R4_14.tar.xz) = f1b1447ffa05bd13a448d2c1fc127d20e54a0662a0ba62f539a12b15d4b59e47
-SIZE (eclipse/eclipse.platform.debug-R4_14.tar.xz) = 1367732
-SHA256 (eclipse/eclipse.platform.releng-R4_14.tar.xz) = d4802b92df3c4a303741e8b31edb010464cba8eae5ff39ce502cb198921592be
-SIZE (eclipse/eclipse.platform.releng-R4_14.tar.xz) = 408388
-SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_14.tar.xz) = 1192f7fd4746d6083dd9a3bdfb49fa52703e8fa848096a73fe7d0ee3ddc1dbdd
-SIZE (eclipse/eclipse.platform.releng.aggregator-R4_14.tar.xz) = 689936
-SHA256 (eclipse/eclipse.platform.resources-R4_14.tar.xz) = cbd69d80478aca49d61f5c676a09f8098310c10833f69612699bc8b3d757f0af
-SIZE (eclipse/eclipse.platform.resources-R4_14.tar.xz) = 818836
-SHA256 (eclipse/eclipse.platform.runtime-R4_14.tar.xz) = a3487152397f997cb47a403bc64e270b5db17a08a5ce3b3223c5d77ae7057745
-SIZE (eclipse/eclipse.platform.runtime-R4_14.tar.xz) = 433100
-SHA256 (eclipse/eclipse.platform.swt-R4_14.tar.xz) = 1078174b76ea8d02f879956daa88c9d55805d51b3c02fe34ddf4e2239c4f2eb8
-SIZE (eclipse/eclipse.platform.swt-R4_14.tar.xz) = 6142300
-SHA256 (eclipse/eclipse.platform.swt.binaries-R4_14.tar.xz) = b030736e2a9e8e8c40affcd75e9bd78b76f379dbb8d406b51294e8f66ea5e386
-SIZE (eclipse/eclipse.platform.swt.binaries-R4_14.tar.xz) = 606164
-SHA256 (eclipse/eclipse.platform.team-R4_14.tar.xz) = 1753b5cd9df8dd47f167ee0d33cf63f6737389296f8ece95b0790d68890273b3
-SIZE (eclipse/eclipse.platform.team-R4_14.tar.xz) = 4633852
-SHA256 (eclipse/eclipse.platform.text-R4_14.tar.xz) = 2d48c1d855e520227d3a08cc54dad70dafab4563cacafa331d5cddcb36280325
-SIZE (eclipse/eclipse.platform.text-R4_14.tar.xz) = 1304152
-SHA256 (eclipse/eclipse.platform.ua-R4_14.tar.xz) = f5f97ad6797a4fa66457a36ec11dc27d09fa9d22c735d44cd4735f39acbbd714
-SIZE (eclipse/eclipse.platform.ua-R4_14.tar.xz) = 4532772
-SHA256 (eclipse/eclipse.platform.ui-R4_14.tar.xz) = 594c8fe38ba6eeb3c6844a460e7bbc406a633030b192fea40887d2190ebdea08
-SIZE (eclipse/eclipse.platform.ui-R4_14.tar.xz) = 5949320
-SHA256 (eclipse/eclipse.platform.ui.tools-R4_14.tar.xz) = 112ab40eb5db342c6948dd36c94fc8637b4d01f9470068e6bf1aa06563c2cc59
-SIZE (eclipse/eclipse.platform.ui.tools-R4_14.tar.xz) = 319832
-SHA256 (eclipse/rt.equinox.binaries-R4_14.tar.xz) = 2e419d56e2b5ed4d9a85bfc47e752061c5efffb9042db5b76b96b8777d55b73a
-SIZE (eclipse/rt.equinox.binaries-R4_14.tar.xz) = 298664
-SHA256 (eclipse/rt.equinox.bundles-R4_14.tar.xz) = 74dab60a8c1a3e788b07423e9eb0adc3ff1fd937e68c148dc31f7b0fbf7142bf
-SIZE (eclipse/rt.equinox.bundles-R4_14.tar.xz) = 1152024
-SHA256 (eclipse/rt.equinox.framework-R4_14.tar.xz) = 014150fd8d9552e9664ef7a1e29e760388cf592d4b0b52574566e96da0fa0ad4
-SIZE (eclipse/rt.equinox.framework-R4_14.tar.xz) = 2820048
-SHA256 (eclipse/rt.equinox.p2-R4_14.tar.xz) = 36dc7555430277635627d214cea650c13db703fa26302bb47dc3719f68feff67
-SIZE (eclipse/rt.equinox.p2-R4_14.tar.xz) = 48492172
-SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.14_GH0.tar.gz) = c9c2045ee30995765d6a64d53258289aa413ecaf4a81dafe19ab204329aabe89
-SIZE (eclipse/daemonblade-eclipse-maven-repo-4.14_GH0.tar.gz) = 188740301
+TIMESTAMP = 1584679339
+SHA256 (eclipse/eclipse.jdt-R4_15.tar.xz) = e19048ee90c06306567f1cd676dd6eb39bc962c944b1f0252d042284f1908d88
+SIZE (eclipse/eclipse.jdt-R4_15.tar.xz) = 37572
+SHA256 (eclipse/eclipse.jdt.core-R4_15.tar.xz) = b663e63962eff041615c13a06e28ed6e3e0afcc9e8560306f0e70d63f1009ca0
+SIZE (eclipse/eclipse.jdt.core-R4_15.tar.xz) = 8551616
+SHA256 (eclipse/eclipse.jdt.core.binaries-R4_15.tar.xz) = cdc2430eaedd9d140db2f20239c33aad3b74f5206106f40050947e0889f41e50
+SIZE (eclipse/eclipse.jdt.core.binaries-R4_15.tar.xz) = 34416588
+SHA256 (eclipse/eclipse.jdt.debug-R4_15.tar.xz) = f184afa9c033fdfc96ac3e3d97dc25257919d2de709adf646f2a9df7d53231cb
+SIZE (eclipse/eclipse.jdt.debug-R4_15.tar.xz) = 1449716
+SHA256 (eclipse/eclipse.jdt.ui-R4_15.tar.xz) = 1a5bd4c6b99ff55a3bac9d34cb2627a207240a90599d9aeb744e5066026949ec
+SIZE (eclipse/eclipse.jdt.ui-R4_15.tar.xz) = 15131660
+SHA256 (eclipse/eclipse.pde.build-R4_15.tar.xz) = daf47aed01e96b92b2c102c5a036f337c9f6408a2e653d342a6cf24571270548
+SIZE (eclipse/eclipse.pde.build-R4_15.tar.xz) = 868656
+SHA256 (eclipse/eclipse.pde.ui-R4_15.tar.xz) = b980c295042d96b93161e138d7a6f682a30882d1b4b73b6827286c154d4d7c3a
+SIZE (eclipse/eclipse.pde.ui-R4_15.tar.xz) = 29829076
+SHA256 (eclipse/eclipse.platform-R4_15.tar.xz) = be0586f49b875766dca009b227f412af799b316c856e1c1d9d674f9b3906d81a
+SIZE (eclipse/eclipse.platform-R4_15.tar.xz) = 1363244
+SHA256 (eclipse/eclipse.platform.common-R4_15.tar.xz) = eea2d2f96d19a79401e64b279688d0ad6cca89a4d1ca2031609c4be2650e69d1
+SIZE (eclipse/eclipse.platform.common-R4_15.tar.xz) = 34958196
+SHA256 (eclipse/eclipse.platform.debug-R4_15.tar.xz) = b5a853bc08970411db4c389d3f3ff23e229f0200d292d00323eb97986b94c869
+SIZE (eclipse/eclipse.platform.debug-R4_15.tar.xz) = 1369696
+SHA256 (eclipse/eclipse.platform.releng-R4_15.tar.xz) = 29b4e8b0d2289bc052be8ae3162ffbcfa6bac6749f6a3b24ab78c9db731277ff
+SIZE (eclipse/eclipse.platform.releng-R4_15.tar.xz) = 408380
+SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_15.tar.xz) = 383e5f9a6267e1d478dfbe7f3b909f8a63d9518465d552bddf9a8d338d2c1b9f
+SIZE (eclipse/eclipse.platform.releng.aggregator-R4_15.tar.xz) = 693064
+SHA256 (eclipse/eclipse.platform.resources-R4_15.tar.xz) = 12846615fcc84abb7df669b674065ebf5698a848cf3391d912803f2045364a7e
+SIZE (eclipse/eclipse.platform.resources-R4_15.tar.xz) = 813408
+SHA256 (eclipse/eclipse.platform.runtime-R4_15.tar.xz) = d6364d57cafcb6c386dfbb59b4f3aa445d0fe0e6abe4c7986d2336acd50fcffb
+SIZE (eclipse/eclipse.platform.runtime-R4_15.tar.xz) = 431232
+SHA256 (eclipse/eclipse.platform.swt-R4_15.tar.xz) = 2d836da78db0dcebd315f98dc3bff8ad1df8ddd81adad381d8ad9ffb22efdc6f
+SIZE (eclipse/eclipse.platform.swt-R4_15.tar.xz) = 6089636
+SHA256 (eclipse/eclipse.platform.swt.binaries-R4_15.tar.xz) = ddf35a6902924b2a3351edba52a5b28ab744da9fe539a4b2d64dcaffa1164d00
+SIZE (eclipse/eclipse.platform.swt.binaries-R4_15.tar.xz) = 613600
+SHA256 (eclipse/eclipse.platform.team-R4_15.tar.xz) = abcdc28136d81f2f9a53fc9c88eef1ec9dd71fb08e774b6cb1e3996d07b0586c
+SIZE (eclipse/eclipse.platform.team-R4_15.tar.xz) = 4634640
+SHA256 (eclipse/eclipse.platform.text-R4_15.tar.xz) = ed5f134436b202096f6873e8cda6fe7a264b1942d575c9cc7f0ea4f4c132ec68
+SIZE (eclipse/eclipse.platform.text-R4_15.tar.xz) = 1306572
+SHA256 (eclipse/eclipse.platform.ua-R4_15.tar.xz) = 19af7c2ab16776779170405db0d732044119343bb6a59e0ecd63cfc809111d2d
+SIZE (eclipse/eclipse.platform.ua-R4_15.tar.xz) = 4619436
+SHA256 (eclipse/eclipse.platform.ui-R4_15.tar.xz) = 47c81e6245c49867837e71cd5f15b67846ac421c644251737d8210a974e8f4ae
+SIZE (eclipse/eclipse.platform.ui-R4_15.tar.xz) = 5960144
+SHA256 (eclipse/eclipse.platform.ui.tools-R4_15.tar.xz) = 7b90c081376125df0c3029121b3c05dda39e18375df4deba9c01b73da3cae100
+SIZE (eclipse/eclipse.platform.ui.tools-R4_15.tar.xz) = 319124
+SHA256 (eclipse/rt.equinox.binaries-R4_15.tar.xz) = 3e5e0ec55eb3c1933e47c637c8b75db85821e705aaa672d1848c5442fd67b937
+SIZE (eclipse/rt.equinox.binaries-R4_15.tar.xz) = 298624
+SHA256 (eclipse/rt.equinox.bundles-R4_15.tar.xz) = f4b02d3c5f516a2630a77db7b4e181d1d893aa3a80461479a5693709825e649b
+SIZE (eclipse/rt.equinox.bundles-R4_15.tar.xz) = 1152256
+SHA256 (eclipse/rt.equinox.framework-R4_15.tar.xz) = a834e4bfd80b3c5ea483dcdc584b0adde4bb447214d153f4d4c3f519177b76ec
+SIZE (eclipse/rt.equinox.framework-R4_15.tar.xz) = 2822776
+SHA256 (eclipse/rt.equinox.p2-R4_15.tar.xz) = c90e988c186186f0f3cd174e1e1b15829c6d6e2fefcc2df71687205b1c3e3920
+SIZE (eclipse/rt.equinox.p2-R4_15.tar.xz) = 48486692
+SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.15_GH0.tar.gz) = 666ba1ed30bf3b2d51c7b62c092c93fc3a6abf049c11eded2de9bc7e43564ef1
+SIZE (eclipse/daemonblade-eclipse-maven-repo-4.15_GH0.tar.gz) = 185792514
diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in
index 476350acca8a..42d2238d5ec4 100644
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -6,4 +6,4 @@
 #
 # $FreeBSD$
 #
-exec %%DATADIR%%/eclipse "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%DATADIR%%/eclipse "$@"
diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent
index 84e0e67d321c..674913b6dd17 100644
--- a/java/eclipse/files/patch-eclipse-platform-parent
+++ b/java/eclipse/files/patch-eclipse-platform-parent
@@ -5,11 +5,11 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
        'eclipiserun-repo' repository, such as for computing .api-descriptions and
        generating API Tools reports.
      -->
--    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds/</eclipserun-repo>
-+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14/</eclipserun-repo>
+-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds/</eclipserun-repo>
++    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15/</eclipserun-repo>
      
--    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds</comparator.repo>
-+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14</comparator.repo>
+-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds</comparator.repo>
++    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15</comparator.repo>
  
      <!--
        NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
@@ -36,8 +36,8 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
            For maintenance streams should always be "M-builds".
            Ideally, this value would be provided by the environment, see bug 489789.
          -->
--        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14-I-builds</eclipse-p2-repo.url>
-+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14</eclipse-p2-repo.url>
+-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15-I-builds</eclipse-p2-repo.url>
++        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15</eclipse-p2-repo.url>
        </properties>
        <repositories>
          <repository>
diff --git a/java/eclipse/files/patch-eclipse.platform.releng b/java/eclipse/files/patch-eclipse.platform.releng
index ac582eb15b46..90edfe676e80 100644
--- a/java/eclipse/files/patch-eclipse.platform.releng
+++ b/java/eclipse/files/patch-eclipse.platform.releng
@@ -14,7 +14,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -355,9 +355,9 @@
+@@ -362,9 +362,9 @@
           unpack="false"/>
  
     <plugin
@@ -27,7 +27,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -394,9 +394,9 @@
+@@ -401,9 +401,9 @@
           unpack="false"/>
  
     <plugin
@@ -40,7 +40,7 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/feature.x
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -458,9 +458,9 @@
+@@ -465,9 +465,9 @@
           unpack="false"/>
  
     <plugin
diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
index c55c2ef70d6d..f1174d3f2585 100644
--- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
+++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
@@ -98,10 +98,10 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/mai
  org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
  org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
  
--org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz
-+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13-win32-x86_64.zip
- org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13-macosx-cocoa-x86_64.tar.gz
+-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz
++org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14-win32-x86_64.zip
+ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14-macosx-cocoa-x86_64.tar.gz
  
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
@@ -110,11 +110,11 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/mai
  
  
  mkdir -p workarea/${buildId}/eclipse-testing
--cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
-+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
++cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
  
--cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
+-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
++cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
  
  cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
  
diff --git a/java/eclipse/files/patch-eclipse.platform.resources b/java/eclipse/files/patch-eclipse.platform.resources
index ae4a03dcd441..c771fc9ae4a1 100644
--- a/java/eclipse/files/patch-eclipse.platform.resources
+++ b/java/eclipse/files/patch-eclipse.platform.resources
@@ -67,7 +67,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
    <version>1.2.300-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
-@@ -37,9 +37,9 @@
+@@ -33,9 +33,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
@@ -79,7 +79,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
              </environment>
            </environments>
          </configuration>
-@@ -54,7 +54,7 @@
+@@ -50,7 +50,7 @@
          <property>
            <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
            <name>native</name>
@@ -88,7 +88,7 @@ diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.
          </property>
        </activation>
        <build>
-@@ -67,10 +67,10 @@
+@@ -63,10 +63,10 @@
                  <phase>process-resources</phase>
                  <configuration>
                    <target>
diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt
index 84a9befe8d4c..4391bcaa9b11 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt
+++ b/java/eclipse/files/patch-eclipse.platform.swt
@@ -124,7 +124,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
-@@ -101,16 +101,18 @@
+@@ -103,16 +103,18 @@
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
@@ -146,7 +146,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
  
  ifndef NO_STRIP
  	# -s = Remove all symbol table and relocation information from the executable.
-@@ -253,10 +255,6 @@
+@@ -255,10 +257,6 @@
  	cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
  ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
  	@# Copy webextension into it's own folder, but create folder first.
@@ -174,15 +174,15 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
 --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
-@@ -157,7 +157,7 @@
+@@ -120,7 +120,7 @@
  	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
  	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
  	 */
--	static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2.
+-	static final int ASYNC_EXEC_TIMEOUT_MS = 10000;
 +	static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
  
- 	static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733
- 
+ 	/** Workaround for bug 522733 */
+ 	static boolean bug522733FirstInstanceCreated = false;
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
 --- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
diff --git a/java/eclipse/files/patch-eclipse.platform.swt.binaries b/java/eclipse/files/patch-eclipse.platform.swt.binaries
index f42af3ca37b7..24771f048882 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt.binaries
+++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries
@@ -83,7 +83,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
- Bundle-Version: 3.113.0.qualifier
+ Bundle-Version: 3.114.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
@@ -141,7 +141,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
-   <version>3.113.0-SNAPSHOT</version>
+   <version>3.114.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -171,7 +171,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
- Bundle-Version: 3.113.0.qualifier
+ Bundle-Version: 3.114.0.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
@@ -212,7 +212,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.power
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
-   <version>3.113.0-SNAPSHOT</version>
+   <version>3.114.0-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
diff --git a/java/eclipse/files/patch-eclipse.platform.ui b/java/eclipse/files/patch-eclipse.platform.ui
index 86999a4aefdd..c5ca5579e242 100644
--- a/java/eclipse/files/patch-eclipse.platform.ui
+++ b/java/eclipse/files/patch-eclipse.platform.ui
@@ -1,7 +1,7 @@
 diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml
 --- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -37,9 +37,9 @@
+@@ -33,9 +33,9 @@
            <resolver>p2</resolver>
            <environments>
              <environment>
diff --git a/java/eclipse/files/patch-production b/java/eclipse/files/patch-production
deleted file mode 100644
index 32f05dffec4c..000000000000
--- a/java/eclipse/files/patch-production
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru production/checkConfigIIUs.sh production/checkConfigIIUs.sh
---- production/checkConfigIIUs.sh	0000-00-00 00:00:00.000000000 +0000
-+++ production/checkConfigIIUs.sh	0000-00-00 00:00:00.000000000 +0000
-@@ -39,8 +39,8 @@
- 
- declare -a PLATFORMS=( \
- cocoa.macosx.x86_64 \
--gtk.linux.ppc64le \
--gtk.linux.x86_64 \
-+gtk.freebsd.powerpc64 \
-+gtk.freebsd.amd64 \
- win32.win32.x86_64 \
- )
- NPLATFORMS=${#PLATFORMS[@]}