From 229dbb8d54790c4636c645fdadb8116f1800ad7c Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 19 Sep 2012 13:35:54 +0000
Subject: [PATCH] [releng] Update Versions for Juno SR1

---
 .../org.eclipse.rse.updatesite/bin/mkTestUpdates.sh  | 12 ++++++------
 releng/org.eclipse.tm.repo/category.xml              | 10 +++++-----
 releng/org.eclipse.tm.repo/pom.xml                   |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 81dd511bfaf..5d7d4aac198 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -97,14 +97,14 @@ if [ ${TYPE} = test ]; then
       fi
     fi
     # CHECK VERSION CORRECTNESS for MICRO UPDATES only
-    # Major version updates are not allowed.
+    # Major version updates are not allowed, but minor update is OK.
     #MINOR_UPDATE_OK=1
     # Minor/major version updates are not allowed.
-    MINOR_UPDATE_OK=1
+    MINOR_UPDATE_OK=0
     # Update of "qualifier" requires also updating "micro"
-    echo "VERIFYING VERSION CORRECTNESS: Features against ../updates/3.3"
+    echo "VERIFYING VERSION CORRECTNESS: Features against ../updates/3.4"
     ls features/*.jar | sed -e 's,^.*features/,,' | sort > f1.$$.txt
-    ls ../updates/3.3/features/*.jar | sed -e 's,^.*features/,,' | sort > f2.$$.txt
+    ls ../updates/3.4/features/*.jar | sed -e 's,^.*features/,,' | sort > f2.$$.txt
     diff f2.$$.txt f1.$$.txt | grep '^[>]' \
        | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > f_new.txt
     for f in `cat f_new.txt`; do
@@ -128,9 +128,9 @@ if [ ${TYPE} = test ]; then
         fi
       fi
     done
-    echo "VERIFYING VERSION CORRECTNESS: Plugins against ../updates/3.3"
+    echo "VERIFYING VERSION CORRECTNESS: Plugins against ../updates/3.4"
     ls plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p1.$$.txt
-    ls ../updates/3.3/plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p2.$$.txt
+    ls ../updates/3.4/plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p2.$$.txt
     diff p2.$$.txt p1.$$.txt | grep '^[>]' \
        | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > p_new.txt
     for p in `cat p_new.txt`; do
diff --git a/releng/org.eclipse.tm.repo/category.xml b/releng/org.eclipse.tm.repo/category.xml
index 61a10a1b941..2fccddb8987 100644
--- a/releng/org.eclipse.tm.repo/category.xml
+++ b/releng/org.eclipse.tm.repo/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.rse_3.4.0.qualifier.jar" id="org.eclipse.rse" version="3.4.0.qualifier">
+   <feature url="features/org.eclipse.rse_3.4.1.qualifier.jar" id="org.eclipse.rse" version="3.4.1.qualifier">
       <category name="tm_34_main"/>
    </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.4.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.4.0.qualifier">
+   <feature url="features/org.eclipse.rse.sdk_3.4.1.qualifier.jar" id="org.eclipse.rse.sdk" version="3.4.1.qualifier">
       <category name="tm_34_main"/>
    </feature>
    <feature url="features/org.eclipse.rse.useractions_1.1.400.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.400.qualifier">
@@ -25,15 +25,15 @@
    <feature url="features/org.eclipse.tm.terminal.local.sdk_0.3.0.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.3.0.qualifier">
       <category name="tm_34_optional"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.3.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.3.0.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.sdk_3.3.1.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.3.1.qualifier">
       <category name="tm_34_main"/>
    </feature>
-   <category-def name="tm_34_main" label="TM and RSE 3.4 Main Features">
+   <category-def name="tm_34_main" label="TM and RSE 3.4.1 Main Features">
       <description>
          TM and RSE Main Features
       </description>
    </category-def>
-   <category-def name="tm_34_optional" label="TM and RSE 3.4 Optional Add-Ons">
+   <category-def name="tm_34_optional" label="TM and RSE 3.4.1 Optional Add-Ons">
       <description>
          Examples, Tests and Incubation Plug-ins.
       </description>
diff --git a/releng/org.eclipse.tm.repo/pom.xml b/releng/org.eclipse.tm.repo/pom.xml
index 2da1c430d98..918dde92a08 100644
--- a/releng/org.eclipse.tm.repo/pom.xml
+++ b/releng/org.eclipse.tm.repo/pom.xml
@@ -8,7 +8,7 @@
     <relativePath>../../../</relativePath>
   </parent>
   <groupId>org.eclipse.tm</groupId>
-  <version>3.4.0-SNAPSHOT</version>
+  <version>3.4.1-SNAPSHOT</version>
   <artifactId>org.eclipse.tm.repo</artifactId>
   <packaging>eclipse-repository</packaging>
   <properties>
@@ -85,7 +85,7 @@
               <target>
                 <property name="buildDirectory" value="${project.build.directory}/../../../../"/>
                 <property name="builder" value="${project.build.directory}/../../../../org.eclipse.tm.rse/releng/org.eclipse.rse.build/"/>
-                <property name="buildId" value="3.4.0"/>
+                <property name="buildId" value="3.4.1"/>
                 <ant antfile="${project.build.directory}/../../../../dstoreTargets.xml">
                   <target name="serverruntime"/>
                 </ant>