[373665] Adopter-only patch for allowing Static web project facets to coexist with Java facet
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html
index e98ba68..e0e8147 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/buildnotes_org.eclipse.jst.common.fproj.enablement.jdt.feature.patch.html
@@ -4,16 +4,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP 3.2.5 Patches</title>
+<title>WTP 3.3.2 Patches</title>
</head>
<body>
- <h1>WTP 3.2.5 Patches</h1>
+ <h1>WTP 3.3.2 Patches</h1>
<h2>org.eclipse.jst.common.fproj.enablement.jdt</h2>
- <p>Bug <a href='https://bugs.eclipse.org/373666'>373666</a>. Adopter-only patch for allowing Static web project facets to coexist with Java facet</p>
+ <p>Bug <a href='https://bugs.eclipse.org/373665'>373665</a>. Adopter-only patch for allowing Static web project facets to coexist with Java facet</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.properties b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.properties
index 1f3fb70..8fabf63 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.properties
@@ -27,7 +27,7 @@
description=\
Contains fixes described in the following bugzilla(s):\n\
\n\
-Bug https://bugs.eclipse.org/373666 Adopter-only patch for allowing Static web project facets to coexist with Java facet\n\
+Bug https://bugs.eclipse.org/373665 Adopter-only patch for allowing Static web project facets to coexist with Java facet\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
@@ -49,7 +49,7 @@
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -118,6 +118,7 @@
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.xml b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.xml
index 07fcdd8..df474aa 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.xml
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.common.fproj.enablement.jdt.feature.patch"
label="%featureName"
- version="3.2.5.qualifier"
+ version="3.3.2.qualifier"
provider-name="%providerName">
<description>
@@ -18,7 +18,7 @@
</license>
<requires>
- <import feature="org.eclipse.jst.common.fproj.enablement.jdt" version="3.2.2.v201008170019-377AB8s73533J5J759F " patch="true"/>
+ <import feature="org.eclipse.jst.common.fproj.enablement.jdt" version="3.3.0.v201102200555-377DF8s73543E5I5768" patch="true"/>
</requires>
<plugin
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/license.html b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/license.html
index c184ca3..f19c483 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/license.html
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/license.html
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
<h3>Usage Of Content</h3>
@@ -58,6 +58,7 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
index 8a9bf23..09931a0 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Vendor: %providerName
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.201.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Export-Package: org.eclipse.jst.common.project.facet.core,
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml b/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
index 2034497..d0aafaf 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.core/plugin.xml
@@ -67,35 +67,15 @@
<default-version provider="org.eclipse.jst.common.project.facet.core.internal.JavaFacetDefaultVersionProvider"/>
</project-facet>
- <project-facet-version facet="java" version="1.3">
- <constraint>
- <conflicts facet="wst.web"/>
- </constraint>
- </project-facet-version>
+ <project-facet-version facet="java" version="1.3"/>
- <project-facet-version facet="java" version="1.4">
- <constraint>
- <conflicts facet="wst.web"/>
- </constraint>
- </project-facet-version>
+ <project-facet-version facet="java" version="1.4"/>
- <project-facet-version facet="java" version="1.5">
- <constraint>
- <conflicts facet="wst.web"/>
- </constraint>
- </project-facet-version>
+ <project-facet-version facet="java" version="1.5"/>
- <project-facet-version facet="java" version="1.6">
- <constraint>
- <conflicts facet="wst.web"/>
- </constraint>
- </project-facet-version>
+ <project-facet-version facet="java" version="1.6"/>
- <project-facet-version facet="java" version="1.7">
- <constraint>
- <conflicts facet="wst.web"/>
- </constraint>
- </project-facet-version>
+ <project-facet-version facet="java" version="1.7"/>
<action facet="java" type="install" id="java.install">
<delegate class="org.eclipse.jst.common.project.facet.core.internal.JavaFacetInstallDelegate"/>
