build against S-4.16M1-202004090200

- freeze most versions as of 2.8.0 release
- initial version bumps
- update orbit to 2020-06-M1
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 000a560..1b23218 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -59,14 +59,14 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.18.300.v20200305-0155" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.400.v20200409-0200" patch="true"/>
    </requires>
 
    <plugin
          id="org.eclipse.jdt.core"
          download-size="5614"
          install-size="5614"
-         version="3.21.0.OTDT_r280_qualifier"
+         version="3.22.0.OTDT_r281_qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
index a133522..9a89b67 100644
--- a/org.eclipse.jdt.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true
-Bundle-Version: 3.22.0.OTDT_r280_qualifier
+Bundle-Version: 3.22.0.OTDT_r281_qualifier
 Bundle-Activator: org.eclipse.jdt.core.JavaCore
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/.classpath b/plugins/org.eclipse.objectteams.otdt.ui/.classpath
index 098194c..eca7bdb 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/.classpath
+++ b/plugins/org.eclipse.objectteams.otdt.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.objectteams.otdt.ui/.settings/org.eclipse.jdt.core.prefs
index 2aafee8..2daa067 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.objectteams.otdt.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -74,5 +74,6 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.objectteams.otdt.compiler.option.pure_java=enabled
diff --git a/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF
index cdc7921..4ba7aae 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.ui;singleton:=true
 Automatic-Module-Name: org.eclipse.objectteams.otdt.ui
-Bundle-Version: 2.7.4.qualifier
+Bundle-Version: 2.8.1.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.ui.OTDTUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -42,4 +42,4 @@
  org.eclipse.objectteams.otdt.internal.ui.wizards.typecreation;x-friends:="org.eclipse.objectteams.otdt.ui.tests",
  org.eclipse.objectteams.otdt.ui,
  org.eclipse.objectteams.otdt.ui.dialogs
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
index 8cadcaa..407e7b9 100644
--- a/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt;singleton:=true
 Automatic-Module-Name: org.eclipse.objectteams.otdt
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.8.1.qualifier
 Bundle-ClassPath: otdtcoreext.jar
 Bundle-Activator: org.eclipse.objectteams.otdt.core.ext.OTDTPlugin
 Bundle-Vendor: %providerName
@@ -13,7 +13,7 @@
  org.eclipse.objectteams.otdt.internal.core.ext;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.21.0.OTDT_r280,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.22.0.OTDT_r281,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.6.100,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.7.100,4.0.0)",
  org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
diff --git a/plugins/org.eclipse.objectteams.otdt/about.ini b/plugins/org.eclipse.objectteams.otdt/about.ini
index cae725e..17c8e9e 100644
--- a/plugins/org.eclipse.objectteams.otdt/about.ini
+++ b/plugins/org.eclipse.objectteams.otdt/about.ini
@@ -1,8 +1,8 @@
 aboutText=Object Teams Development Tooling\n\
 \n\
-Version: 2.8.0\n\
+Version: 2.8.1\n\
 \n\
-Part of Eclipse SimRel 2020-03\n\
+Part of Eclipse SimRel 2020-06\n\
 \n\
 (c) Copyright TU Berlin, Fraunhofer FIRST and others, 2005, 2020\n\
 Visit http://www.eclipse.org/objectteams
diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
index a61225f..1f04c7f 100644
--- a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otredyn
 Automatic-Module-Name: org.eclipse.objectteams.otredyn
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.1.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.objectteams.otredyn.bytecode,
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index ea7c6d5..77a5aa5 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -58,11 +58,11 @@
 
 # VERSIONS:
 # Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20200305-0155"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20200409-0200"}
 
 # used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.15RC2"}
-DROP=${DROPS4}/${DROP:="S-4.15RC2-202003050155"}
+EVERSION=${EVERSION:="4.16M1"}
+DROP=${DROPS4}/${DROP:="S-4.16M1-202004090200"}
 
 # EXPORT: archive file of the base eclipse SDK build:
 ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index f144ffd..82d44a8 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -21,16 +21,16 @@
 
 # ------------- insert current versions here ---------------
 # Details of the Eclipse SDK built upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.700.v20191228-1214/scripts
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.800.v20200318-1347/scripts
 org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.18.300.v20200305-0155
-jdt.feature.version.next=3.18.300.v20200305-0156
+jdt.feature.version=3.18.400.v20200409-0200
+jdt.feature.version.next=3.18.400.v20200409-0201
 
 # jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.900.v20200303-1624.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.800.v20200302-0636.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.1000.v20200405-2149.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.900.v20200319-2039.jar
 # -----------------------------------------------------------
 
 #Git Support for PDE BUILD:
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index a780c49..9c6a257 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -16,15 +16,15 @@
 

 plugin@org.eclipse.objectteams.otdt.debug=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug,tag=builds/201906101736

 plugin@org.eclipse.objectteams.otdt.debug.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.ui,tag=builds/201906101736

