Bug 535024: Revert increment to major version number

Within CDT new constants in interfaces do not require major version
increment, just a commented API filter. However in this case as the
interface is a grabbag for constants, it is even more appropriate
to mark it noextend/noimplement

Change-Id: I1ac6da12093bdd3e92cfa51c097383c9964f41a2

4 files changed, 27 insertions, 7 deletions

diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters b/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters
new file mode 100644
index 00000000000..b83155a705b
--- /dev/null
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/.settings/.api_filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.cdt.debug.gdbjtag.core" version="2">
+    <resource path="src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java" type="org.eclipse.cdt.debug.gdbjtag.core.IGDBJtagConstants">
+        <filter id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.debug.gdbjtag.core.IGDBJtagConstants"/>
+                <message_argument value="DEFAULT_DO_HALT"/>
+                <message_argument value="1"/>
+            </message_arguments>
+        </filter>
+        <filter id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.cdt.debug.gdbjtag.core.IGDBJtagConstants"/>
+                <message_argument value="DEFAULT_DO_RESET"/>
+                <message_argument value="1"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
index 766acf2a1b1..32004182441 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.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.gdbjtag.core;singleton:=true
-Bundle-Version: 10.0.0.qualifier
+Bundle-Version: 9.2.0.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java
index b487c604ba0..c1fe4d5172d 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java
@@ -16,7 +16,8 @@ package org.eclipse.cdt.debug.gdbjtag.core;
 
 /**
  * @author Doug Schaefer
- *
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IGDBJtagConstants {
 	
@@ -26,7 +27,7 @@ public interface IGDBJtagConstants {
 	public static final String ATTR_PORT_NUMBER = Activator.PLUGIN_ID + ".portNumber"; //$NON-NLS-1$
 	/** @deprecated Use {@link #ATTR_JTAG_DEVICE ID} instead */
 	public static final String ATTR_JTAG_DEVICE = Activator.PLUGIN_ID + ".jtagDevice"; //$NON-NLS-1$
-	/** @since 10.0*/ public static final String ATTR_JTAG_DEVICE_ID = Activator.PLUGIN_ID + ".jtagDeviceId"; //$NON-NLS-1$
+	/** @since 9.2 */ public static final String ATTR_JTAG_DEVICE_ID = Activator.PLUGIN_ID + ".jtagDeviceId"; //$NON-NLS-1$
 	
 	public static final boolean DEFAULT_USE_REMOTE_TARGET = true;
 	public static final String DEFAULT_IP_ADDRESS = "unspecified-ip-address"; //$NON-NLS-1$
@@ -76,8 +77,8 @@ public interface IGDBJtagConstants {
 	/** @since 7.0 */ public static final String DEFAULT_SYMBOLS_OFFSET = ""; //$NON-NLS-1$
 	/** @since 7.0 */ public static final String DEFAULT_PC_REGISTER = ""; //$NON-NLS-1$
 	/** @since 7.0 */ public static final String DEFAULT_STOP_AT = ""; //$NON-NLS-1$
-	/** @since 10.0*/ public static final String DEFAULT_JTAG_DEVICE_ID = ""; //$NON-NLS-1$
-	/** @since 10.0*/ public static final String DEFAULT_JTAG_DEVICE_NAME = ""; //$NON-NLS-1$
+	/** @since 9.2 */ public static final String DEFAULT_JTAG_DEVICE_ID = ""; //$NON-NLS-1$
+	/** @since 9.2 */ public static final String DEFAULT_JTAG_DEVICE_NAME = ""; //$NON-NLS-1$
 	/**
 	 * @since 7.0
 	 * @deprecated Use either {@link #DEFAULT_JTAG_DEVICE_ID} or {@link #DEFAULT_JTAG_DEVICE_NAME}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GDBJtagDeviceContributionFactory.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GDBJtagDeviceContributionFactory.java
index 803b1ba6ed2..a77eff73532 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GDBJtagDeviceContributionFactory.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GDBJtagDeviceContributionFactory.java
@@ -96,7 +96,7 @@ public class GDBJtagDeviceContributionFactory {
 	}
 
 	/**
-	 * @since 10.0
+	 * @since 9.2
 	 */
 	public GDBJtagDeviceContribution findByDeviceName(String name) {
 		for (GDBJtagDeviceContribution contribution : getGDBJtagDeviceContribution()) {
@@ -108,7 +108,7 @@ public class GDBJtagDeviceContributionFactory {
 	}
 
 	/**
-	 * @since 10.0
+	 * @since 9.2
 	 */
 	public GDBJtagDeviceContribution findByDeviceId(String id) {
 		for (GDBJtagDeviceContribution contribution : getGDBJtagDeviceContribution()) {