diff --git a/org.eclipse.tm.terminal-feature/feature.properties b/org.eclipse.tm.terminal-feature/feature.properties
index 7caecabc2ee..f37d8cd2db1 100644
--- a/org.eclipse.tm.terminal-feature/feature.properties
+++ b/org.eclipse.tm.terminal-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -29,7 +29,7 @@ with RCP-only dependencies.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal-feature/feature.xml b/org.eclipse.tm.terminal-feature/feature.xml
index 3271034b3c2..2c0c8ecdfbf 100644
--- a/org.eclipse.tm.terminal-feature/feature.xml
+++ b/org.eclipse.tm.terminal-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal"
       label="%featureName"
-      version="2.0.100.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
index 75baca71d9e..769c121edb6 100644
--- a/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
+++ b/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=An ANSI (vt102) compatible Terminal widget.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties b/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties
index d7720534e62..d309a515867 100644
--- a/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties
+++ b/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal Widget Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.sdk-feature/feature.properties b/org.eclipse.tm.terminal.sdk-feature/feature.properties
index 95829045dd5..21f609b6b4f 100644
--- a/org.eclipse.tm.terminal.sdk-feature/feature.properties
+++ b/org.eclipse.tm.terminal.sdk-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -29,7 +29,7 @@ tmUpdateSiteName=Target Management Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.sdk-feature/feature.xml b/org.eclipse.tm.terminal.sdk-feature/feature.xml
index 26539740aa6..51be9b885b1 100644
--- a/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="2.0.100.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/org.eclipse.tm.terminal.serial-feature/feature.properties b/org.eclipse.tm.terminal.serial-feature/feature.properties
index c99117835b9..c2cc5aaa263 100644
--- a/org.eclipse.tm.terminal.serial-feature/feature.properties
+++ b/org.eclipse.tm.terminal.serial-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=A serial line connector for the Terminal using RXTX API
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.serial-feature/feature.xml b/org.eclipse.tm.terminal.serial-feature/feature.xml
index 3056b22bce0..f43358616c5 100644
--- a/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/org.eclipse.tm.terminal.serial-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.serial"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="2.0.100.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -25,7 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
index 7dae54b97dc..254a5c80d56 100644
--- a/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
+++ b/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=A serial line connector for the Terminal using RXTX API
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties b/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties
index 4771c45a9ce..c6566a212e9 100644
--- a/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties
+++ b/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal Serial Connector Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
index 9524e3ab09f..da92ee74f55 100644
--- a/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.serial;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Localization: plugin
 Import-Package: gnu.io;resolution:=optional
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Eclipse-BuddyPolicy: ext
diff --git a/org.eclipse.tm.terminal.serial/about.properties b/org.eclipse.tm.terminal.serial/about.properties
index dd9d0c53170..cff34a19035 100644
--- a/org.eclipse.tm.terminal.serial/about.properties
+++ b/org.eclipse.tm.terminal.serial/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal Serial Connector\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.ssh-feature/feature.properties b/org.eclipse.tm.terminal.ssh-feature/feature.properties
index 0171d2cac6b..ed785b225ac 100644
--- a/org.eclipse.tm.terminal.ssh-feature/feature.properties
+++ b/org.eclipse.tm.terminal.ssh-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=An SSH connector implementation for the Terminal.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2000, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.ssh-feature/feature.xml b/org.eclipse.tm.terminal.ssh-feature/feature.xml
index a7421cd1e3d..c4db4137dde 100644
--- a/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/org.eclipse.tm.terminal.ssh-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.ssh"
       label="%featureName"
-      version="2.0.2.qualifier"
+      version="2.0.100.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -25,7 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
       <import plugin="org.eclipse.jsch.core" version="1.0.0" match="compatible"/>
       <import plugin="com.jcraft.jsch" version="0.1.31" match="compatible"/>
    </requires>
diff --git a/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
index d2270d08453..051d0330fbf 100644
--- a/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=An SSH connector implementation for the Terminal.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2000, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties b/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
index 34100b169e7..5854f2d182e 100644
--- a/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
+++ b/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal SSH Connector Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2000, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2000, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
index 935cf94af2f..ac99ae31423 100644
--- a/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.ssh;singleton:=true
-Bundle-Version: 2.0.2.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)",
  com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)",
  org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.tm.terminal.ssh/about.properties b/org.eclipse.tm.terminal.ssh/about.properties
