563071: update org.eclipse.mylyn versions to 3.25.1R_3_25_1

Change-Id: I0b1973471a3bf8c783373202ebb9021b72d11aa4
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=563071
Signed-off-by: Frank Becker <eclipse@frank-becker.de>

72 files changed, 126 insertions, 132 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
index 0b0c0ba64..29ac151cf 100644
--- a/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.ide;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Require-Bundle: org.eclipse.mylyn.tasks.core;bundle-version="[3.8.0,4.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/org.eclipse.mylyn.bugzilla.ide/pom.xml b/org.eclipse.mylyn.bugzilla.ide/pom.xml
index 910b775ea..717a410dc 100644
--- a/org.eclipse.mylyn.bugzilla.ide/pom.xml
+++ b/org.eclipse.mylyn.bugzilla.ide/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.bugzilla.ide</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.cdt-feature/feature.xml b/org.eclipse.mylyn.cdt-feature/feature.xml
index 43e4a84d3..5e2e489ca 100644
--- a/org.eclipse.mylyn.cdt-feature/feature.xml
+++ b/org.eclipse.mylyn.cdt-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.cdt.mylyn"
       label="%featureName"
-      version="5.21.0.qualifier"
+      version="5.21.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -32,7 +32,7 @@
 
    <requires>
       <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.25.0" match="compatible"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.25.1" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.cdt-feature/pom.xml b/org.eclipse.mylyn.cdt-feature/pom.xml
index 879c1cca5..eaed32239 100644
--- a/org.eclipse.mylyn.cdt-feature/pom.xml
+++ b/org.eclipse.mylyn.cdt-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.cdt.mylyn</artifactId>
-  <version>5.21.0-SNAPSHOT</version>
+  <version>5.21.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF
index 7084436f9..c93b095d5 100644
--- a/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.cdt.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn CDT Tests
 Bundle-SymbolicName: org.eclipse.mylyn.cdt.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.cdt.tests/pom.xml b/org.eclipse.mylyn.cdt.tests/pom.xml
index 3046acb04..f38928db0 100644
--- a/org.eclipse.mylyn.cdt.tests/pom.xml
+++ b/org.eclipse.mylyn.cdt.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.cdt.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllCdtTests</test.suite>
diff --git a/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
index 3380ea899..177a97a5e 100644
--- a/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.cdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.cdt.mylyn.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.cdt.ui/pom.xml b/org.eclipse.mylyn.cdt.ui/pom.xml
index 77591530a..024a2fdf7 100644
--- a/org.eclipse.mylyn.cdt.ui/pom.xml
+++ b/org.eclipse.mylyn.cdt.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.cdt.mylyn.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context-feature/feature.xml b/org.eclipse.mylyn.context-feature/feature.xml
index 75ef6cc8d..8bc474e3b 100644
--- a/org.eclipse.mylyn.context-feature/feature.xml
+++ b/org.eclipse.mylyn.context-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.context_feature"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn_feature" version="3.25.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn_feature" version="3.25.1" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.context-feature/pom.xml b/org.eclipse.mylyn.context-feature/pom.xml
index 1d8a82641..e99ef0e10 100644
--- a/org.eclipse.mylyn.context-feature/pom.xml
+++ b/org.eclipse.mylyn.context-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context_feature</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.context-site/pom.xml b/org.eclipse.mylyn.context-site/pom.xml
index 98468811c..1f9369fc6 100644
--- a/org.eclipse.mylyn.context-site/pom.xml
+++ b/org.eclipse.mylyn.context-site/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context-site</artifactId>
   <packaging>eclipse-update-site</packaging>
diff --git a/org.eclipse.mylyn.context-target/pom.xml b/org.eclipse.mylyn.context-target/pom.xml
index f36b3d81e..0085e72ae 100644
--- a/org.eclipse.mylyn.context-target/pom.xml
+++ b/org.eclipse.mylyn.context-target/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context-target</artifactId>
   <packaging>pom</packaging>
