Revert "[nobug] Increment XML and Web features for 3.19"
This reverts commit bb7487a179df43fa08c1d69999fb41eaee74b256.
diff --git a/web/features/org.eclipse.wst.web_core.feature/feature.xml b/web/features/org.eclipse.wst.web_core.feature/feature.xml
index 7055ac6..d7ce9e1 100644
--- a/web/features/org.eclipse.wst.web_core.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_core.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.web_core.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_core.feature/pom.xml b/web/features/org.eclipse.wst.web_core.feature/pom.xml
index 3d53134..9361303 100644
--- a/web/features/org.eclipse.wst.web_core.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_core.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.web_core.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
index 5b6eebd..8e9ceba 100644
--- a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.web_sdk.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
@@ -31,11 +31,6 @@
%license
</license>
- <includes
- id="org.eclipse.wst.web_js_support_sdk.feature"
- version="0.0.0"
- optional="true"/>
-
<requires>
<import feature="org.eclipse.wst.server_sdk.feature"/>
<import feature="org.eclipse.wst.common_sdk.feature"/>
@@ -44,4 +39,9 @@
<import feature="org.eclipse.wst.json_sdk.feature"/>
</requires>
+ <includes
+ id="org.eclipse.wst.web_js_support_sdk.feature"
+ version="0.0.0"
+ optional="true"/>
+
</feature>
diff --git a/web/features/org.eclipse.wst.web_sdk.feature/pom.xml b/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
index 1c310ff..15e6bd5 100644
--- a/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.web_sdk.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/web/features/org.eclipse.wst.web_tests.feature/feature.xml b/web/features/org.eclipse.wst.web_tests.feature/feature.xml
index e194fa1..2345e0c 100644
--- a/web/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_tests.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.web_tests.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/web/features/org.eclipse.wst.web_tests.feature/pom.xml b/web/features/org.eclipse.wst.web_tests.feature/pom.xml
index 80a707a..ed3f0c4 100644
--- a/web/features/org.eclipse.wst.web_tests.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_tests.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.web_tests.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/web/features/org.eclipse.wst.web_ui.feature/feature.xml b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
index 425d9bc..d0e8f62 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/web/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.web_ui.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.wst.web.ui"
license-feature="org.eclipse.license"
@@ -48,16 +48,16 @@
id="org.eclipse.wst.json_ui.feature"
version="0.0.0"/>
- <includes
- id="org.eclipse.wst.web_js_support.feature"
- version="0.0.0"
- optional="true"/>
-
<requires>
<import feature="org.eclipse.wst.common_ui.feature"/>
<import feature="org.eclipse.wst.server_ui.feature"/>
</requires>
+ <includes
+ id="org.eclipse.wst.web_js_support.feature"
+ version="0.0.0"
+ optional="true"/>
+
<plugin
id="org.eclipse.wst.html.ui.infopop"
download-size="0"
diff --git a/web/features/org.eclipse.wst.web_ui.feature/pom.xml b/web/features/org.eclipse.wst.web_ui.feature/pom.xml
index acd10a8..90a0b5c 100644
--- a/web/features/org.eclipse.wst.web_ui.feature/pom.xml
+++ b/web/features/org.eclipse.wst.web_ui.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.web_ui.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
index cbf4b28..145d8da 100644
--- a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.xml_core.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_core.feature/pom.xml b/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
index 0097b16..5f3b366 100644
--- a/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_core.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xml_core.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index f02ec7b..00e249c 100644
--- a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.xml_sdk.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml b/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
index 0734573..164b954 100644
--- a/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xml_sdk.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml
index ece8354..124cb86 100644
--- a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.xml_tests.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml b/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml
index 1bddef4..010879b 100644
--- a/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_tests.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xml_tests.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
index 24fc1d1..3a55376 100644
--- a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.xml_ui.feature"
label="%featureName"
- version="3.19.0.qualifier"
+ version="3.18.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.wst.xml.ui"
license-feature="org.eclipse.license"
@@ -33,9 +33,9 @@
</license>
<requires>
- <import feature="org.eclipse.wst.common_ui.feature" version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.xml_userdoc.feature" version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.xml_core.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.common_ui.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.xml_userdoc.feature" version="0.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.xml_core.feature" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml b/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
index 6e2712d..4918a2d 100644
--- a/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xml_ui.feature</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.18.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