index 3f9ed5ee499..b4eb8f46c78 100644
--- a/org.eclipse.tm.terminal.ssh/about.properties
+++ b/org.eclipse.tm.terminal.ssh/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal SSH Connector\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2000, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2000, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.telnet-feature/feature.properties b/org.eclipse.tm.terminal.telnet-feature/feature.properties
index ba20052c8d3..84ef0399d13 100644
--- a/org.eclipse.tm.terminal.telnet-feature/feature.properties
+++ b/org.eclipse.tm.terminal.telnet-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=A Telnet connector implementation for the Terminal.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.telnet-feature/feature.xml b/org.eclipse.tm.terminal.telnet-feature/feature.xml
index 7dae7b8c509..42a76d7f7f0 100644
--- a/org.eclipse.tm.terminal.telnet-feature/feature.xml
+++ b/org.eclipse.tm.terminal.telnet-feature/feature.xml
@@ -25,7 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
index 9d123fafdd2..76773bd6487 100644
--- a/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
+++ b/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=A Telnet connector implementation for the Terminal.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties b/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties
index d143444aad7..e33b8bccaae 100644
--- a/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties
+++ b/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal Telnet Connector Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
index a1dbdaa9054..5870cd88bb0 100644
--- a/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.telnet;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)"
 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
  J2SE-1.4
 Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true
diff --git a/org.eclipse.tm.terminal.telnet/about.properties b/org.eclipse.tm.terminal.telnet/about.properties
index 025524e7dfb..c42eab9cbd2 100644
--- a/org.eclipse.tm.terminal.telnet/about.properties
+++ b/org.eclipse.tm.terminal.telnet/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal Telnet Connector\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.test-feature/feature.properties b/org.eclipse.tm.terminal.test-feature/feature.properties
index a4a6c1b5e47..0caf0bd104c 100644
--- a/org.eclipse.tm.terminal.test-feature/feature.properties
+++ b/org.eclipse.tm.terminal.test-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=TM Terminal Unit Tests. Includes Source.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.test-feature/feature.xml b/org.eclipse.tm.terminal.test-feature/feature.xml
index 30fcf49efd5..ffdedad490f 100644
--- a/org.eclipse.tm.terminal.test-feature/feature.xml
+++ b/org.eclipse.tm.terminal.test-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.test"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="2.0.100.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -25,14 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
-      <!-- <import plugin="org.eclipse.tm.terminal.view" version="2.0.0" match="compatible"/> -->
-      <!-- org.junit either comes with the JDT feature (org.eclipse.jdt),  -->
-      <!-- or with the eclipse-test-framework download. So, don't put a    -->
-      <!-- feature dependency here since it is no hard dependency          -->
-      <!-- (although it would help Europa users to get their stuff, but    -->
-      <!-- it could invalidate the configuration for Platform users:       --> 
-      <!-- bug 151797)                                                     -->
+      <import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
       <import plugin="org.junit" version="3.8.1" match="compatible"/>
       <import plugin="org.apache.ant"/>
    </requires>
diff --git a/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
index 79e6d013cc7..56a4f2dc252 100644
--- a/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
- org.eclipse.tm.terminal,
+ org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)",
  org.eclipse.core.runtime,
  org.eclipse.ui
 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
diff --git a/org.eclipse.tm.terminal.test/about.properties b/org.eclipse.tm.terminal.test/about.properties
index 99ddff5ef83..360731b9e4a 100644
--- a/org.eclipse.tm.terminal.test/about.properties
+++ b/org.eclipse.tm.terminal.test/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -21,5 +21,5 @@ blurb=TM Terminal Unit Tests\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2007, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2007, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.view-feature/feature.properties b/org.eclipse.tm.terminal.view-feature/feature.properties
index 7129c503498..a1f9f460026 100644
--- a/org.eclipse.tm.terminal.view-feature/feature.properties
+++ b/org.eclipse.tm.terminal.view-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=An Eclipse Workbench standalone view for the Terminal widget.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.view-feature/feature.xml b/org.eclipse.tm.terminal.view-feature/feature.xml
index 826da3e0681..385775cef2c 100644
--- a/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -25,7 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="2.0.1" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties b/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
index 59292523e04..793980d3166 100644
--- a/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
+++ b/org.eclipse.tm.terminal.view-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=An Eclipse Workbench standalone view for the Terminal widget.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties b/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
index abbbbdf06f5..eafd8160510 100644
--- a/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
+++ b/org.eclipse.tm.terminal.view-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal View Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
index dba8aec1b9f..c48e9b7d12f 100644
--- a/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[2.0.1,3.0.0)"
+ org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.tm.terminal.view/about.properties b/org.eclipse.tm.terminal.view/about.properties
index 8475972e9ce..9e7f3eb66fa 100644
--- a/org.eclipse.tm.terminal.view/about.properties
+++ b/org.eclipse.tm.terminal.view/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal View\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
index e83da54cce5..df5860bddf3 100644
--- a/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.tm.terminal/about.properties b/org.eclipse.tm.terminal/about.properties
index e38f7d84136..43011de8e86 100644
--- a/org.eclipse.tm.terminal/about.properties
+++ b/org.eclipse.tm.terminal/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal Widget\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2008.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm