diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
index 1cff2eeee36..b7fb53ca013 100644
--- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
-Bundle-Version: 6.1.0.qualifier
+Bundle-Version: 7.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java
index ea08b7ce6c8..067ab3d8442 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java
@@ -241,7 +241,7 @@ public class CDIDebugModel {
 	}
 
 	/**
-	 * @since 6.1
+	 * @since 7.0
 	 */
 	public static ICLineBreakpoint createLineTracepoint( String sourceHandle, IResource resource, int type, int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register ) throws CoreException {
 		HashMap<String, Object> attributes = new HashMap<String, Object>( 10 );
@@ -351,7 +351,7 @@ public class CDIDebugModel {
 	}
 
 	/**
-	 * @since 6.1
+	 * @since 7.0
 	 */
 	public static ICAddressBreakpoint createAddressTracepoint( String module, String sourceHandle, IResource resource, int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, String condition, boolean register ) throws CoreException {
 		HashMap<String, Object> attributes = new HashMap<String, Object>( 10 );
@@ -567,7 +567,7 @@ public class CDIDebugModel {
 	}
 
 	/**
-	 * @since 6.1
+	 * @since 7.0
 	 */
 	public static ICFunctionBreakpoint createFunctionTracepoint( String sourceHandle, IResource resource, int type, String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register ) throws CoreException {
 		HashMap<String, Object> attributes = new HashMap<String, Object>( 10 );
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
index cbd5c112494..dbbf7df6227 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java
@@ -57,18 +57,20 @@ public interface ICDTLaunchConfigurationConstants {
 
 	/**
 	 * Launch configuration attribute value constants for build before launch.
-	 * @since 6.1 */
+	 * 
+	 * @since 7.0
+	 */
 	public static final int BUILD_BEFORE_LAUNCH_DISABLED = 0;
-	/** @since 6.1 */
+	/** @since 7.0 */
 	public static final int BUILD_BEFORE_LAUNCH_ENABLED = 1;
-	/** @since 6.1 */
+	/** @since 7.0 */
 	public static final int BUILD_BEFORE_LAUNCH_USE_WORKSPACE_SETTING = 2;
 
 	/**
 	 * Launch configuration attribute key. The value is the ID of the project's
 	 * build configuration that should be used when a build is required before launch.
 	 */
-	/** @since 6.1 */
+	/** @since 7.0 */
 	public static final String ATTR_BUILD_BEFORE_LAUNCH = CDT_LAUNCH_ID + ".ATTR_BUILD_BEFORE_LAUNCH_ATTR"; //$NON-NLS-1$
 
 	/**
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java
index 33c11f3dc14..3e0f366d453 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java
@@ -12,11 +12,10 @@ package org.eclipse.cdt.debug.core.model;
 
 import org.eclipse.core.runtime.CoreException;
 
-
 /**
  * A tracepoint specific to the C/C++ debug model.
  * 
- * @since 6.1
+ * @since 7.0
  */
 public interface ICTracepoint extends ICLineBreakpoint {
 	/**
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java
index 6dc50cdd3e3..a64dd857e52 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java
@@ -14,7 +14,8 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler;
 
 /**
  * Handler interface to perform a reverse Resume operation
- * @since 6.1
+ * 
+ * @since 7.0
  */
 public interface IReverseResumeHandler extends IDebugCommandHandler {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java
index f9ead996016..f8ef545622e 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java
@@ -14,7 +14,8 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler;
 
 /**
  * Handler interface to perform a reverse StepInto operation
- * @since 6.1
+ * 
+ * @since 7.0
  */
 public interface IReverseStepIntoHandler extends IDebugCommandHandler {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java
index 4ce795e85b5..78188b3614a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java
@@ -14,7 +14,8 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler;
 
 /**
  * Handler interface to perform a reverse StepOver operation
- * @since 6.1
+ * 
+ * @since 7.0
  */
 public interface IReverseStepOverHandler extends IDebugCommandHandler {
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java
index dd2557510f7..68e569c1646 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java
@@ -14,7 +14,8 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler;
 
 /**
  * Handler interface to toggle reverse debugging
- * @since 6.1
+ * 
+ * @since 7.0
  */
 public interface IReverseToggleHandler extends IDebugCommandHandler {
 	/**
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java
index e67a727a8b4..91e3318139e 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java
@@ -14,7 +14,8 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler;
 
 /**
  * Handler interface to perform an Uncall operation (reverse debugging)
- * @since 6.1
+ * 
+ * @since 7.0
  */
 public interface IUncallHandler extends IDebugCommandHandler {
 }
diff --git a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
index 7443e1c0fc8..42799b8dd2b 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.cdt.debug.mi.core,
  org.eclipse.cdt.debug.mi.core.command.factories.win32,
  org.eclipse.cdt.debug.mi.core.event,
  org.eclipse.cdt.debug.mi.core.output
-Require-Bundle: org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
+Require-Bundle: org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
index 5186665a608..3286716b085 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Export-Package: org.eclipse.cdt.debug.mi.internal.ui;x-internal:=true,
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.cdt.debug.mi.core;bundle-version="[6.0.0,7.0.0)",
- org.eclipse.cdt.debug.ui;bundle-version="[6.0.0,7.0.0)",
- org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.cdt.debug.ui;bundle-version="[7.0.0,8.0.0)",
+ org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
index 0611e1b17dc..63deaff592c 100644
--- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
-Bundle-Version: 6.1.0.qualifier
+Bundle-Version: 7.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.3.100,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java
index 5e79e00faeb..0b165616dc0 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/editors/AbstractDebugTextHover.java
@@ -56,7 +56,7 @@ import org.eclipse.ui.IEditorPart;
 /**
  * The text hovering support for C/C++ debugger.
  * 
- * @since 6.1
+ * @since 7.0
  */
 public abstract class AbstractDebugTextHover implements ICEditorTextHover, ITextHoverExtension {
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java
index 3f0fc19a55c..86476461c9d 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/preferences/ReadOnlyFieldEditor.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
 /**
- * @since 6.1
+ * @since 7.0
  */
 public class ReadOnlyFieldEditor extends FieldEditor implements ICBreakpointsUIContributionUser {
 	protected Label textField;
diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
index 1e326edd9ee..eec6bf19a34 100644
--- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
- org.eclipse.cdt.debug.ui;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.cdt.debug.core;bundle-version="[7.0.0,8.0.0)",
+ org.eclipse.cdt.debug.ui;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)",
  org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)"