Increment features for 3.15, use default license version, include jsp.core.tests

Signed-off-by: Nitin Dahyabhai <nitind@us.ibm.com>
Change-Id: I41151644f0f8c01186024d9b7b0fd1e9d3adc1ea

18 files changed, 30 insertions, 31 deletions

diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
index ebf85909f..59938e72e 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.jst.enterprise_core.feature"
       label="%featureName"
-      version="3.10.100.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
index 767b795a1..80b235ff1 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_core.feature</artifactId>
-  <version>3.10.100-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
index 4406f9255..ef66a567e 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.jst.enterprise_sdk.feature"
       label="%featureName"
-      version="3.8.200.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
index db79aa75e..f160267ea 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_sdk.feature</artifactId>
-  <version>3.8.200-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
index e9cba5a25..cb896694c 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.jst.enterprise_tests.feature"
       label="%featureName"
-      version="3.10.100.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
@@ -25,8 +25,7 @@
       <import plugin="org.eclipse.jst.ws.tests"/>
       <import plugin="org.eclipse.jst.ws.tests.performance"/>
       <import plugin="org.eclipse.jst.ejb.ui.tests"/>
-
-      <!-- deprecated axis 1.x bundles -->
       <import plugin="org.eclipse.jst.ws.axis.consumption.core.tests"/>
    </requires>
+
 </feature>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
index 660f920f8..52eac49c9 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_tests.feature</artifactId>
-  <version>3.10.100-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
index eeafe37e7..1dd9bbde2 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.jst.enterprise_ui.feature"
       label="%featureName"
-      version="3.9.500.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.jst.jee.ui"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
@@ -51,10 +51,9 @@
       <import plugin="org.eclipse.jst.ejb.ui.infopop"/>
       <import plugin="org.eclipse.jst.ws.jaxrs.core"/>
       <import plugin="org.eclipse.jst.ws.jaxrs.ui"/>
-
-      <!-- deprecated axis 1.x bundles -->
       <import plugin="org.eclipse.jst.ws.axis.consumption.core"/>
       <import plugin="org.eclipse.jst.ws.axis.consumption.ui"/>
       <import plugin="org.eclipse.jst.ws.axis.creation.ui"/>
    </requires>
+
 </feature>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
index bde38e91b..3e51050c5 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_ui.feature</artifactId>
-  <version>3.9.500-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_userdoc.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
index 7aea247d1..bd847fdfe 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
@@ -5,7 +5,7 @@
       version="3.6.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
index efc0326c2..92835fe85 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.jst.web_core.feature"
       label="%featureName"
-      version="3.13.0.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
index ead470cad..f977398a4 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_core.feature</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
index 3207a462d..ea8a80051 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.jst.web_sdk.feature"
       label="%featureName"
-      version="3.9.0.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
index 12990adc1..6bb1c0114 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_sdk.feature</artifactId>
-  <version>3.9.0-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
index d09314d86..578b10a73 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.jst.web_tests.feature"
       label="%featureName"
-      version="3.6.100.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
@@ -22,11 +22,12 @@
    <requires>
       <import plugin="org.eclipse.jst.j2ee.core.tests"/>
       <import plugin="org.eclipse.jst.j2ee.tests"/>
-      <!-- test failures so disable for now <import plugin="org.eclipse.jst.jsp.core.tests"/> -->
       <import plugin="org.eclipse.jst.jsp.tests.encoding"/>
+      <import plugin="org.eclipse.jst.jsp.core.tests"/>
       <import plugin="org.eclipse.jst.jsp.ui.tests"/>
       <import plugin="org.eclipse.jst.servlet.tests"/>
       <import plugin="org.eclipse.jem.tests"/>
       <import plugin="org.eclipse.jst.jee.tests"/>
    </requires>
+
 </feature>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
index c505dfb24..c405af9dc 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_tests.feature</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
index 6132160ad..61d6f3aff 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.jst.web_ui.feature"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
index 1c8077074..8097e1934 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.web_ui.feature</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_userdoc.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_userdoc.feature/feature.xml
index f077e415f..085cf334e 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_userdoc.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_userdoc.feature/feature.xml
@@ -5,7 +5,7 @@
       version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="2.0.0.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description