[345778] Duplicate tld entries in taglib index

diff --git a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
index 6576138..d6fccb0 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
+++ b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html

@@ -9,22 +9,11 @@
 
 <body>
 
-<h1>WTP 3.2.2 Patches</h1>
+<h1>WTP 3.2.4 Patches</h1>
 
 <h2>org.eclipse.jst.web_core.feature</h2>
 
-<p>Bug <a href='https://bugs.eclipse.org/325529'>325529</a>. TaglibIndex cache turning over references too frequently</p>
-<p>Bug <a href='https://bugs.eclipse.org/325800'>325800</a>. EAR Import failing with improper interpreted spec versions</p>
-<p>Bug <a href='https://bugs.eclipse.org/325818'>325818</a>. Attribute value parsed incorrectly in a jsp</p>
-<p>Bug <a href='https://bugs.eclipse.org/325879'>325879</a>. NPE in org.eclipse.jst.jsp.core.internal.java.XMLJSPRegionHelper.decodeRemainingRegions(XMLJSPRegionHelper.java:278)</p>
-<p>Bug <a href='https://bugs.eclipse.org/325894'>325894</a>. Protect EARUtilities.getJ2EEModuleReferences from NPE</p>
-<p>Bug <a href='https://bugs.eclipse.org/326102'>326102</a>. Better classpath tagging defaults</p>
-<p>Bug <a href='https://bugs.eclipse.org/326413'>326413</a>. Imported Utility JARs should have their deploy path set to the library directory</p>
-<p>Bug <a href='https://bugs.eclipse.org/326467'>326467</a>. NPE when removing an EAR reference with no archiveName attribute defined</p>
-<p>Bug <a href='https://bugs.eclipse.org/326576'>326576</a>. When importing an EAR archive, the Component file's Archive names and Deployment Paths are incorrect</p>
-<p>Bug <a href='https://bugs.eclipse.org/326713'>326713</a>. ConnectorResourceImpl not setting versionID</p>
-<p>Bug <a href='https://bugs.eclipse.org/326934'>326934</a>. Changing warning message string</p>
-<p>Bug <a href='https://bugs.eclipse.org/327276'>327276</a>. EAR Libraries Classpath Container not properly picking up remapped lib folder entries</p>
+<p>Bug <a href='https://bugs.eclipse.org/345778'>345778</a>. Duplicate tld entries in taglib index</p>
 
 </body>
 </html>
\ No newline at end of file

diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.properties b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
index 9f62e4c..4d6770e 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.web_core.feature.patch/feature.properties

@@ -27,18 +27,7 @@
 description=\
 The bugs and fixes are described in the following bugzilla entries:\n\
 \n\
-Bug https://bugs.eclipse.org/325529 TaglibIndex cache turning over references too frequently\n\
-Bug https://bugs.eclipse.org/325800 EAR Import failing with improper interpreted spec versions\n\
-Bug https://bugs.eclipse.org/325818 Attribute value parsed incorrectly in a jsp\n\
-Bug https://bugs.eclipse.org/325879 NPE in org.eclipse.jst.jsp.core.internal.java.XMLJSPRegionHelper.decodeRemainingRegions(XMLJSPRegionHelper.java:278)\n\
-Bug https://bugs.eclipse.org/325894 Protect EARUtilities.getJ2EEModuleReferences from NPE\n\
-Bug https://bugs.eclipse.org/326102 Better classpath tagging defaults\n\
-Bug https://bugs.eclipse.org/326413 Imported Utility JARs should have their deploy path set to the library directory\n\
-Bug https://bugs.eclipse.org/326467 NPE when removing an EAR reference with no archiveName attribute defined\n\
-Bug https://bugs.eclipse.org/326576 When importing an EAR archive, the Component file's Archive names and Deployment Paths are incorrect\n\
-Bug https://bugs.eclipse.org/326713 ConnectorResourceImpl not setting versionID\n\
-Bug https://bugs.eclipse.org/326934 Changing warning message string\n\
-Bug https://bugs.eclipse.org/327276 EAR Libraries Classpath Container not properly picking up remapped lib folder entries\n\
+Bug https://bugs.eclipse.org/345778 Duplicate tld entries in taglib index\n\
 \n\
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\

diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.xml b/features/org.eclipse.jst.web_core.feature.patch/feature.xml
index 7d97041..84df038 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.xml
+++ b/features/org.eclipse.jst.web_core.feature.patch/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.web_core.feature.patch"
       label="%featureName"
-      version="3.2.2.qualifier"
+      version="3.2.4.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.jst.web_core.feature" version="3.2.2.v201008170029-7Q7BG75FE9Le9BCy-tZxTqohz000" patch="true"/>
+      <import feature="org.eclipse.jst.web_core.feature" version="3.2.4.v201103231838-7Q7BG7OFE9LeABBX5jb4Ltojqz-7oEpj5963" patch="true"/>
    </requires>
 
    <plugin
@@ -28,25 +28,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jst.j2ee.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.j2ee"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>