diff --git a/com.google.eclipse.protobuf.cdt.test/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.cdt.test/META-INF/MANIFEST.MF
index 4bb918b..d8421f1 100644
--- a/com.google.eclipse.protobuf.cdt.test/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.cdt.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Unit tests for com.google.eclipse.protobuf.cdt
 Bundle-SymbolicName: com.google.eclipse.protobuf.cdt.test
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Google Inc.
-Fragment-Host: com.google.eclipse.protobuf.cdt;bundle-version="1.0.0"
+Fragment-Host: com.google.eclipse.protobuf.cdt;bundle-version="[2.3.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.8.2",
- org.mockito;bundle-version="1.8.5",
- org.hamcrest.core;bundle-version="1.1.0",
- org.hamcrest.library;bundle-version="1.1.0"
+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
+ org.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
+ org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
diff --git a/com.google.eclipse.protobuf.cdt/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.cdt/META-INF/MANIFEST.MF
index bd718fa..65f817a 100644
--- a/com.google.eclipse.protobuf.cdt/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.cdt/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Protocol Buffer Editor: CDT Integration
 Bundle-SymbolicName: com.google.eclipse.protobuf.cdt;singleton:=true
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Activator: com.google.eclipse.protobuf.cdt.ProtobufCdtActivator
 Bundle-Vendor: Google Inc.
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core;bundle-version="5.3.1",
- org.eclipse.cdt.ui;bundle-version="5.3.1",
- com.google.eclipse.protobuf;bundle-version="1.2.1",
- com.google.eclipse.protobuf.ui;bundle-version="1.2.1",
- org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.jface.text;bundle-version="3.7.1",
- org.eclipse.xtext;bundle-version="2.2.1",
- org.eclipse.xtext.ui;bundle-version="2.2.1"
+Require-Bundle: com.google.eclipse.protobuf;bundle-version="[2.3.0,3.0.0)",
+ com.google.eclipse.protobuf.ui;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/com.google.eclipse.protobuf.feature/feature.xml b/com.google.eclipse.protobuf.feature/feature.xml
index d12a6be..c90f367 100644
--- a/com.google.eclipse.protobuf.feature/feature.xml
+++ b/com.google.eclipse.protobuf.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.google.eclipse.protobuf"
       label="%featureName"
-      version="2.2.1.qualifier"
+      version="2.3.0.qualifier"
       provider-name="%providerName">
 
    <description url="https://code.google.com/p/protobuf-dt/">
@@ -50,11 +50,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.google.eclipse.protobuf.generator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/com.google.eclipse.protobuf.test/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.test/META-INF/MANIFEST.MF
index 756cbcd..a645861 100644
--- a/com.google.eclipse.protobuf.test/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for com.google.eclipse.protobuf
 Bundle-SymbolicName: com.google.eclipse.protobuf.test
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Google Inc.
-Fragment-Host: com.google.eclipse.protobuf;bundle-version="1.0.0"
-Require-Bundle: org.junit;bundle-version="4.8.1",
- org.mockito;bundle-version="1.8.5",
- org.eclipse.core.resources;bundle-version="3.7.100",
- org.hamcrest.core;bundle-version="1.1.0",
- org.hamcrest.library;bundle-version="1.1.0"
+Fragment-Host: com.google.eclipse.protobuf;bundle-version="[2.3.0,3.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
+ org.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
+ org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.google.eclipse.protobuf.junit.core,
  com.google.eclipse.protobuf.junit.matchers,
diff --git a/com.google.eclipse.protobuf.ui.functional.test/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui.functional.test/META-INF/MANIFEST.MF
index b7c64ce..7e64e30 100644
--- a/com.google.eclipse.protobuf.ui.functional.test/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui.functional.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: com.google.eclipse.protobuf.ui.functional.test
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Google Inc.
-Fragment-Host: com.google.eclipse.protobuf.ui;bundle-version="1.1.1"
+Fragment-Host: com.google.eclipse.protobuf.ui;bundle-version="[2.3.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.swtbot.go;bundle-version="2.0.5",
- org.mockito;bundle-version="1.8.5"
+Require-Bundle: org.eclipse.swtbot.go;bundle-version="[2.5.0,3.0.0)",
+ org.mockito;bundle-version="[1.9.5,2.0.0)"
diff --git a/com.google.eclipse.protobuf.ui.integration.test/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui.integration.test/META-INF/MANIFEST.MF
index 648dae8..7d6caef 100644
--- a/com.google.eclipse.protobuf.ui.integration.test/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui.integration.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Integration tests for com.google.eclipse.protobuf.ui
 Bundle-SymbolicName: com.google.eclipse.protobuf.ui.integration.test
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Google Inc.
-Fragment-Host: com.google.eclipse.protobuf.ui;bundle-version="1.2.3"
-Require-Bundle: org.junit;bundle-version="4.8.1",
- org.mockito;bundle-version="1.8.5",
- org.hamcrest.core;bundle-version="1.1.0",
- org.hamcrest.library;bundle-version="1.1.0"
+Fragment-Host: com.google.eclipse.protobuf.ui;bundle-version="[2.3.0,3.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
+ org.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
+ org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.google.eclipse.protobuf.ui.test/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui.test/META-INF/MANIFEST.MF
index 1a41b55..fb22808 100644
--- a/com.google.eclipse.protobuf.ui.test/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for com.google.eclipse.protobuf.ui
 Bundle-SymbolicName: com.google.eclipse.protobuf.ui.test
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Google Inc.
-Fragment-Host: com.google.eclipse.protobuf.ui;bundle-version="1.0.0"
+Fragment-Host: com.google.eclipse.protobuf.ui;bundle-version="[2.3.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.8.1",
- org.mockito;bundle-version="1.8.5",
- org.hamcrest.core;bundle-version="1.1.0",
- org.hamcrest.library;bundle-version="1.1.0"
+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
+ org.mockito;bundle-version="[1.9.5,2.0.0)",
+ org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
+ org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
diff --git a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
index 096c09d..284863c 100644
--- a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Activator: com.google.eclipse.protobuf.ui.internal.Activator
 Bundle-SymbolicName: com.google.eclipse.protobuf.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.google.eclipse.protobuf,
- org.antlr.runtime,
- org.apache.commons.logging,
- org.apache.log4j,
- org.eclipse.compare.core,
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core;resolution:=optional,
- org.eclipse.ui,
- org.eclipse.ui.console,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.xtext.builder,
- org.eclipse.xtext.ui,
- org.eclipse.xtext.ui.shared
+Require-Bundle: com.google.eclipse.protobuf;bundle-version="[2.3.0,3.0.0)",
+ org.antlr.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.apache.commons.logging;bundle-version="[1.1.1,2.0.0)",
+ org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
+ org.eclipse.compare.core;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.6.200,4.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.ui.shared;bundle-version="[2.10.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.google.eclipse.protobuf.ui.contentassist,
  com.google.eclipse.protobuf.ui.contentassist.antlr,
diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
index e76431d..5b7d26e 100644
--- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -3,22 +3,22 @@
 Eclipse-ExtensibleAPI: true
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-SymbolicName: com.google.eclipse.protobuf; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime,
- org.apache.commons.logging,
- org.apache.log4j,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.xtext,
- org.eclipse.xtext.generator;resolution:=optional,
- org.eclipse.xtext.ui,
- org.eclipse.xtext.util
+Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.apache.commons.logging;bundle-version="[1.1.1,2.0.0)",
+ org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
+ org.eclipse.emf.mwe2.launch;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+ org.eclipse.jdt.annotation;bundle-version="[2.1.0,3.0.0)";resolution:=optional,
+ org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.generator;bundle-version="[2.10.0,3.0.0)";resolution:=optional,
+ org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.google.eclipse.protobuf,
  com.google.eclipse.protobuf.conversion,