diff --git a/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
index 8f90a431e..3a3a72792 100644
--- a/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.context.core;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.context.core.ContextCorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.context.core/pom.xml b/org.eclipse.mylyn.context.core/pom.xml
index 7d6d0af47..e0bc54421 100644
--- a/org.eclipse.mylyn.context.core/pom.xml
+++ b/org.eclipse.mylyn.context.core/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.core</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.development-feature/feature.xml b/org.eclipse.mylyn.context.development-feature/feature.xml
index 513956bc6..1f0f2a088 100644
--- a/org.eclipse.mylyn.context.development-feature/feature.xml
+++ b/org.eclipse.mylyn.context.development-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.context.development"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.mylyn.context.development-feature/pom.xml b/org.eclipse.mylyn.context.development-feature/pom.xml
index 78bba912c..ec5507551 100644
--- a/org.eclipse.mylyn.context.development-feature/pom.xml
+++ b/org.eclipse.mylyn.context.development-feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.development</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/org.eclipse.mylyn.context.sdk-feature/feature.xml b/org.eclipse.mylyn.context.sdk-feature/feature.xml
index c1b1dac95..a198dd5d0 100644
--- a/org.eclipse.mylyn.context.sdk-feature/feature.xml
+++ b/org.eclipse.mylyn.context.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.context.sdk"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.mylyn.context.sdk-feature/pom.xml b/org.eclipse.mylyn.context.sdk-feature/pom.xml
index a3122e929..93e3b6ee0 100644
--- a/org.eclipse.mylyn.context.sdk-feature/pom.xml
+++ b/org.eclipse.mylyn.context.sdk-feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.sdk</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF
index 8fc6fea36..e26e24177 100644
--- a/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.sdk.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context SDK Java Utilities
 Bundle-SymbolicName: org.eclipse.mylyn.context.sdk.java;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.sdk.java/pom.xml b/org.eclipse.mylyn.context.sdk.java/pom.xml
index 9fda9096d..ac54bfbd2 100644
--- a/org.eclipse.mylyn.context.sdk.java/pom.xml
+++ b/org.eclipse.mylyn.context.sdk.java/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.sdk.java</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF
index 75124b8a2..abb01fd84 100644
--- a/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.sdk.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context SDK Utilities
 Bundle-SymbolicName: org.eclipse.mylyn.context.sdk.util;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.sdk.util/pom.xml b/org.eclipse.mylyn.context.sdk.util/pom.xml
index 15f9d088e..a25d8298f 100644
--- a/org.eclipse.mylyn.context.sdk.util/pom.xml
+++ b/org.eclipse.mylyn.context.sdk.util/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.sdk.util</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF
index d40da6e5f..ae25149d6 100644
--- a/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tasks.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tasks Tests
 Bundle-SymbolicName: org.eclipse.mylyn.context.tasks.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.tasks.tests/pom.xml b/org.eclipse.mylyn.context.tasks.tests/pom.xml
index fc52d6ea5..200c2e88f 100644
--- a/org.eclipse.mylyn.context.tasks.tests/pom.xml
+++ b/org.eclipse.mylyn.context.tasks.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tasks.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllContextTasksTests</test.suite>
diff --git a/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF
index ce81db1a9..287a1fb2c 100644
--- a/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tasks.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tasks UI Tests
 Bundle-SymbolicName: org.eclipse.mylyn.context.tasks.ui.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml b/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml
index 2ed58d805..0560bd10e 100644
--- a/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml
+++ b/org.eclipse.mylyn.context.tasks.ui.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tasks.ui.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllContextTasksUiTests</test.suite>
diff --git a/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF
index 5bb8ea0ce..24701ad43 100644
--- a/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tasks.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.context.tasks.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
diff --git a/org.eclipse.mylyn.context.tasks.ui/pom.xml b/org.eclipse.mylyn.context.tasks.ui/pom.xml
index 6647baef0..e82fcc54a 100644
--- a/org.eclipse.mylyn.context.tasks.ui/pom.xml
+++ b/org.eclipse.mylyn.context.tasks.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tasks.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
index 5545c1182..9900e4693 100644
--- a/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tests
 Bundle-SymbolicName: org.eclipse.mylyn.context.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.tests/pom.xml b/org.eclipse.mylyn.context.tests/pom.xml
index fc800f12c..aa60e0b62 100644
--- a/org.eclipse.mylyn.context.tests/pom.xml
+++ b/org.eclipse.mylyn.context.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllContextTests</test.suite>
diff --git a/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
index 5e1b6b9bc..c234fcd9c 100644
--- a/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.context.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.context.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.context.ui.ContextUiPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.context.ui/pom.xml b/org.eclipse.mylyn.context.ui/pom.xml
index 550e7078c..c08540ab2 100644
--- a/org.eclipse.mylyn.context.ui/pom.xml
+++ b/org.eclipse.mylyn.context.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.context.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
index 5bea2a7a7..9e072fe4b 100644
--- a/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Context Tests
 Bundle-SymbolicName: org.eclipse.mylyn.debug.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.debug.tests/pom.xml b/org.eclipse.mylyn.debug.tests/pom.xml
index 4a0fbb77a..269d00928 100644
--- a/org.eclipse.mylyn.debug.tests/pom.xml
+++ b/org.eclipse.mylyn.debug.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.debug.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
index d3b80f4e4..b21d1cdac 100644
--- a/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.debug.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.debug.ui.DebugUiPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.debug.ui/pom.xml b/org.eclipse.mylyn.debug.ui/pom.xml
index 1eb744daa..1487ecc23 100644
--- a/org.eclipse.mylyn.debug.ui/pom.xml
+++ b/org.eclipse.mylyn.debug.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.debug.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.ide-feature/feature.xml b/org.eclipse.mylyn.ide-feature/feature.xml
index 226976d67..b5f18f03e 100644
--- a/org.eclipse.mylyn.ide-feature/feature.xml
+++ b/org.eclipse.mylyn.ide-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.ide_feature"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,9 +31,9 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.25.0" match="equivalent"/>
-      <import feature="org.eclipse.mylyn.team_feature" version="3.25.0" match="equivalent"/>
-      <import feature="org.eclipse.mylyn.tasks.ide" version="3.25.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.25.1" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.team_feature" version="3.25.1" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.tasks.ide" version="3.25.1" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.ide-feature/pom.xml b/org.eclipse.mylyn.ide-feature/pom.xml
index c67738fd5..c11f912ea 100644
--- a/org.eclipse.mylyn.ide-feature/pom.xml
+++ b/org.eclipse.mylyn.ide-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide_feature</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
index 5ef081908..618c78097 100644
--- a/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.ide.ant/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.ide.ant;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ant.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.ide.ant/pom.xml b/org.eclipse.mylyn.ide.ant/pom.xml
index 13cd85fa4..f9d4a81b5 100644
--- a/org.eclipse.mylyn.ide.ant/pom.xml
+++ b/org.eclipse.mylyn.ide.ant/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide.ant</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
index 80442a796..3318ccb46 100644
--- a/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.ide.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn IDE Tests
 Bundle-SymbolicName: org.eclipse.mylyn.ide.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.ui,
