diff --git a/othersrc/otdt-examples/OTSample-Flightbonus-src/build.xml b/othersrc/otdt-examples/OTSample-Flightbonus-src/build.xml
index 1764bfd..b7c63ae 100644
--- a/othersrc/otdt-examples/OTSample-Flightbonus-src/build.xml
+++ b/othersrc/otdt-examples/OTSample-Flightbonus-src/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="flightbonus" default="zip">
-	<property name="zipfile" value="org.eclipse.objectteams.otdt.samples/samples/flightbonus.zip"/>
+	<property name="zipfile" value="../../plugins/org.eclipse.objectteams.otdt.samples/samples/flightbonus.zip"/>
 	<target name="zip">
 		<delete file="${zipfile}"/>
 		<zip 
diff --git a/othersrc/otdt-examples/OTSample-Flightbonus-src/src/.settings/org.eclipse.jdt.core.prefs b/othersrc/otdt-examples/OTSample-Flightbonus-src/src/.settings/org.eclipse.jdt.core.prefs
index 7d74eb0..b988fa9 100644
--- a/othersrc/otdt-examples/OTSample-Flightbonus-src/src/.settings/org.eclipse.jdt.core.prefs
+++ b/othersrc/otdt-examples/OTSample-Flightbonus-src/src/.settings/org.eclipse.jdt.core.prefs
@@ -10,3 +10,4 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.objectteams.otdt.compiler.option.weaving_scheme=OTDRE
diff --git a/othersrc/otdt-examples/OTSample-Flightbonus-src/src/FlightbookingWithBonus.launch b/othersrc/otdt-examples/OTSample-Flightbonus-src/src/FlightbookingWithBonus.launch
index 0612398..21fd0fa 100644
--- a/othersrc/otdt-examples/OTSample-Flightbonus-src/src/FlightbookingWithBonus.launch
+++ b/othersrc/otdt-examples/OTSample-Flightbonus-src/src/FlightbookingWithBonus.launch
@@ -8,6 +8,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.objectteams.example.flightbooking.Main"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OTSample-Flightbonus"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-reads=java.base=ALL-UNNAMED --add-reads=jdk.localedata=ALL-UNNAMED"/>
 <booleanAttribute key="org.eclipse.objectteams.launch" value="true"/>
 <booleanAttribute key="org.eclipse.objectteams.otdt.debug.TEAMCONFIG_ACTIVE_ATTR" value="true"/>
 <listAttribute key="org.eclipse.objectteams.otdt.debug.TEAMCONFIG_ATTR">
diff --git a/othersrc/otdt-examples/OTSample-Flightbonus-src/zipFlightbonus.launch b/othersrc/otdt-examples/OTSample-Flightbonus-src/zipFlightbonus.launch
index b571065..9e6841a 100644
--- a/othersrc/otdt-examples/OTSample-Flightbonus-src/zipFlightbonus.launch
+++ b/othersrc/otdt-examples/OTSample-Flightbonus-src/zipFlightbonus.launch
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.objectteams.otdt.samples/samples&quot; type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/OTSample-Flightbonus-src/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OTSample-Flightbonus-src"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.5.0_17"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<mapAttribute key="org.eclipse.jdt.launchingVM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP">
-<mapEntry key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/OTSample-Flightbonus-src/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc}"/>
-<booleanAttribute key="org.eclipse.objectteams.launch" value="false"/>
-<booleanAttribute key="org.eclipse.objectteams.otdt.debug.USE_JPLIS" value="false"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+    <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.objectteams.otdt.samples/samples&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/OTSample-Flightbonus-src/build.xml"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OTSample-Flightbonus-src"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <booleanAttribute key="org.eclipse.objectteams.launch" value="false"/>
+    <booleanAttribute key="org.eclipse.objectteams.otdt.debug.USE_JPLIS" value="false"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/OTSample-Flightbonus-src/build.xml}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/OTSample-Flightbonus-src}/.."/>
+    <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
 </launchConfiguration>
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
index 260b8b2..027825c 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.samples;singleton:=true
 Automatic-Module-Name: org.eclipse.objectteams.otdt.samples
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.8.2.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.internal.samples.OTSamplesPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,7 +16,7 @@
  org.eclipse.ui.forms;bundle-version="[3.5.100,4.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jdt.debug.ui;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.10.0.v_OTDT_r230,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.24.0.OTDT_r282,4.0.0)",
  org.eclipse.objectteams.otdt.ui.help;bundle-version="[2.5.0,3.0.0)"
 Export-Package: org.eclipse.objectteams.otdt.internal.samples;x-internal:="true"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/samples/flightbonus.zip b/plugins/org.eclipse.objectteams.otdt.samples/samples/flightbonus.zip
index 754bdec..0d51766 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/samples/flightbonus.zip
+++ b/plugins/org.eclipse.objectteams.otdt.samples/samples/flightbonus.zip
Binary files differ
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 496a8f6..e797011 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -42,7 +42,7 @@
 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
 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
 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.samples=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples,tag=builds/201706061122
+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
 
 !** Consume BCEL from Orbit: **!
 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/R20200529191137/repository