-plugin@org.eclipse.objectteams.otdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui,tag=builds/201906101736

+plugin@org.eclipse.objectteams.otdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui

 plugin@org.eclipse.objectteams.otdt.doc=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.doc,tag=builds/201606070956

 !plugin@org.eclipse.objectteams.otdt.metrics=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics,tag=builds/201101290806

 

-plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime

+plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime,tag=builds/202003100937

 plugin@org.eclipse.objectteams.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otre,tag=builds/201806120901

 plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn

 !the following is also referenced in otdt.doc/buildDoc.xml (plugin-name without version):

-plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox

+plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox,tag=builds/202003100937

 fragment@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.turbo,tag=builds/201506091717

 plugin@org.eclipse.objectteams.eclipse.monitor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.eclipse.monitor,tag=builds/201606070956
 

@@ -35,27 +35,27 @@
 !** OT/J Plugins **!
 plugin@org.eclipse.objectteams.otequinox.branding=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=builds/201706061121

 plugin@org.eclipse.objectteams.otequinox.branding.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding.otre,tag=builds/201706061122

-plugin@org.eclipse.objectteams.otdt.jdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui

+plugin@org.eclipse.objectteams.otdt.jdt.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui,tag=builds/202003100937

 plugin@org.eclipse.objectteams.otdt.ui.help=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help,tag=builds/201606070956

-plugin@org.eclipse.objectteams.otdt.apt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.apt,tag=builds/201706061122

+plugin@org.eclipse.objectteams.otdt.apt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.apt,tag=builds/201706061122,tag=builds/202003100937

 plugin@org.eclipse.objectteams.otdt.compiler.adaptor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.compiler.adaptor,tag=builds/201912111741

 plugin@org.eclipse.objectteams.otdt.debug.adaptor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.adaptor,tag=builds/201909081329

 plugin@org.eclipse.objectteams.otdt.refactoring=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.refactoring,tag=builds/201909081329

-plugin@org.eclipse.objectteams.otdt.pde.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.pde.ui

+plugin@org.eclipse.objectteams.otdt.pde.ui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.pde.ui,tag=builds/202003100937

 plugin@org.eclipse.objectteams.otdt.samples=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples,tag=builds/201706061122

 

 !** Consume BCEL from Orbit: **!

-plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository

+plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository

 !** ASM from Orbit: **!

-plugin@org.objectweb.asm,7.1.0=p2IU,id=org.objectweb.asm,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

-plugin@org.objectweb.asm.tree,7.1.0=p2IU,id=org.objectweb.asm.tree,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

-plugin@org.objectweb.asm.commons,7.1.0=p2IU,id=org.objectweb.asm.commons,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

-plugin@org.objectweb.asm.util,7.1.0=p2IU,id=org.objectweb.asm.util,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

-plugin@org.objectweb.asm.analysis,7.1.0=p2IU,id=org.objectweb.asm.analysis,version=7.1.0.v20190412-2143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

+plugin@org.objectweb.asm,7.1.0=p2IU,id=org.objectweb.asm,version=7.1.0.v20190412-2143,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

+plugin@org.objectweb.asm.tree,7.1.0=p2IU,id=org.objectweb.asm.tree,version=7.1.0.v20190412-2143,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

+plugin@org.objectweb.asm.commons,7.1.0=p2IU,id=org.objectweb.asm.commons,version=7.1.0.v20190412-2143,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

+plugin@org.objectweb.asm.util,7.1.0=p2IU,id=org.objectweb.asm.util,version=7.1.0.v20190412-2143,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

+plugin@org.objectweb.asm.analysis,7.1.0=p2IU,id=org.objectweb.asm.analysis,version=7.1.0.v20190412-2143,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

 

-plugin@org.mockito,1.9.5=p2IU,id=org.mockito,version=1.9.5.v201605172210,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

-plugin@org.hamcrest.core,1.3.0=p2IU,id=org.hamcrest.core,version=1.3.0.v20180420-1519,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

-plugin@org.hamcrest.library,1.3.0=p2IU,id=org.hamcrest.library,version=1.3.0.v20180524-2246,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/

+plugin@org.mockito,1.9.5=p2IU,id=org.mockito,version=1.9.5.v201605172210,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

+plugin@org.hamcrest.core,1.3.0=p2IU,id=org.hamcrest.core,version=1.3.0.v20180420-1519,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

+plugin@org.hamcrest.library,1.3.0=p2IU,id=org.hamcrest.library,version=1.3.0.v20180524-2246,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/

 

 !========== JDT/UI: ==========!

 plugin@org.eclipse.jdt.ui=GIT,tag=@SDK_QUALIFIER@,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui