9 files changed, 83 insertions, 134 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 93e6c0bd0229..0a23f3b40178 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	eclipse
-PORTVERSION=	4.15
+PORTVERSION=	4.16
 CATEGORIES=	java devel
 
 # Update to eclipse.platform.releng.aggregator.git git-tag on git.eclipse.org
-ECLIPSE_TAG=	R4_15
-ECLIPSE_TSTAMP=	20200318-1047
+ECLIPSE_TAG=	R4_16
+ECLIPSE_TSTAMP=	20200617-1404
 
 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 2020-03
+COMMENT=	Eclipse IDE 2020-06
 
 LICENSE=	EPL
 
diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo
index ccf263f2461c..339279a64557 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,53 +1,53 @@
-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
+TIMESTAMP = 1592448357
+SHA256 (eclipse/eclipse.jdt-R4_16.tar.xz) = 9f93c368bf782ad8d3e4124f0ec11087b1b462052139165cec7aa4fa9bcc7050
+SIZE (eclipse/eclipse.jdt-R4_16.tar.xz) = 29304
+SHA256 (eclipse/eclipse.jdt.core-R4_16.tar.xz) = 1b734dfa8ddd40e09efa37303c099ad2dd11633474e7270a9c043dc625d93728
+SIZE (eclipse/eclipse.jdt.core-R4_16.tar.xz) = 8650672
+SHA256 (eclipse/eclipse.jdt.core.binaries-R4_16.tar.xz) = 9cb0d7c97a46191ff60738a8da327552786293f05392bd0be10c30ecbf78b637
+SIZE (eclipse/eclipse.jdt.core.binaries-R4_16.tar.xz) = 34416600
+SHA256 (eclipse/eclipse.jdt.debug-R4_16.tar.xz) = 845eedbf3a424f4cc7a138028bfaea74a4e6f93871903603bb886b6bc9c96d23
+SIZE (eclipse/eclipse.jdt.debug-R4_16.tar.xz) = 1462764
+SHA256 (eclipse/eclipse.jdt.ui-R4_16.tar.xz) = 08ea5e36ea0279bd86d2a2fb877664becfd043e4f37291ee4f173f7f41246e0b
+SIZE (eclipse/eclipse.jdt.ui-R4_16.tar.xz) = 15771884
+SHA256 (eclipse/eclipse.pde.build-R4_16.tar.xz) = e56ac953b3722de9a40d6b1759f5da78bf369dc49bcce47435ce9fdec6e89fea
+SIZE (eclipse/eclipse.pde.build-R4_16.tar.xz) = 868696
+SHA256 (eclipse/eclipse.pde.ui-R4_16.tar.xz) = 7db5936fc6d7cbc2f02dea114c00099837af6f37120d6a10da2b8ef2b7ded4c1
+SIZE (eclipse/eclipse.pde.ui-R4_16.tar.xz) = 29819796
+SHA256 (eclipse/eclipse.platform-R4_16.tar.xz) = 3d5d3e6b3968c744c4a94e968ae7f29ef8229f93556351007e054922c751f82e
+SIZE (eclipse/eclipse.platform-R4_16.tar.xz) = 1446740
+SHA256 (eclipse/eclipse.platform.common-R4_16.tar.xz) = a1fbec04f8b1bc28082ca23d8850efe44e3bbe1fa7bd38c8cc7a8b5536cd9c99
+SIZE (eclipse/eclipse.platform.common-R4_16.tar.xz) = 35851024
+SHA256 (eclipse/eclipse.platform.debug-R4_16.tar.xz) = 649b547351db7acafad225e90915b1bd96cb3ae1964b4c420956030b5979e431
+SIZE (eclipse/eclipse.platform.debug-R4_16.tar.xz) = 1372776
+SHA256 (eclipse/eclipse.platform.releng-R4_16.tar.xz) = 3b9016785fc52e75462c69222c0855228b23a8eac3184e615f6a045a13dda643
+SIZE (eclipse/eclipse.platform.releng-R4_16.tar.xz) = 406928
+SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_16.tar.xz) = bdbc90306a3dabaf3be6c01ca090f7da6434eada0a2137935acc2aa11fd3c0c1
+SIZE (eclipse/eclipse.platform.releng.aggregator-R4_16.tar.xz) = 605404
+SHA256 (eclipse/eclipse.platform.resources-R4_16.tar.xz) = f443677069d43b444b17627f0a593cf6fbb82eb86a69f37c9c331267d1d51d33
+SIZE (eclipse/eclipse.platform.resources-R4_16.tar.xz) = 813528
+SHA256 (eclipse/eclipse.platform.runtime-R4_16.tar.xz) = 69d32fc771c293c33d1adb0bbf480cb4b79116d23f8ec5ebf8f3b243894b59ce
+SIZE (eclipse/eclipse.platform.runtime-R4_16.tar.xz) = 431312
+SHA256 (eclipse/eclipse.platform.swt-R4_16.tar.xz) = d864f1d3a275d93118be35a360c92d8943c3eb9d67cc72916bab5ecd85dc7262
+SIZE (eclipse/eclipse.platform.swt-R4_16.tar.xz) = 6236756
+SHA256 (eclipse/eclipse.platform.swt.binaries-R4_16.tar.xz) = b875dba475ed19f2b55cbade3a54b4b9afe522037efeb42909e1e9d89dd84dc0
+SIZE (eclipse/eclipse.platform.swt.binaries-R4_16.tar.xz) = 563508
+SHA256 (eclipse/eclipse.platform.team-R4_16.tar.xz) = 180590b0a7516e246c7343298506f62f29c853e4090899891c6c301d4be801a7
+SIZE (eclipse/eclipse.platform.team-R4_16.tar.xz) = 4633900
+SHA256 (eclipse/eclipse.platform.text-R4_16.tar.xz) = 1d243c92c8eb67a9aef9de7c87bf228f4d057b380b7b60ac9ca77fa64363f0f9
+SIZE (eclipse/eclipse.platform.text-R4_16.tar.xz) = 1319632
+SHA256 (eclipse/eclipse.platform.ua-R4_16.tar.xz) = 8c3ca5fe144588f2d994906461779fa782b257f3643b7686a9606bcf7b907c75
+SIZE (eclipse/eclipse.platform.ua-R4_16.tar.xz) = 4621924
+SHA256 (eclipse/eclipse.platform.ui-R4_16.tar.xz) = fd232ac1fddaec771ec895b995fb0c47813577e3b5a87f72b29b01363e08eeca
+SIZE (eclipse/eclipse.platform.ui-R4_16.tar.xz) = 5967112
+SHA256 (eclipse/eclipse.platform.ui.tools-R4_16.tar.xz) = 43a75d63cb4f294fa39b749dfe4e6751493ffbc5c45e8009099bb8683290009b
+SIZE (eclipse/eclipse.platform.ui.tools-R4_16.tar.xz) = 328668
+SHA256 (eclipse/rt.equinox.binaries-R4_16.tar.xz) = e7e198a3ffa5f0392277e4f648ca59469ec8bbaeafe553620b023f287d9fb8f1
+SIZE (eclipse/rt.equinox.binaries-R4_16.tar.xz) = 299708
+SHA256 (eclipse/rt.equinox.bundles-R4_16.tar.xz) = 7a91d247020b62cb5d2fe9886e9ae5693b60aa0d3d1331f88b83070d65285637
+SIZE (eclipse/rt.equinox.bundles-R4_16.tar.xz) = 1161164
+SHA256 (eclipse/rt.equinox.framework-R4_16.tar.xz) = c1f2d3410c546e09adbed2eb97880d7f109890a6abcb625291271e776224e780
+SIZE (eclipse/rt.equinox.framework-R4_16.tar.xz) = 2827340
+SHA256 (eclipse/rt.equinox.p2-R4_16.tar.xz) = ef8216e3013688a5f2bd62128a10f19c420bfc587345d47810f25e1d254c4bf1
+SIZE (eclipse/rt.equinox.p2-R4_16.tar.xz) = 48490416
+SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.16_GH0.tar.gz) = 73355577a36e6ee976464ab16416fc966d91763f20dfa70ff4d4fd7ff460cfc5
+SIZE (eclipse/daemonblade-eclipse-maven-repo-4.16_GH0.tar.gz) = 198477770
diff --git a/java/eclipse/files/patch-eclipse-platform-parent b/java/eclipse/files/patch-eclipse-platform-parent
index 674913b6dd17..5a327947c269 100644
--- a/java/eclipse/files/patch-eclipse-platform-parent
+++ b/java/eclipse/files/patch-eclipse-platform-parent
@@ -1,19 +1,19 @@
 diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
 --- eclipse-platform-parent/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse-platform-parent/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -89,9 +89,9 @@
