Releng: Fix version numbers of changed plugins and features. Fix update

site URL.

8 files changed, 42 insertions, 33 deletions

diff --git a/features/org.eclipse.tcf.cdt.feature/feature.xml b/features/org.eclipse.tcf.cdt.feature/feature.xml
index a13a9c530..73a481785 100644
--- a/features/org.eclipse.tcf.cdt.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.cdt.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,7 +28,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
    <includes
@@ -45,7 +45,6 @@
       <import plugin="org.eclipse.debug.ui" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface.text" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.feature" version="1.1.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
index fc1ca6825..0d384c0da 100644
--- a/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.cdt.sdk.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2011, 2012 Wind River Systems, Inc. and others.
+    Copyright (c) 2011, 2013 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
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.cdt.sdk.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,11 +28,11 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
    <requires>
-      <import feature="org.eclipse.tcf.cdt.feature" version="1.1.0.qualifier"/>
+      <import feature="org.eclipse.tcf.cdt.feature" version="1.1.1.qualifier"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.core.feature/feature.xml b/features/org.eclipse.tcf.core.feature/feature.xml
index 365324121..b32740d78 100644
--- a/features/org.eclipse.tcf.core.feature/feature.xml
+++ b/features/org.eclipse.tcf.core.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.core.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,7 +28,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
    <requires>
diff --git a/features/org.eclipse.tcf.core.sdk.feature/feature.xml b/features/org.eclipse.tcf.core.sdk.feature/feature.xml
index 12a9b1616..b4a6f8250 100644
--- a/features/org.eclipse.tcf.core.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.core.sdk.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2010, 2012 Wind River Systems, Inc. and others.
+    Copyright (c) 2010, 2013 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
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.core.sdk.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%featureProvider">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,12 +28,12 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <requires>
-      <import feature="org.eclipse.tcf.core.feature" version="1.1.0.qualifier"/>
-   </requires>
+   <includes
+         id="org.eclipse.tcf.core.feature"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tcf.source"
diff --git a/features/org.eclipse.tcf.feature/feature.xml b/features/org.eclipse.tcf.feature/feature.xml
index dd7ed70a8..834e320fe 100644
--- a/features/org.eclipse.tcf.feature/feature.xml
+++ b/features/org.eclipse.tcf.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,9 +28,13 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
+   <includes
+         id="org.eclipse.tcf.core.feature"
+         version="0.0.0"/>
+
    <requires>
       <import plugin="org.eclipse.core.filesystem" version="1.3.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
@@ -49,7 +53,6 @@
       <import plugin="org.eclipse.ui.ide" version="3.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views" version="3.6.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.workbench.texteditor" version="3.8.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.tcf.core.feature" version="1.1.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tcf.rse.feature/feature.xml b/features/org.eclipse.tcf.rse.feature/feature.xml
index cac9339ed..1b526746e 100644
--- a/features/org.eclipse.tcf.rse.feature/feature.xml
+++ b/features/org.eclipse.tcf.rse.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.rse.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,7 +28,7 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
    <includes
diff --git a/features/org.eclipse.tcf.rse.sdk.feature/feature.xml b/features/org.eclipse.tcf.rse.sdk.feature/feature.xml
index 1876df250..d69f8fbfb 100644
--- a/features/org.eclipse.tcf.rse.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.rse.sdk.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2011, 2012 Wind River Systems, Inc. and others.
+    Copyright (c) 2011, 2013 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
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.rse.sdk.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,12 +28,16 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <requires>
-      <import feature="org.eclipse.tcf.rse.feature" version="1.1.0.qualifier"/>
-   </requires>
+   <includes
+         id="org.eclipse.tcf.sdk.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.tcf.rse.feature"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tcf.rse.source"
diff --git a/features/org.eclipse.tcf.sdk.feature/feature.xml b/features/org.eclipse.tcf.sdk.feature/feature.xml
index f33aadded..7a23618a7 100644
--- a/features/org.eclipse.tcf.sdk.feature/feature.xml
+++ b/features/org.eclipse.tcf.sdk.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2010, 2012 Wind River Systems, Inc. and others.
+    Copyright (c) 2010, 2013 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
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.tcf.sdk.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%featureProvider">
 
    <description url="http://wiki.eclipse.org/TCF">
@@ -28,13 +28,16 @@
    </license>
 
    <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/releases/juno"/>
+      <update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
    </url>
 
-   <requires>
-      <import feature="org.eclipse.tcf.feature" version="1.1.0.qualifier"/>
-      <import feature="org.eclipse.tcf.core.sdk.feature" version="1.1.0.qualifier"/>
-   </requires>
+   <includes
+         id="org.eclipse.tcf.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.tcf.core.sdk.feature"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tcf.debug.source"