GERONIMODEVTOOLS-678 Can not install GEP in RAD SE v8.0

Hong Fang Han · Hong Fang Han · commit aa5360c2bae2 · 2010-11-12T03:03:03.000Z
git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/branches/2.1@1034255 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/src/main/assembly/site.xml b/assembly/src/main/assembly/site.xml
@@ -91,10 +91,12 @@
     <feature url="features/org.apache.geronimo.v21.feature_2.1.5.jar" id="org.apache.geronimo.v21.feature" version="2.1.5">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
-	<feature url="features/org.apache.geronimo.v21.feature_2.1.6.jar" id="org.apache.geronimo.v21.feature" version="2.1.6">
+		<feature url="features/org.apache.geronimo.v21.feature_2.1.6.jar" id="org.apache.geronimo.v21.feature" version="2.1.6">
+        <category name="org.eclipse.wst.server.core.serverAdapter"/>
+    </feature>
+    <feature url="features/org.apache.geronimo.v21.feature_2.1.7.jar" id="org.apache.geronimo.v21.feature" version="2.1.7">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
-    
     
     <!-- 
      | 
diff --git a/features/org.apache.geronimo.v21.feature/feature.xml b/features/org.apache.geronimo.v21.feature/feature.xml
@@ -20,7 +20,7 @@
 <feature
       id="org.apache.geronimo.v21.feature"
       label="Geronimo v2.1 Server Adapter"
-      version="2.1.6"
+      version="2.1.7"
       provider-name="%providerName"
       plugin="org.apache.geronimo.st.v21.core"
       image="bigG.gif">
@@ -46,8 +46,6 @@
 		match="greaterOrEqual"/>
 	<import feature="org.eclipse.jst.server_adapters.feature" version="2.0.2.v200802150100-787KE8iDUUEF6GwKwpHEQ"
 		match="greaterOrEqual"/>
-	<import feature="org.eclipse.jst.web_ui.feature" version="2.0.2.v200802150100-7B1DzCkuNa_RPevwkwB1iJ6z-0RH" 
-		match="greaterOrEqual"/>
   	<import feature="org.eclipse.jst.enterprise_ui.feature" version="2.0.2.v200802150100-7b7_Es8EU6AXOV9QLJSees1SQoYQ"
 		match="greaterOrEqual"/>
     </requires>
@@ -57,75 +55,75 @@
          id="org.apache.geronimo.st.core"
          download-size="132"
          install-size="132"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.st.ui"
          download-size="164"
          install-size="164"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.st.schemas"
          download-size="72"
          install-size="72"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.runtime.common"
          download-size="1160"
          install-size="1160"
-         version="2.1.6"/>
+         version="2.1.7"/>
         
     <plugin
          id="org.apache.geronimo.st.v21.core"
          download-size="48"
          install-size="48"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
     
     <plugin
          id="org.apache.geronimo.st.v21.ui"
          download-size="164"
          install-size="164"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
 
     <plugin
          id="org.apache.geronimo.runtime.v21"
          download-size="1252"
          install-size="1252"
-         version="2.1.6"/>
+         version="2.1.7"/>
 
     <plugin
          id="org.apache.geronimo.jee.v21.jaxbmodel"
          download-size="140"
          install-size="140"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.st.v20.core"
          download-size="20"
          install-size="20"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.st.v20.ui"
          download-size="16"
          install-size="16"
-         version="2.1.6"
+         version="2.1.7"
          unpack="false"/>
          
     <plugin
          id="org.apache.geronimo.runtime.v20"
          download-size="1052"
          install-size="1052"
-         version="2.1.6"/>
+         version="2.1.7"/>
     
     
 </feature>