+@@ -80,9 +80,9 @@
        'eclipiserun-repo' repository, such as for computing .api-descriptions and
        generating API Tools reports.
      -->
--    <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>
+-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds/</eclipserun-repo>
++    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16/</eclipserun-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>
+-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16-I-builds</comparator.repo>
++    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16</comparator.repo>
  
      <!--
        NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
-@@ -263,14 +263,14 @@
+@@ -254,14 +254,14 @@
            </target>
            <environments>
              <environment>
@@ -32,12 +32,12 @@ diff -ru eclipse-platform-parent/pom.xml eclipse-platform-parent/pom.xml
              </environment>
              <environment>
                <os>win32</os>
-@@ -635,7 +635,7 @@
+@@ -626,7 +626,7 @@
            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.15-I-builds</eclipse-p2-repo.url>
-+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15</eclipse-p2-repo.url>
+-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16-I-builds</eclipse-p2-repo.url>
++        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16</eclipse-p2-repo.url>
        </properties>
        <repositories>
          <repository>
diff --git a/java/eclipse/files/patch-eclipse.pde.ui b/java/eclipse/files/patch-eclipse.pde.ui
index 89a9278f1b7c..47fcce88f175 100644
--- a/java/eclipse/files/patch-eclipse.pde.ui
+++ b/java/eclipse/files/patch-eclipse.pde.ui
@@ -1,7 +1,7 @@
 diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product
 --- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