diff --git a/org.eclipse.mylyn.ide.tests/pom.xml b/org.eclipse.mylyn.ide.tests/pom.xml
index 7fb46058f..7860105c7 100644
--- a/org.eclipse.mylyn.ide.tests/pom.xml
+++ b/org.eclipse.mylyn.ide.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllIdeTests</test.suite>
diff --git a/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
index 949905d69..39bb539a0 100644
--- a/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.ide.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.ide.ui.IdeUiBridgePlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.mylyn.ide.ui/pom.xml b/org.eclipse.mylyn.ide.ui/pom.xml
index 79bb81bb5..87f6bfba1 100644
--- a/org.eclipse.mylyn.ide.ui/pom.xml
+++ b/org.eclipse.mylyn.ide.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.ide.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.java-feature/feature.xml b/org.eclipse.mylyn.java-feature/feature.xml
index 07303f819..8a2926cbf 100644
--- a/org.eclipse.mylyn.java-feature/feature.xml
+++ b/org.eclipse.mylyn.java-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.java_feature"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.25.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.25.1" match="equivalent"/>
       <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/org.eclipse.mylyn.java-feature/pom.xml b/org.eclipse.mylyn.java-feature/pom.xml
index 9a331c427..cb35be76f 100644
--- a/org.eclipse.mylyn.java-feature/pom.xml
+++ b/org.eclipse.mylyn.java-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java_feature</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
index c28f02bcb..393f28264 100644
--- a/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.java.tasks/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.java.tasks;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
diff --git a/org.eclipse.mylyn.java.tasks/pom.xml b/org.eclipse.mylyn.java.tasks/pom.xml
index 9cb5463e8..8275150d6 100644
--- a/org.eclipse.mylyn.java.tasks/pom.xml
+++ b/org.eclipse.mylyn.java.tasks/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java.tasks</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
index 5b4a1c9f8..ff0024a88 100644
--- a/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.java.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Java Tests
 Bundle-SymbolicName: org.eclipse.mylyn.java.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.java.tests/pom.xml b/org.eclipse.mylyn.java.tests/pom.xml
index 9a9a0ad7e..0265e3026 100644
--- a/org.eclipse.mylyn.java.tests/pom.xml
+++ b/org.eclipse.mylyn.java.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllJavaTests</test.suite>
diff --git a/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
index a0478b1de..d775d48f7 100644
--- a/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.java.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.java.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.java.ui/plugin.xml b/org.eclipse.mylyn.java.ui/plugin.xml
index 66faa8168..9c3339163 100644
--- a/org.eclipse.mylyn.java.ui/plugin.xml
+++ b/org.eclipse.mylyn.java.ui/plugin.xml
@@ -101,9 +101,10 @@
 		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
 		id="javaAllCompletionProposalComputer">
 		<javaCompletionProposalComputer
-          activate="true"
-          categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory"
-          class="org.eclipse.mylyn.internal.java.ui.editor.FocusedJavaAllProposalComputer">
+        activate="true"
+        categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory"
+        class="org.eclipse.mylyn.internal.java.ui.editor.FocusedJavaAllProposalComputer"
+        requiresUIThread="false">
 			<partition type="__dftl_partition_content_type"/>
 			<partition type="__java_string"/>
 		</javaCompletionProposalComputer>
@@ -111,28 +112,21 @@
 	<!-- javadoc completions -->
 	<extension
 		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
-		id="LegacyJavadocCompletionProposalComputer_all">
-		<javaCompletionProposalComputer 
-			class="org.eclipse.jdt.internal.ui.text.javadoc.LegacyJavadocCompletionProposalComputer"
-			categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory">
-			<partition type="__java_javadoc"/>
-		</javaCompletionProposalComputer>
-	</extension>
-	<extension
-		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
 		id="JavadocCompletionProposalComputer_all">
-		<javaCompletionProposalComputer 
-			class="org.eclipse.jdt.internal.ui.text.javadoc.JavadocCompletionProposalComputer"
-			categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory">
+		<javaCompletionProposalComputer
+        categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory"
+        class="org.eclipse.jdt.internal.ui.text.javadoc.JavadocCompletionProposalComputer"
+        requiresUIThread="false">
 			<partition type="__java_javadoc"/>
 		</javaCompletionProposalComputer>
 	</extension>
 	<extension
 		point="org.eclipse.jdt.ui.javaCompletionProposalComputer"
 		id="JavadocHTMLCompletionProposalComputer_all">
