Fixed Dependencies in Feature and update site

pyUML_feature/feature.xml

@@ -104,7 +104,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
    </license>
 
    <requires>
-      <import feature="org.python.pydev.feature" version="1.4.6" match="greaterOrEqual"/>
+      <import feature="org.python.pydev.feature"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.jface"/>
@@ -119,8 +119,8 @@ This Agreement is governed by the laws of the State of New York and the intellec
       <import plugin="org.eclipse.gmf.runtime.diagram.ui"/>
       <import plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor"/>
       <import plugin="org.python.pydev" version="1.4.6" match="greaterOrEqual"/>
-      <import plugin="org.python.pydev.core" version="1.4.6" match="greaterOrEqual"/>
-      <import plugin="org.python.pydev.parser" version="1.4.6" match="greaterOrEqual"/>
+      <import plugin="org.python.pydev.core"/>
+      <import plugin="org.python.pydev.parser"/>
       <import plugin="org.eclipse.uml2.diagram.clazz"/>
    </requires>
 

pyUml_updatesite/artifacts.xml

@@ -3,14 +3,20 @@
 <repository name='file:/home/didi/workspace/pyUml_updatesite/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
-    <property name='p2.timestamp' value='1244719259775'/>
+    <property name='p2.timestamp' value='1244719702943'/>
   </properties>
   <mappings size='3'>
     <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
     <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
-  <artifacts size='9'>
+  <artifacts size='10'>
+    <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.1'>
+      <properties size='2'>
+        <property name='artifact.size' value='4963'/>
+        <property name='download.size' value='4963'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='pyUml' version='1.2.0'>
       <properties size='3'>
         <property name='artifact.size' value='554276'/>
@@ -18,18 +24,18 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.1'>
-      <properties size='2'>
-        <property name='artifact.size' value='4963'/>
-        <property name='download.size' value='4963'/>
-      </properties>
-    </artifact>
     <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.1'>
       <properties size='2'>
         <property name='artifact.size' value='900'/>
         <property name='download.size' value='900'/>
       </properties>
     </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.2'>
+      <properties size='2'>
+        <property name='artifact.size' value='4974'/>
+        <property name='download.size' value='4974'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='pyUml' version='1.2.0'>
       <properties size='3'>
         <property name='artifact.size' value='551466'/>

pyUml_updatesite/content.xml

@@ -3,7 +3,7 @@
 <repository name='file:/home/didi/workspace/pyUml_updatesite/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
-    <property name='p2.timestamp' value='1244719259792'/>
+    <property name='p2.timestamp' value='1244719702945'/>
   </properties>
   <units size='15'>
     <unit id='Eclipse PyUML' version='0.0.0'>
@@ -546,7 +546,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: Freie University Berlin, Germany, Martin Dittmar&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: pyUML.plugin.Activator&#xA;Bundle-ClassPath: lib/refactoring.jar,.,src/,bin/&#xA;Require-Bundle: org.eclipse.core.resources,org.eclipse.core.runtime,org.eclipse.jface,org.eclipse.ui,org.eclipse.ui.ide,org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.uml2.uml,org.eclipse.gmf.runtime.common.core,org.eclipse.gmf.runtime.diagram.core,org.eclipse.gmf.runtime.common.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor,org.python.pydev,org.python.pydev.core,org.python.pydev.parser,org.eclipse.uml2.diagram.clazz&#xA;Bundle-Name: PyUML&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: pyUml;singleton:=true&#xA;Bundle-Version: 1.2.2&#xA;Eclipse-LazyStart: true&#xA;Export-Package: pyUML.actions,pyUML.backend,pyUML.exceptions,pyUML.listeners,pyUML.plugin,pyUML.pythonTree,pyUML.refactoring,pyUML.views&#xA;
+            Bundle-Vendor: Freie University Berlin, Germany, Martin Dittmar&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: pyUML.plugin.Activator&#xA;Bundle-ClassPath: lib/refactoring.jar,.,src/,bin/&#xA;Require-Bundle: org.eclipse.core.resources,org.eclipse.core.runtime,org.eclipse.jface,org.eclipse.ui,org.eclipse.ui.ide,org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.uml2.uml,org.eclipse.gmf.runtime.common.core,org.eclipse.gmf.runtime.diagram.core,org.eclipse.gmf.runtime.common.ui,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor,org.python.pydev,org.python.pydev.core,org.python.pydev.parser,org.eclipse.uml2.diagram.clazz&#xA;Bundle-Name: PyUML&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: pyUml;singleton:=true&#xA;Bundle-Version: 1.2.2&#xA;Eclipse-LazyStart: true&#xA;Export-Package: pyUML.actions,pyUML.backend,pyUML.exceptions,pyUML.listeners,pyUML.plugin,pyUML.pythonTree,pyUML.refactoring,pyUML.views
           </instruction>
         </instructions>
       </touchpointData>
@@ -600,7 +600,7 @@
         <provided namespace='org.eclipse.equinox.p2.iu' name='pyUML.feature.group' version='1.2.2'/>
       </provides>
       <requires size='20'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.python.pydev.feature.feature.group' range='1.4.6'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.python.pydev.feature.feature.group' range='[1.4.6,2.0.0)'/>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='0.0.0'/>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface' range='0.0.0'/>