[Releng] Eliminate warnings and update to JustJ 17.0.3
diff --git a/features/org.eclipse.oomph.all-feature/Oomph.p2analysis b/features/org.eclipse.oomph.all-feature/Oomph.p2analysis
deleted file mode 100644
index e92d916..0000000
--- a/features/org.eclipse.oomph.all-feature/Oomph.p2analysis
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<analysis:Analysis
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:analysis="http://www.levitasoft.com/p2/analysis/1.0"
-    title="Oomph">
-  <provider
-      xsi:type="analysis:Repository"
-      url="https://download.eclipse.org/oomph/updates/latest"/>
-  <provider
-      xsi:type="analysis:Repository"
-      url="https://download.eclipse.org/releases/neon"/>
-</analysis:Analysis>
diff --git a/features/org.eclipse.oomph.tests-feature/feature.xml b/features/org.eclipse.oomph.tests-feature/feature.xml
index 72afe0e..9012625 100644
--- a/features/org.eclipse.oomph.tests-feature/feature.xml
+++ b/features/org.eclipse.oomph.tests-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.tests"
       label="%featureName"
-      version="1.19.0.qualifier"
+      version="1.20.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.tests-feature/pom.xml b/features/org.eclipse.oomph.tests-feature/pom.xml
index 9f441a8..65cb8ee 100644
--- a/features/org.eclipse.oomph.tests-feature/pom.xml
+++ b/features/org.eclipse.oomph.tests-feature/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.tests</artifactId>
-  <version>1.19.0-SNAPSHOT</version>
+  <version>1.20.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF
index c3c73cd..43c7077 100644
--- a/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.p2.tests;singleton:=true
-Bundle-Version: 1.13.0.qualifier
+Bundle-Version: 1.14.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.oomph.p2.tests;version="1.13.0";x-internal:=true
+Export-Package: org.eclipse.oomph.p2.tests;version="1.14.0";x-internal:=true
 Require-Bundle: org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
@@ -18,7 +18,7 @@
  org.eclipse.equinox.p2.touchpoint.natives;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.director;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.oomph.p2.core;bundle-version="[1.21.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.p2.core;bundle-version="[1.22.0,2.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.transport.ecf;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.tests;bundle-version="[1.12.0,2.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.oomph.p2.tests/pom.xml b/plugins/org.eclipse.oomph.p2.tests/pom.xml
index ce017f9..ac1cb46 100644
--- a/plugins/org.eclipse.oomph.p2.tests/pom.xml
+++ b/plugins/org.eclipse.oomph.p2.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.p2.tests</artifactId>
-  <version>1.13.0-SNAPSHOT</version>
+  <version>1.14.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.p2.tests/src/org/eclipse/oomph/p2/tests/TransportTests.java b/plugins/org.eclipse.oomph.p2.tests/src/org/eclipse/oomph/p2/tests/TransportTests.java
index b36133c..51839d3 100644
--- a/plugins/org.eclipse.oomph.p2.tests/src/org/eclipse/oomph/p2/tests/TransportTests.java
+++ b/plugins/org.eclipse.oomph.p2.tests/src/org/eclipse/oomph/p2/tests/TransportTests.java
@@ -629,6 +629,7 @@
       return requests;
     }
 
+    @Deprecated
     @Override
     public IStatus download(URI uri, OutputStream target, long startPos, IProgressMonitor monitor)
     {
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocConceptOverview.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocConceptOverview.java
index cc861bd..d304ddf 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocConceptOverview.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocConceptOverview.java
@@ -145,32 +145,32 @@
   protected abstract void setupOverviewDiagram();
 
   /*
-   * @snippet tree org.eclipse.setup.tree /setups/org.eclipse.setup?prune:/org.eclipse.oomph.setup.Project
+   * @snip tree org.eclipse.setup.tree /setups/org.eclipse.setup?prune:/org.eclipse.oomph.setup.Project
    * @title org.eclipse.setup
    */
   protected abstract void index();
 
   /*
-   * @snippet tree Oomph.setup.tree /setups/Oomph.setup?editor://org.eclipse.oomph.setup.presentation.SetupEditorID/Outline?/org.eclipse.oomph.setup.Project
+   * @snip tree Oomph.setup.tree /setups/Oomph.setup?editor://org.eclipse.oomph.setup.presentation.SetupEditorID/Outline?/org.eclipse.oomph.setup.Project
    * @title Oomph.setup
    */
   protected abstract void oomphSetup();
 
   /*
-   * @snippet tree Setup.genmodel.tree /org.eclipse.oomph.setup/model/Setup.genmodel#//setup/SetupTask
+   * @snip tree Setup.genmodel.tree /org.eclipse.oomph.setup/model/Setup.genmodel#//setup/SetupTask
    * /org.eclipse.oomph.setup/model/Setup.genmodel?editor://org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditorID
    * @title Setup.genmodel
    */
   protected abstract void setupGenModel();
 
   /*
-   * @snippet tree Setup.ecore.tree /org.eclipse.oomph.setup/model/Setup.ecore?editor://org.eclipse.emf.ecore.presentation.EcoreEditorID
+   * @snip tree Setup.ecore.tree /org.eclipse.oomph.setup/model/Setup.ecore?editor://org.eclipse.emf.ecore.presentation.EcoreEditorID
    * @title Setup.genmodel
    */
   protected abstract void setupEcoreModel();
 
   /*
-   * @snippet tree PackageExplorer.tree
+   * @snip tree PackageExplorer.tree
    * viewer://org.eclipse.jdt.ui.PackageExplorer?/org.eclipse.jdt.core:org.eclipse.jdt.internal.core.JarPackageFragmentRoot/org
    * .eclipse.jdt.core:org.eclipse.jdt.internal.core.ExternalPackageFragmentRoot
    * @title Package Explorer
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocSetupResource.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocSetupResource.java
index 2072198..9aedd48 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocSetupResource.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/concepts/DocSetupResource.java
@@ -39,7 +39,7 @@
 public abstract class DocSetupResource
 {
   /**
-   * @snippet xml org.eclipse.setup /setups/org.eclipse.setup
+   * @snip xml org.eclipse.setup /setups/org.eclipse.setup
    */
   public abstract void indexXMI();
 
@@ -55,7 +55,7 @@
   public abstract static class DocIndexResource
   {
     /**
-     * @snippet tree org.eclipse.setup.tree /setups/org.eclipse.setup?prune:/org.eclipse.oomph.setup.Project#/
+     * @snip tree org.eclipse.setup.tree /setups/org.eclipse.setup?prune:/org.eclipse.oomph.setup.Project#/
      * @title org.eclipse.setup
      * @expandTo 1
      */
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocConfirmationPage.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocConfirmationPage.java
index 040b911..124d619 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocConfirmationPage.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocConfirmationPage.java
@@ -39,7 +39,7 @@
 public class DocConfirmationPage
 {
   /**
-   * @snippet image ConfirmationPage.images
+   * @snip image ConfirmationPage.images
    * @style box
    * @description
    * The page has the following controls:
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocImportWizard.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocImportWizard.java
index 3ffa092..2b783bd 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocImportWizard.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocImportWizard.java
@@ -39,7 +39,7 @@
 public abstract class DocImportWizard extends DocInstallWizard
 {
   /**
-   * @snippet image ProjectImportWizard.images
+   * @snip image ProjectImportWizard.images
    */
   public static Image projectImporter()
   {
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocInstallWizard.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocInstallWizard.java
index adfa926..b37dd28 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocInstallWizard.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocInstallWizard.java
@@ -58,7 +58,7 @@
 public abstract class DocInstallWizard
 {
   /**
-   * @snippet image InstallerFooter.images
+   * @snip image InstallerFooter.images
    * @description The wizards's footer contains the following:
    * @callout
    * {@link #helpDescription()}
@@ -218,7 +218,7 @@
   }
 
   /**
-   * @snippet image InstallerWizard.images
+   * @snip image InstallerWizard.images
    */
   public static Image installer()
   {
@@ -226,7 +226,7 @@
   }
 
   /**
-   * @snippet image WizardFooter.images
+   * @snip image WizardFooter.images
    * @description The wizard's footer contain the following controls:
    * @callout
    * {@link #helpDescription()}
@@ -246,35 +246,35 @@
   }
 
   /**
-   * @snippet html
+   * @snip html
    * @description
    * Brings up this help.
    */
   public abstract void helpDescription();
 
   /**
-   * @snippet html
+   * @snip html
    * @description
    * Navigates to the previous page.
    */
   public abstract void backDescription();
 
   /**
-   * @snippet html
+   * @snip html
    * @description
    * Navigates to the next page.
    */
   public abstract void nextDescription();
 
   /**
-   * @snippet html
+   * @snip html
    * @description
    * Completes the wizard, performing any final actions.
    */
   public abstract void finishDescription();
 
   /**
-   * @snippet html
+   * @snip html
    * @description
    * Closes the wizard, taking no further action.
    */
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProductPage.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProductPage.java
index 889bcb2..1b61c4e 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProductPage.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProductPage.java
@@ -37,7 +37,7 @@
 public class DocProductPage
 {
   /**
-   * @snippet image ProductPage.images
+   * @snip image ProductPage.images
    * @style box
    * @description The page contains the following controls:
    * @callout
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProgressPage.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProgressPage.java
index 2de9910..00219b9 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProgressPage.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProgressPage.java
@@ -49,7 +49,7 @@
 public class DocProgressPage
 {
   /**
-   * @snippet image ProgressPage.images
+   * @snip image ProgressPage.images
    * @style box
    * @description
    * The page contains the following controls:
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProjectPage.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProjectPage.java
index b2cae8a..49df2a8 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProjectPage.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocProjectPage.java
@@ -46,7 +46,7 @@
 public abstract class DocProjectPage
 {
   /**
-   * @snippet image ProjectPage.images
+   * @snip image ProjectPage.images
    * @style box
    * @description
    * The page contains the following controls:
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocUpdateWizard.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocUpdateWizard.java
index ea487cc..ddc372c 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocUpdateWizard.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocUpdateWizard.java
@@ -51,7 +51,7 @@
 public abstract class DocUpdateWizard extends DocInstallWizard
 {
   /**
-   * @snippet image UpdateWizard.images
+   * @snip image UpdateWizard.images
    */
   public static Image updater()
   {
diff --git a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocVariablePage.java b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocVariablePage.java
index 46ef785..071416d 100644
--- a/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocVariablePage.java
+++ b/plugins/org.eclipse.oomph.setup.doc/src/org/eclipse/oomph/setup/doc/user/wizard/DocVariablePage.java
@@ -38,7 +38,7 @@
 public class DocVariablePage
 {
   /**
-   * @snippet image PromptPage.images
+   * @snip image PromptPage.images
    * @style box
    * @description
    * The page has the following controls:
@@ -107,7 +107,7 @@
   }
 
   /**
-   * @snippet image VariablePageExtras.images
+   * @snip image VariablePageExtras.images
    */
   public static Image[] promptPageExtras()
   {
diff --git a/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
index 05a3a84..78db387 100644
--- a/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.oomph.ui;bundle-version="[1.16.0,2.0.0)",
+ org.eclipse.oomph.ui;bundle-version="[1.17.0,2.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.14.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.p2.edit;bundle-version="[1.14.0,2.0.0)",
diff --git a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
index e3de6a3..d397885 100644
--- a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@
  org.eclipse.equinox.p2.engine;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.equinox.p2.ui.sdk;bundle-version="[1.2.4,2.0.0)",
  org.eclipse.urischeme;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.oomph.ui;bundle-version="[1.16.0,2.0.0)",
+ org.eclipse.oomph.ui;bundle-version="[1.17.0,2.0.0)",
  org.eclipse.oomph.p2.ui;bundle-version="[1.18.0,2.0.0)",
  org.eclipse.oomph.setup.p2;bundle-version="[1.19.0,2.0.0)",
  org.eclipse.oomph.setup.core;bundle-version="[1.24.0,2.0.0)",
diff --git a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
index e1cc0f1..08b4592 100644
--- a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
+++ b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
@@ -27,7 +27,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-xstaging 2022-03&#13;&#10;https://download.eclipse.org/technology/epp/packages/2022-03/202203101200&#13;&#10;https://download.eclipse.org/releases/2022-03/202203161000&#13;&#10;https://download.eclipse.org/eclipse/updates/4.23/R-4.23-202203080310&#13;&#10;-useComposite 2022-06&#13;&#10;-xlatestReleased&#13;&#10;-brandingNotification&#13;&#10;-xsiteURI https://www.eclipse.org/downloads/packages/release/2022-03/r&#13;&#10;-actual"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-xstaging 2022-06&#13;&#10;https://download.eclipse.org/technology/epp/packages/2022-06/202205051200&#13;&#10;https://download.eclipse.org/releases/2022-06/202205061000&#13;&#10;-xuseComposite 2022-06&#13;&#10;-xlatestReleased&#13;&#10;-brandingNotification&#13;&#10;-xsiteURI https://www.eclipse.org/downloads/packages/release/2022-06/m2&#13;&#10;-actual"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false&#13;&#10;-Dxorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient45&#13;&#10;-Doomph.p2.repository.retry=2&#13;&#10;-Dxorg.eclipse.ecf.core.util.traceAll=true&#13;&#10;-Dxorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog&#13;&#10;-Dxorg.apache.commons.logging.simplelog.showdatetime=true&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http=DEBUG&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http.wire=ERROR&#13;&#10;-Duser.home=${system_property:user.home}"/>
     <stringAttribute key="pde.version" value="3.3"/>
diff --git "a/plugins/org.eclipse.oomph.setup/Setup \050Installer Dialog\051.launch" "b/plugins/org.eclipse.oomph.setup/Setup \050Installer Dialog\051.launch"
index e962343..10f3867 100644
--- "a/plugins/org.eclipse.oomph.setup/Setup \050Installer Dialog\051.launch"
+++ "b/plugins/org.eclipse.oomph.setup/Setup \050Installer Dialog\051.launch"
@@ -4,7 +4,7 @@
         <setEntry value="com.sun.jna.platform:5.8.0.v20210406-1004:default:true:default:default"/>
         <setEntry value="com.sun.jna:5.8.0.v20210503-0343:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.event:1.6.100.v20211021-1418:default:true:default:default"/>
-        <setEntry value="org.eclipse.equinox.p2.artifact.repository:1.4.400.v20220223-1131:default:true:default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.artifact.repository:1.4.500.v20220329-1456:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.console:1.2.0.v20210315-2042:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.core:2.9.100.v20220310-1733:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.director.app:1.2.100.v20211220-1825:default:true:default:default"/>
@@ -12,21 +12,21 @@
         <setEntry value="org.eclipse.equinox.p2.directorywatcher:1.3.0.v20210316-1209:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.discovery.compatibility:1.2.200.v20220210-1157:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.discovery:1.2.0.v20210315-2042:default:true:default:default"/>
-        <setEntry value="org.eclipse.equinox.p2.engine:2.7.300.v20220209-1714:default:true:default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.engine:2.7.400.v20220329-1456:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.extensionlocation:1.4.100.v20220213-0541:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.garbagecollector:1.2.0.v20210316-1209:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.jarprocessor:1.2.300.v20220307-1946:default:true:default:default"/>
-        <setEntry value="org.eclipse.equinox.p2.metadata.repository:1.4.0.v20210315-2228:default:true:default:default"/>
-        <setEntry value="org.eclipse.equinox.p2.metadata:2.6.100.v20210813-0606:default:true:default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.metadata.repository:1.4.100.v20220329-1456:default:true:default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.metadata:2.6.200.v20220324-1313:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.operations:2.6.0.v20210315-2228:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.publisher.eclipse:1.4.2.v20220127-1658:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.publisher:1.7.0.v20220127-1312:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.reconciler.dropins:1.4.100.v20211217-1131:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.repository.tools:2.3.0.v20210325-0750:default:true:default:default"/>
-        <setEntry value="org.eclipse.equinox.p2.repository:2.6.0.v20220215-0840:default:true:default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.repository:2.6.100.v20220329-1456:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.touchpoint.eclipse:2.3.100.v20210615-1334:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.touchpoint.natives:1.4.300.v20220210-1319:default:true:default:default"/>
-        <setEntry value="org.eclipse.equinox.p2.transport.ecf:1.3.300.v20220309-1957:default:true:default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.transport.ecf:1.3.300.v20220416-1443:default:true:default:default"/>
         <setEntry value="org.eclipse.equinox.p2.updatesite:1.2.200.v20211013-0600:default:true:default:default"/>
     </setAttribute>
     <booleanAttribute key="append.args" value="true"/>
diff --git a/plugins/org.eclipse.oomph.targlets.doc/src/org/eclipse/oomph/targlets/doc/guide/ListeningToEvents.java b/plugins/org.eclipse.oomph.targlets.doc/src/org/eclipse/oomph/targlets/doc/guide/ListeningToEvents.java
index 9e2f8db..283d096 100644
--- a/plugins/org.eclipse.oomph.targlets.doc/src/org/eclipse/oomph/targlets/doc/guide/ListeningToEvents.java
+++ b/plugins/org.eclipse.oomph.targlets.doc/src/org/eclipse/oomph/targlets/doc/guide/ListeningToEvents.java
@@ -55,7 +55,7 @@
 }
 
 /**
- * @snippet
+ * @snip
  */
 class TargletContainerEventLogger implements ITargletContainerListener
 {
diff --git a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
index 648514f..84d0722 100644
--- a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.ui;singleton:=true
-Bundle-Version: 1.16.0.qualifier
+Bundle-Version: 1.17.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -19,7 +19,7 @@
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)";resolution:=optional
-Export-Package: org.eclipse.oomph.internal.ui;version="1.16.0";x-internal:=true,
- org.eclipse.oomph.ui;version="1.16.0";x-internal:=true
+Export-Package: org.eclipse.oomph.internal.ui;version="1.17.0";x-internal:=true,
+ org.eclipse.oomph.ui;version="1.17.0";x-internal:=true
 Eclipse-BuddyPolicy: dependent
 Automatic-Module-Name: org.eclipse.oomph.ui
diff --git a/plugins/org.eclipse.oomph.ui/pom.xml b/plugins/org.eclipse.oomph.ui/pom.xml
index fdbc270..53244fd 100644
--- a/plugins/org.eclipse.oomph.ui/pom.xml
+++ b/plugins/org.eclipse.oomph.ui/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.ui</artifactId>
-  <version>1.16.0-SNAPSHOT</version>
+  <version>1.17.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/ui/UIUtil.java b/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/ui/UIUtil.java
index c4b7295..9aa3c5b 100644
--- a/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/ui/UIUtil.java
+++ b/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/ui/UIUtil.java
@@ -1148,8 +1148,8 @@
    * the runnable will timer executed again,
    * without calling {@link #perform() perform}.
    * Otherwise, run will call perform to finally perform the delayed behavior.
-   * The {@link #prepareForDispatch() prepareForDispatch} method will be called immediate before any timer execute.
-   * In this default implementation is does nothing.
+   * The {@link #prepareForDispatch() prepareForDispatch} method will be called immediately before any timer execute.
+   * In this default implementation it does nothing.
    * If the control specified in the constructor is disposed when run is called, run will do nothing.
    *
    * @author Ed Merks
diff --git a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
index a7bd5fa..012b395 100644
--- a/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
+++ b/releng/org.eclipse.oomph.parent/tp/org.eclipse.oomph.tp.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from Oomph" sequenceNumber="83">
+<target name="Generated from Oomph" sequenceNumber="88">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="javaewah" version="0.0.0"/>
@@ -21,9 +21,11 @@
       <unit id="org.eclipse.swtbot.generator" version="0.0.0"/>
       <unit id="org.eclipse.userstorage.oauth" version="0.0.0"/>
       <unit id="org.eclipse.userstorage.tests" version="0.0.0"/>
+      <unit id="org.objectweb.asm" version="0.0.0"/>
+      <unit id="org.objectweb.asm.tree" version="0.0.0"/>
       <repository location="https://download.eclipse.org/eclipse/updates/4.24-I-builds"/>
       <repository location="https://download.eclipse.org/egit/updates-stable-nightly"/>
-      <repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.2"/>
+      <repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.3"/>
       <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
       <repository location="https://download.eclipse.org/mylyn/snapshots/weekly"/>
       <repository location="https://download.eclipse.org/nebula/snapshot"/>
diff --git a/setups/Oomph.setup b/setups/Oomph.setup
index 0cd1553..49ec9e2 100644
--- a/setups/Oomph.setup
+++ b/setups/Oomph.setup
@@ -518,7 +518,7 @@
           <repository
               url="https://download.eclipse.org/webtools/repository/latest"/>
           <repository
-              url="https://download.eclipse.org/justj/jres/17/updates/release/17.0.2"/>
+              url="https://download.eclipse.org/justj/jres/17/updates/release/17.0.3"/>
         </repositoryList>
         <repositoryList
             name="2022-03">
diff --git a/setups/interim/Orbit.setup b/setups/interim/Orbit.setup
new file mode 100644
index 0000000..91a105b
--- /dev/null
+++ b/setups/interim/Orbit.setup
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Project
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
+    xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
+    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
+    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
+    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
+    name="orbit"
+    label="Orbit">
+  <setupTask
+      xsi:type="setup:CompoundTask"
+      name="User Preferences">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/UserPreferences">
+      <detail
+          key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions">
+        <value>record</value>
+      </detail>
+    </annotation>
+    <setupTask
+        xsi:type="setup:CompoundTask"
+        name="org.eclipse.oomph.setup.ui">
+      <setupTask
+          xsi:type="setup:PreferenceTask"
+          key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions"
+          value="true"/>
+    </setupTask>
+  </setupTask>
+  <setupTask
+      xsi:type="jdt:JRETask"
+      version="JavaSE-11"
+      location="${jre.location-11}"
+      name="JRE for JavaSE-11">
+    <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:EclipseIniTask"
+      option="-Xmx"
+      value="1024m"
+      vm="true">
+    <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:ResourceCreationTask"
+      excludedTriggers="STARTUP MANUAL"
+      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
+      encoding="UTF-8">
+    <description>Initialize JDT's package explorer to show working sets as its root objects</description>
+    <content>
+      &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>
+      &lt;section name=&quot;Workbench&quot;>
+      	&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>
+      		&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>
+      		&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>
+      		&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>
+      		&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>
+      		&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>
+      	&lt;/section>
+      &lt;/section>
+
+    </content>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:VariableTask"
+      name="eclipse.target.platform"
+      value="None"
+      storageURI="scope://Workspace"/>
+  <setupTask
+      xsi:type="setup.p2:P2Task">
+    <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="git:GitCloneTask"
+      id="git.clone.orbit"
+      remoteURI="orbit/orbit-recipes">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/InducedChoices">
+      <detail
+          key="inherit">
+        <value>eclipse.git.gerrit.remoteURIs</value>
+      </detail>
+      <detail
+          key="label">
+        <value>${scope.project.label} Git or Gerrit repository</value>
+      </detail>
+      <detail
+          key="target">
+        <value>remoteURI</value>
+      </detail>
+    </annotation>
+    <description>${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.targlets:TargletTask">
+    <targlet
+        name="Orbit Recipes"
+        includeAllRequirements="false">
+      <requirement
+          name="*"/>
+      <sourceLocator
+          rootFolder="${git.clone.orbit.location}"
+          locateNestedProjects="true"/>
+    </targlet>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.workingsets:WorkingSetTask"
+      id="orbit"
+      prefix="org.eclipse.orbit-">
+    <workingSet
+        name="${scope.project.label}">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:RepositoryPredicate"
+            project="orbit-recipes"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//'orbit'/@workingSets[name='Orbit%20Bundles'] //'orbit'/@workingSets[name='Orbit%20Feature']"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="Orbit Bundles">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:RepositoryPredicate"
+            project="orbit-recipes"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//'orbit'/@workingSets[name='Orbit%20Feature']"/>
+        <operand
+            xsi:type="predicates:FilePredicate"
+            filePattern="src/eclipse/ip_log.xml"
+            contentPattern=".*"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="Orbit Feature">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:RepositoryPredicate"
+            project="orbit-recipes"/>
+        <operand
+            xsi:type="predicates:NaturePredicate"
+            nature="org.eclipse.pde.FeatureNature"/>
+      </predicate>
+    </workingSet>
+    <description>The dynamic working sets for ${scope.project.label}</description>
+  </setupTask>
+  <stream name="master"
+      label="Master">
+    <setupTask
+        xsi:type="setup:EclipseIniTask"
+        disabled="true"
+        option="-Doomph.redirection.orbit"
+        value="=https://git.eclipse.org/c/orbit/orbit-recipes.git/plain/setups/Orbit.setup->${git.clone.orbit.location|uri}/setups/Orbit.setup"
+        vm="true">
+      <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
+    </setupTask>
+  </stream>
+  <logicalProjectContainer
+      xsi:type="setup:ProjectCatalog"
+      href="../org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
+  <description>Orbit provides a development environment for working with Orbit.</description>
+</setup:Project>
diff --git a/setups/org.eclipse.projects.setup b/setups/org.eclipse.projects.setup
index 7bea32a..5d3a8e6 100644
--- a/setups/org.eclipse.projects.setup
+++ b/setups/org.eclipse.projects.setup
@@ -1112,6 +1112,7 @@
   <project href="https://raw.githubusercontent.com/eclipse/n4js/master/releng/org.eclipse.n4js.targetplatform/N4JS.setup#/"/>
   <project href="http://git.eclipse.org/c/ocl/org.eclipse.ocl.git/plain/releng/org.eclipse.ocl.oomph/setups/ocl.setup#/"/>
   <project href="Oomph.setup#/"/>
+  <project href="interim/Orbit.setup#/"/>
   <project href="https://raw.githubusercontent.com/eclipse/packagedrone/master/setups/org.eclipse.packagedrone.oomph/PackageDrone.setup#/"/>
   <project href="http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup#/"/>
   <project href="https://raw.githubusercontent.com/eclipse-passage/passage/master/releng/org.eclipse.passage.releng/passage.setup#/"/>