diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml index 77d8746340d61a8afa4d3e975171cebf5e92704a..473046b6e4928af67c23c196173115ed932f3c12 100644 --- a/assembly/features/org.eclipse.jst.sdk/feature.xml +++ b/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" diff --git a/assembly/features/org.eclipse.wst.sdk/feature.xml b/assembly/features/org.eclipse.wst.sdk/feature.xml index e77bcf10566b38d237ae78d8fee09ea5c5088c49..fc0327850fd802567e464eed673829a4a64b9c04 100644 --- a/assembly/features/org.eclipse.wst.sdk/feature.xml +++ b/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" diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml index 73f327fd25d758e0a94a7d46b036fc70785faed9..99d529ae2a7cd9dcc12155414e4c6c9811fa1fae 100644 --- a/releng.wtpbuilder/components/wst/customTargets.xml +++ b/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"