Bug 536379 - re-enable building the capabilities bundles and the org.eclipse.wtp.capabilities feature

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/features/org.eclipse.wtp.capabilities/feature.xml b/features/org.eclipse.wtp.capabilities/feature.xml
index d63f7c7..a04a605 100644
--- a/features/org.eclipse.wtp.capabilities/feature.xml
+++ b/features/org.eclipse.wtp.capabilities/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wtp.capabilities.feature"
       label="%featureName"
-      version="1.0.100.qualifier"
+      version="1.0.101.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -18,48 +18,16 @@
    <license url="%licenseURL">
       %license
    </license>
-    
-      <plugin
-         id="org.eclipse.wtp.epp.package.jee.intro"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-    
-       <plugin
-         id="org.eclipse.wtp.epp.package.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-    
-    
-   <plugin
-         id="org.eclipse.wtp.javascript.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
-   <plugin
-         id="org.eclipse.wtp.jee.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <!-- locally build in this repo -->
+   <plugin id="org.eclipse.wtp.epp.package.jee.intro" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.eclipse.wtp.epp.package.capabilities" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
-   <plugin
-         id="org.eclipse.wtp.web.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wtp.xml.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+   <!-- from other WTP repos -->
+   <requires>
+      <import plugin="org.eclipse.wtp.javascript.capabilities"/>
+      <import plugin="org.eclipse.wtp.jee.capabilities"/>
+      <import plugin="org.eclipse.wtp.web.capabilities"/>
+      <import plugin="org.eclipse.wtp.xml.capabilities"/>
+   </requires>
 </feature>
diff --git a/features/org.eclipse.wtp.capabilities/pom.xml b/features/org.eclipse.wtp.capabilities/pom.xml
index 2c7a44d..0d85fb3 100644
--- a/features/org.eclipse.wtp.capabilities/pom.xml
+++ b/features/org.eclipse.wtp.capabilities/pom.xml
@@ -22,6 +22,6 @@
 

   <groupId>org.eclipse.webtools.releng</groupId>

   <artifactId>org.eclipse.wtp.capabilities.feature</artifactId>

-  <version>1.0.100-SNAPSHOT</version>

+  <version>1.0.101-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d15d61d..10b89dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,15 +58,14 @@
     <!-- features -->

     <!-- <module>features/org.eclipse.wst.doc.isv.feature</module> -->

     <!-- <module>features/org.eclipse.wst.doc.user.feature</module> -->

-    <!-- <module>features/org.eclipse.wtp.capabilities</module> -->

+    <module>features/org.eclipse.wtp.capabilities</module>

     <module>features/org.eclipse.wtp.releng.fixups.feature</module>

     <module>features/org.eclipse.wtp.releng.tests.feature</module>

     <module>features/org.eclipse.wtp.releng.tools.feature</module>

 

     <!-- plugins -->

-    <!-- <module>plugins/org.eclipse.wtp.capabilities</module> -->

-    <!-- <module>plugins/org.eclipse.wtp.epp.package.capabilities</module> -->

-    <!-- <module>plugins/org.eclipse.wtp.epp.package.jee.intro</module> -->

+    <module>plugins/org.eclipse.wtp.epp.package.capabilities</module>

+    <module>plugins/org.eclipse.wtp.epp.package.jee.intro</module>

     <!-- <module>plugins/org.eclipse.wtp.feature.branding.template</module> -->

     <!-- <module>plugins/org.eclipse.wtp.jee</module> -->

     <module>plugins/org.eclipse.wtp.releng.fixups</module>