305306 Incorrect deployment of variable based dependencies in EAR
diff --git a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html b/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html index 1271855..ba14dc2 100644 --- a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html +++ b/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.web_core.feature.patch.html
@@ -4,16 +4,14 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="Build" content="Build"> -<title>WTP 3.0.5 Patches</title> +<title>Web Tools Platform Patch Build Notes</title> </head> <body> -<h1>WTP 3.0.5 Patches</h1> +<h1>WTP 3.1.2 Patches</h1> -<h2>org.eclipse.wst.web_core.feature</h2> -<h3>org.eclipse.wst.html.core</h3> -<p>Bug <a href="https://bugs.eclipse.org/282205">282205</a>. HTMLHeadTokenizer can get stuck in an infinite loop</p> -<p>Bug <a href='https://bugs.eclipse.org/291225'>291225</a>. Output folder support in JavaEE projects</p> +<p>Bug <a href='https://bugs.eclipse.org/305306'>305306</a>. Incorrect deployment of variable based dependencies in EAR</p> + </body> </html>
diff --git a/features/org.eclipse.wst.web_core.feature.patch/feature.properties b/features/org.eclipse.wst.web_core.feature.patch/feature.properties index 2553702..62b2882 100644 --- a/features/org.eclipse.wst.web_core.feature.patch/feature.properties +++ b/features/org.eclipse.wst.web_core.feature.patch/feature.properties
@@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2008 IBM Corporation and others. +# Copyright (c) 2010 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -18,7 +18,7 @@ featureName=WTP Patches for org.eclipse.wst.web_core.feature # "providerName" property - name of the company that provides the feature -providerName=Eclipse.org +providerName=Eclipse Web Tools Platform # "updateSiteName" property - label for the update site updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site @@ -27,12 +27,11 @@ description=\ The bugs and fixes are described in the following bugzilla entries:\n\ \n\ -Bug https://bugs.eclipse.org/282205 HTMLHeadTokenizer can get stuck in an infinite loop\n\ -Bug https://bugs.eclipse.org/291225 Output folder support in JavaEE projects\n\ +Bug https://bugs.eclipse.org/305306 Incorrect deployment of variable based dependencies in EAR\n\ \n\ # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2008 IBM Corporation and others.\n\ +Copyright (c) 2010 IBM Corporation and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ @@ -50,7 +49,7 @@ # should be plain text version of license agreement pointed to be "licenseURL" license=\ ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -September 27, 2007\n\ +2010\n\ \n\ Usage Of Content\n\ \n\
diff --git a/features/org.eclipse.wst.web_core.feature.patch/feature.xml b/features/org.eclipse.wst.web_core.feature.patch/feature.xml index 776bec5..3fe9d80 100644 --- a/features/org.eclipse.wst.web_core.feature.patch/feature.xml +++ b/features/org.eclipse.wst.web_core.feature.patch/feature.xml
@@ -5,16 +5,20 @@ version="3.0.5.qualifier" provider-name="%providerName"> - <description>%description</description> + <description> + %description + </description> - <copyright>%copyright</copyright> + <copyright> + %copyright + </copyright> - <license url="%licenseURL">%license</license> - - + <license url="%licenseURL"> + %license + </license> <requires> - <import feature="org.eclipse.wst.web_core.feature" version="3.0.5.v200904070030-7G2EBCAM217nJZPEYxjAcnk40uRS" patch="true"/> + <import feature="org.eclipse.wst.web_core.feature" version="3.1.1.v200908120400-7H77FDCAT7oGlivgHN1M2RkCBHz0" patch="true"/> </requires> <plugin