-@@ -81,8 +81,8 @@
+@@ -80,8 +80,8 @@
        <plugin id="org.eclipse.osgi.util"/>
        <plugin id="org.eclipse.swt"/>
        <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
@@ -10,5 +10,5 @@ diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Applicat
 +      <plugin id="org.eclipse.swt.gtk.freebsd.powerpc64" fragment="true"/>
 +      <plugin id="org.eclipse.swt.gtk.freebsd.amd64" fragment="true"/>
        <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+       <plugin id="org.eclipse.urischeme"/>
        <plugin id="org.w3c.css.sac"/>
-       <plugin id="org.w3c.dom.events"/>
diff --git a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
index f1174d3f2585..88add425c2be 100644
--- a/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
+++ b/java/eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
@@ -1,22 +1,3 @@
-diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -111,7 +111,7 @@
-     -->
-     <property
-       name="platformFile"
--      value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" />
-+      value="eclipse-platform-${eclispeBaseLabel}-freebsd-gtk-amd64.tar.gz" />
- 
-      <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
-       using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
-@@ -308,4 +308,4 @@
-       file="${settingsDir}/org.eclipse.core.net.prefs" />
-   </target>
- 
--</project>
-\ No newline at end of file
-+</project>
 diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml	0000-00-00 00:00:00.000000000 +0000
@@ -86,38 +67,6 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
              </environment>
              <environment>
                <os>win32</os>
-diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties	0000-00-00 00:00:00.000000000 +0000
-@@ -1,11 +1,11 @@
- #Properties required by equinox p2 tests
- # Version from .../eclipse-junit-tests/src/main/resources/
- 
--org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
-+org.eclipse.equinox.p2.reconciler.tests.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-${buildId}-freebsd-gtk-amd64.tar.gz
- 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.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
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
-@@ -7,9 +7,9 @@
- 
- 
- mkdir -p workarea/${buildId}/eclipse-testing
--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.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 -ru eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
 --- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml	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 24771f048882..84ffbaee5e90 100644