-		<javaCompletionProposalComputer 
-			class="org.eclipse.jdt.internal.ui.text.javadoc.HTMLTagCompletionProposalComputer"
-			categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory">
+		<javaCompletionProposalComputer
+        categoryId="org.eclipse.mylyn.java.ui.javaAllProposalCategory"
+        class="org.eclipse.jdt.internal.ui.text.javadoc.HTMLTagCompletionProposalComputer"
+        requiresUIThread="false">
 			<partition type="__java_javadoc"/>
 		</javaCompletionProposalComputer>
 	</extension>
diff --git a/org.eclipse.mylyn.java.ui/pom.xml b/org.eclipse.mylyn.java.ui/pom.xml
index 0bbddabfa..40de5c92f 100644
--- a/org.eclipse.mylyn.java.ui/pom.xml
+++ b/org.eclipse.mylyn.java.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.java.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.pde-feature/feature.xml b/org.eclipse.mylyn.pde-feature/feature.xml
index d39ead474..a2aa100f9 100644
--- a/org.eclipse.mylyn.pde-feature/feature.xml
+++ b/org.eclipse.mylyn.pde-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.pde_feature"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.java_feature" version="3.25.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.java_feature" version="3.25.1" match="equivalent"/>
       <import feature="org.eclipse.pde" version="3.6.0" match="compatible"/>
    </requires>
 
diff --git a/org.eclipse.mylyn.pde-feature/pom.xml b/org.eclipse.mylyn.pde-feature/pom.xml
index fad93417d..de89be86c 100644
--- a/org.eclipse.mylyn.pde-feature/pom.xml
+++ b/org.eclipse.mylyn.pde-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.pde_feature</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
index 2908c696e..cde38c455 100644
--- a/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.pde.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.pde.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.pde.ui/pom.xml b/org.eclipse.mylyn.pde.ui/pom.xml
index 6599dc405..eafe30a38 100644
--- a/org.eclipse.mylyn.pde.ui/pom.xml
+++ b/org.eclipse.mylyn.pde.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.pde.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
index c308b7a22..9b6f167af 100644
--- a/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.resources.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Resources Tests
 Bundle-SymbolicName: org.eclipse.mylyn.resources.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.resources.tests/pom.xml b/org.eclipse.mylyn.resources.tests/pom.xml
index c4e9f71c8..367fd715c 100644
--- a/org.eclipse.mylyn.resources.tests/pom.xml
+++ b/org.eclipse.mylyn.resources.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.resources.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllResourcesTests</test.suite>
diff --git a/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
index b2d7deaa6..fd1715bc2 100644
--- a/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.resources.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.resources.ui/pom.xml b/org.eclipse.mylyn.resources.ui/pom.xml
index 49e825f16..64f84dfb3 100644
--- a/org.eclipse.mylyn.resources.ui/pom.xml
+++ b/org.eclipse.mylyn.resources.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.resources.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.team-feature/feature.xml b/org.eclipse.mylyn.team-feature/feature.xml
index 55abf6d98..02672cb4d 100644
--- a/org.eclipse.mylyn.team-feature/feature.xml
+++ b/org.eclipse.mylyn.team-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.team_feature"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.25.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.25.1" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.mylyn.team-feature/pom.xml b/org.eclipse.mylyn.team-feature/pom.xml
index 0119de048..7feb04e78 100644
--- a/org.eclipse.mylyn.team-feature/pom.xml
+++ b/org.eclipse.mylyn.team-feature/pom.xml
@@ -5,9 +5,9 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team_feature</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.team.cvs-feature/feature.xml b/org.eclipse.mylyn.team.cvs-feature/feature.xml
index fda4524cb..7826b5367 100644
--- a/org.eclipse.mylyn.team.cvs-feature/feature.xml
+++ b/org.eclipse.mylyn.team.cvs-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.mylyn.team.cvs"
       label="%featureName"
