prep for update sites

assembly/features/org.eclipse.jst.sdk/feature.xml

@@ -47,6 +47,13 @@
         id="org.eclipse.jst.doc.isv.feature"
         version="0.0.0" />
 
+	<!-- technically, this last org.eclipse.jst feature include is not needed for the build or packaging, 
+		but, it helps update manager behave more as expected (that is, it can filter out org.eclipse.wst 
+		if user selects to -->
+   <includes
+         id="org.eclipse.jst"
+         version="0.0.0"/>
+
     <plugin
         id="org.eclipse.jst"
         download-size="0"

assembly/features/org.eclipse.wst.sdk/feature.xml

@@ -48,6 +48,14 @@
          id="org.eclipse.wst.doc.isv.feature"
          version="0.0.0"/>
 
+	<!-- technically, this last org.eclipse.wst feature include is not needed for the build or packaging, 
+		but, it helps update manager behave more as expected (that is, it can filter out org.eclipse.wst 
+		if user selects to -->
+   <includes
+         id="org.eclipse.wst"
+         version="0.0.0"/>
+
+
    <plugin
          id="org.eclipse.wst"
          download-size="0"

releng.wtpbuilder/components/wst/customTargets.xml

@@ -61,18 +61,6 @@
                 name="archiveName"
                 value="${archiveName}" />
         </ant>
-
-        <!-- add zip entries of third party jars -->
-        <!-- kind of crude for now, points back to our cached copy, for now -->
-        <echo message="${buildDirectory}/../" />
-        <property file="${buildDirectory}/../installmanifest.properties" />
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/${archiveName}"
-            update="true"
-            duplicate="preserve">
-            <zipfileset
-                src="${thirdparty.dir}/${thirdparty.file}" />
-        </zip>
         
         <ant
             antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"