--- a/java/eclipse/files/patch-eclipse.platform.swt.binaries
+++ b/java/eclipse/files/patch-eclipse.platform.swt.binaries
@@ -7,7 +7,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.aarch64; singleton:=true
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.aarch64; singleton:=true
- Bundle-Version: 3.109.0.qualifier
+ Bundle-Version: 3.114.100.qualifier
  Bundle-ManifestVersion: 2
  Bundle-Localization: fragment
 @@ -26,8 +26,8 @@
@@ -45,7 +45,7 @@ diff -ru eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.aarch
    <groupId>org.eclipse.swt</groupId>
 -  <artifactId>org.eclipse.swt.gtk.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.swt.gtk.freebsd.aarch64</artifactId>
-   <version>3.109.0-SNAPSHOT</version>
+   <version>3.114.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -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.114.0.qualifier
+ Bundle-Version: 3.114.100.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.114.0-SNAPSHOT</version>
+   <version>3.114.100-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.114.0.qualifier
+ Bundle-Version: 3.114.100.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.114.0-SNAPSHOT</version>
+   <version>3.114.100-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
diff --git a/java/eclipse/files/patch-eclipse.platform.ua b/java/eclipse/files/patch-eclipse.platform.ua
index 8254318a47c3..2c773ef28225 100644
--- a/java/eclipse/files/patch-eclipse.platform.ua
+++ b/java/eclipse/files/patch-eclipse.platform.ua
@@ -43,7 +43,7 @@ diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal
 diff -ru eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
 --- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java	0000-00-00 00:00:00.000000000 +0000
-@@ -102,6 +102,7 @@
+@@ -103,6 +103,7 @@
  				setDefaultBrowserID(BROWSER_ID_SYSTEM);
  			} else if (Constants.OS_AIX.equalsIgnoreCase(os)
  					|| (Constants.OS_HPUX.equalsIgnoreCase(os))
diff --git a/java/eclipse/files/patch-rt.equinox.bundles b/java/eclipse/files/patch-rt.equinox.bundles
index af6a5bbaad4b..83e3118cbced 100644
--- a/java/eclipse/files/patch-rt.equinox.bundles
+++ b/java/eclipse/files/patch-rt.equinox.bundles
@@ -162,7 +162,7 @@ diff -ru rt.equinox.bundles/features/org.eclipse.equinox.core.sdk/feature.xml rt
 diff -ru rt.equinox.bundles/pom.xml rt.equinox.bundles/pom.xml
 --- rt.equinox.bundles/pom.xml	0000-00-00 00:00:00.000000000 +0000
 +++ rt.equinox.bundles/pom.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -89,7 +89,7 @@
+@@ -84,7 +84,7 @@
      <module>bundles/org.eclipse.equinox.security</module>
      <module>bundles/org.eclipse.equinox.security.macosx</module>
      <module>bundles/org.eclipse.equinox.security.win32.x86_64</module>
diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework
index eaeb865b26ae..bf92c27a2f01 100644
--- a/java/eclipse/files/patch-rt.equinox.framework
+++ b/java/eclipse/files/patch-rt.equinox.framework
@@ -7,8 +7,8 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true
- Bundle-Version: 1.1.1100.qualifier
- Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
+ Bundle-Version: 1.1.1200.qualifier
+ Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
 -Bundle-Localization: launcher.gtk.linux.aarch64
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=aarch64))
@@ -23,7 +23,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId>
-   <version>1.1.1100-SNAPSHOT</version>
+   <version>1.1.1200-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -52,7 +52,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true
- Bundle-Version: 1.1.1100.qualifier
+ Bundle-Version: 1.1.1200.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
 -Bundle-Localization: launcher.gtk.linux.x86_64
@@ -78,7 +78,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.a
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId>
-   <version>1.1.1100-SNAPSHOT</version>
+   <version>1.1.1200-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>
@@ -110,7 +110,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p
  Bundle-Vendor: %providerName
 -Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true
- Bundle-Version: 1.1.1100.qualifier
+ Bundle-Version: 1.1.1200.qualifier
  Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
 -Bundle-Localization: launcher.gtk.linux.ppc64le
@@ -126,7 +126,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.p
    <groupId>org.eclipse.equinox</groupId>
 -  <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
 +  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId>
-   <version>1.1.1100-SNAPSHOT</version>
+   <version>1.1.1200-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>
  
    <properties>