unification of bug fixes 1198893, 1404228

[phpeclipse.git] / net.sourceforge.phpeclipse.feature / feature.xml

diff --git a/net.sourceforge.phpeclipse.feature/feature.xml b/net.sourceforge.phpeclipse.feature/feature.xml
index fad2c03..818f47a 100644 (file)
--- a/net.sourceforge.phpeclipse.feature/feature.xml
+++ b/net.sourceforge.phpeclipse.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="net.sourceforge.phpeclipse"
       label="net.sourceforge.phpeclipse"
-      version="1.1.5"
+      version="1.1.7"
       provider-name="www.phpeclipse.de"
-      image="phpeclipse.jpeg">
-
+      image="phpeclipse.jpeg"
+      primary="true">
    <install-handler/>
 
    <description url="http://www.phpeclipse.de">
@@ -177,7 +177,8 @@ b) in the case of each subsequent Contributor:&lt;/FONT&gt;&lt;/UL&gt;
    </license>
 
    <url>
-      <update label="PHP Eclipse update site" url="http://pipestonegroup.com/eclipse/updates"/>
+      <update label="PHPeclipse update site" url="http://pipestone.com/eclipse/updates"/>
+      <discovery label="PHP Eclipse update site" url="http://pipestonegroup.com/eclipse/updates"/>
    </url>
 
    <requires>
@@ -210,126 +211,72 @@ b) in the case of each subsequent Contributor:&lt;/FONT&gt;&lt;/UL&gt;
          id="net.sourceforge.phpdt.smarty.ui"
          download-size="0"
          install-size="0"
-         version="1.1.2"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse"
          download-size="0"
          install-size="0"
-         version="1.1.5"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.core"
          download-size="0"
          install-size="0"
-         version="1.1.2"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.css.core"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.css.ui"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.debug.core"
          download-size="0"
          install-size="0"
-         version="1.1.5"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.debug.ui"
          download-size="0"
          install-size="0"
-         version="1.1.5"/>
+         version="1.1.7"/>
 
    <plugin
-         id="net.sourceforge.phpeclipse.html.ui"
+         id="net.sourceforge.phpeclipse.externaltools"
          download-size="0"
          install-size="0"
-         version="1.1.3"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.js.core"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.js.ui"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.launching"
          download-size="0"
          install-size="0"
-         version="1.1.5"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.phphelp"
          download-size="0"
          install-size="0"
-         version="1.1.3"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.phpunit"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.ui"
          download-size="0"
          install-size="0"
-         version="1.1.3"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.webbrowser"
          download-size="0"
          install-size="0"
-         version="1.1.2"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.xml.core"
          download-size="0"
          install-size="0"
-         version="1.1.2"/>
+         version="1.1.7"/>
 
    <plugin
          id="net.sourceforge.phpeclipse.xml.ui"
          download-size="0"
          install-size="0"
-         version="1.1.2"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.news"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.monitor.core"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.monitor.ui"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
-
-   <plugin
-         id="net.sf.eclipsetidy"
-         download-size="0"
-         install-size="0"
-         version="1.2.1"/>
+         version="1.1.7"/>
 
 </feature>