-      version="3.25.0.qualifier"
+      version="3.25.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.mylyn.context.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.mylyn.team_feature" version="3.25.0" match="equivalent"/>
+      <import feature="org.eclipse.mylyn.team_feature" version="3.25.1" match="equivalent"/>
       <import feature="org.eclipse.cvs" version="1.2.0" match="compatible"/>
    </requires>
 
diff --git a/org.eclipse.mylyn.team.cvs-feature/pom.xml b/org.eclipse.mylyn.team.cvs-feature/pom.xml
index 2ee0fdd5f..362066e33 100644
--- a/org.eclipse.mylyn.team.cvs-feature/pom.xml
+++ b/org.eclipse.mylyn.team.cvs-feature/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.cvs</artifactId>
   <groupId>org.eclipse.mylyn.context.features</groupId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
index 537b7330b..3a035ed92 100644
--- a/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.team.cvs;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.team.core,
  org.eclipse.team.cvs.ui,
diff --git a/org.eclipse.mylyn.team.cvs/pom.xml b/org.eclipse.mylyn.team.cvs/pom.xml
index f028bea96..e53509b57 100644
--- a/org.eclipse.mylyn.team.cvs/pom.xml
+++ b/org.eclipse.mylyn.team.cvs/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.cvs</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
index 729968ac1..d6ad6565b 100644
--- a/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.team.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Team Tests
 Bundle-SymbolicName: org.eclipse.mylyn.team.tests;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Vendor: Eclipse Mylyn
 Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.core.resources,
diff --git a/org.eclipse.mylyn.team.tests/pom.xml b/org.eclipse.mylyn.team.tests/pom.xml
index 917df7957..11f12d78d 100644
--- a/org.eclipse.mylyn.team.tests/pom.xml
+++ b/org.eclipse.mylyn.team.tests/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.tests</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <test.suite>${project.artifactId}.AllTeamTests</test.suite>
diff --git a/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
index 63ac0384d..b5068cb39 100644
--- a/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.team.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.team.ui;singleton:=true
-Bundle-Version: 3.25.0.qualifier
+Bundle-Version: 3.25.1.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.team.ui.FocusedTeamUiPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.compare,
diff --git a/org.eclipse.mylyn.team.ui/pom.xml b/org.eclipse.mylyn.team.ui/pom.xml
index 3ce3899b9..6379c275b 100644
--- a/org.eclipse.mylyn.team.ui/pom.xml
+++ b/org.eclipse.mylyn.team.ui/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <artifactId>org.eclipse.mylyn.context-parent</artifactId>
     <groupId>org.eclipse.mylyn.context</groupId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.mylyn.team.ui</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/pom.xml b/pom.xml
index 0d927d533..109faa183 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.mylyn</groupId>
     <artifactId>org.eclipse.mylyn-parent</artifactId>
-    <version>3.25.0-SNAPSHOT</version>
+    <version>3.25.1-SNAPSHOT</version>
     <relativePath>../org.eclipse.mylyn/org.eclipse.mylyn-parent</relativePath>
   </parent>
   <groupId>org.eclipse.mylyn.context</groupId>
   <artifactId>org.eclipse.mylyn.context-parent</artifactId>
-  <version>3.25.0-SNAPSHOT</version>
+  <version>3.25.1-SNAPSHOT</version>
   <name>Mylyn Context</name>
   <packaging>pom</packaging>
   <properties>
@@ -84,7 +84,7 @@
                 <artifact>
                   <groupId>org.eclipse.mylyn.context</groupId>
                   <artifactId>org.eclipse.mylyn.context-target</artifactId>
-                  <version>3.25.0-SNAPSHOT</version>
+                  <version>3.25.1-SNAPSHOT</version>
                   <classifier>mylyn-context-e3.5</classifier>
                 </artifact>
               </target>