generate missing sources; remove sources from sdk features; add missing IUs to update site
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/json/features/org.eclipse.wst.json_sdk.feature/feature.xml b/json/features/org.eclipse.wst.json_sdk.feature/feature.xml
index fb9c444..2252951 100644
--- a/json/features/org.eclipse.wst.json_sdk.feature/feature.xml
+++ b/json/features/org.eclipse.wst.json_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.json_sdk.feature"
label="%featureName"
- version="1.1.2.qualifier"
+ version="1.1.3.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -21,6 +21,5 @@
<requires>
<import feature="org.eclipse.wst.json_ui.feature" version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.json_ui.feature.source" version="0.0.0" match="greaterOrEqual"/>
</requires>
</feature>
diff --git a/json/features/org.eclipse.wst.json_sdk.feature/pom.xml b/json/features/org.eclipse.wst.json_sdk.feature/pom.xml
index 8b9a4c5..4d05afe 100644
--- a/json/features/org.eclipse.wst.json_sdk.feature/pom.xml
+++ b/json/features/org.eclipse.wst.json_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.json_sdk.feature</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/site/category.xml b/site/category.xml
index 610d438..f06f4f0 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -1,91 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature id="org.eclipse.wst.json_core.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.json_ui.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.web_core.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.web_ui.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.xml_core.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.xml_ui.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.xsl.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.xml.xpath2.processor.feature"><category name="Web Tools Platform (WTP)"/></feature>
+ <feature id="org.eclipse.wst.json_core.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.json_ui.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.web_core.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.web_ui.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.xml_core.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.xml_ui.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.xsl.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.xml.xpath2.processor.feature"><category name="wtp"/></feature>
- <feature id="org.eclipse.wst.web_userdoc.feature"><category name="Web Tools Platform (WTP)"/></feature>
- <feature id="org.eclipse.wst.xml_userdoc.feature"><category name="Web Tools Platform (WTP)"/></feature>
+ <feature id="org.eclipse.wst.web_userdoc.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.wst.xml_userdoc.feature"><category name="wtp"/></feature>
- <feature id="org.eclipse.wst.json_sdk.feature"><category name="Web Tools Platform SDK (WTP SDK)"/></feature>
- <feature id="org.eclipse.wst.web_sdk.feature"><category name="Web Tools Platform SDK (WTP SDK)"/></feature>
- <feature id="org.eclipse.wst.xml_sdk.feature"><category name="Web Tools Platform SDK (WTP SDK)"/></feature>
- <feature id="org.eclipse.wst.xsl_sdk.feature"><category name="Web Tools Platform SDK (WTP SDK)"/></feature>
- <feature id="org.eclipse.wst.xml.xpath2.processor.sdk.feature"><category name="Web Tools Platform SDK (WTP SDK)"/></feature>
+ <feature id="org.eclipse.wst.json_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.wst.web_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.wst.xml_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.wst.xsl_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.wst.xml.xpath2.processor.sdk.feature"><category name="wtp.sdk"/></feature>
+ <bundle id="org.eclipse.wst.xml.xpath2.processor.sdk.doc"><category name="wtp.bundles.sdk"/></bundle>
- <feature id="org.eclipse.wst.json_tests.feature"><category name="Web Tools Platform Tests (WTP Tests)"/></feature>
- <feature id="org.eclipse.wst.web_tests.feature"><category name="Web Tools Platform Tests (WTP Tests)"/></feature>
- <feature id="org.eclipse.wst.xml_tests.feature"><category name="Web Tools Platform Tests (WTP Tests)"/></feature>
- <feature id="org.eclipse.wst.xsl_tests.feature"><category name="Web Tools Platform Tests (WTP Tests)"/></feature>
+ <feature id="org.eclipse.wst.json_tests.feature"><category name="wtp.tests"/></feature>
+ <feature id="org.eclipse.wst.web_tests.feature"><category name="wtp.tests"/></feature>
+ <feature id="org.eclipse.wst.xml_tests.feature"><category name="wtp.tests"/></feature>
+ <feature id="org.eclipse.wst.xsl_tests.feature"><category name="wtp.tests"/></feature>
+ <bundle id="org.eclipse.wst.xml.xpath2.wtptypes.tests"><category name="wtp.tests"/></bundle>
- <!-- include plugins which are not wrapped with features, but which are needed in downstream builds -->
- <bundle id="org.eclipse.jst.jsp.core"><category name="Web Tools Platform (WTP)"/></bundle>
- <bundle id="org.eclipse.jst.jsp.ui"><category name="Web Tools Platform (WTP)"/></bundle>
- <!-- <bundle id="org.eclipse.jst.jsp.core.tests"/> -->
- <bundle id="org.eclipse.jst.jsp.tests.encoding"/>
+ <bundle id="org.eclipse.jst.jsp.core"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.jst.jsp.ui"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.jst.jsp.tests.encoding"><category name="wtp.bundles"/></bundle>
- <bundle id="org.eclipse.jst.standard.schemas"/>
- <bundle id="org.eclipse.wst.jsdt.web.support.jsp"/>
- <bundle id="org.eclipse.jst.jsp.ui.infopop"/>
- <bundle id="org.eclipse.jst.jsp.core.tests"/>
- <bundle id="org.eclipse.jst.jsp.ui.tests"/>
+ <bundle id="org.eclipse.jst.standard.schemas"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.wst.jsdt.web.support.jsp"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.jst.jsp.ui.infopop"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.jst.jsp.core.tests"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.jst.jsp.ui.tests"><category name="wtp.bundles"/></bundle>
- <!-- sources -->
+ <bundle id="org.eclipse.wtp.javascript.capabilities"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.wtp.web.capabilities"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.wtp.xml.capabilities"><category name="wtp.bundles"/></bundle>
- <feature id="org.eclipse.wst.json_core.feature.source"/>
- <feature id="org.eclipse.wst.json_ui.feature.source"/>
- <feature id="org.eclipse.wst.web_core.feature.source"/>
- <feature id="org.eclipse.wst.web_ui.feature.source"/>
- <feature id="org.eclipse.wst.xml_core.feature.source"/>
- <feature id="org.eclipse.wst.xml_ui.feature.source"/>
- <feature id="org.eclipse.wst.xsl.feature.source"/>
+ <!-- sources -->
- <feature id="org.eclipse.wst.web_userdoc.feature.source"/>
- <feature id="org.eclipse.wst.xml_userdoc.feature.source"/>
+ <feature id="org.eclipse.wst.json_core.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.wst.json_ui.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.wst.web_core.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.wst.web_ui.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.wst.xml_core.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.wst.xml_ui.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.wst.xsl.feature.source"><category name="wtp.sources"/></feature>
- <feature id="org.eclipse.wst.json_sdk.feature.source"/>
- <feature id="org.eclipse.wst.web_sdk.feature.source"/>
- <feature id="org.eclipse.wst.xml_sdk.feature.source"/>
- <feature id="org.eclipse.wst.xsl_sdk.feature.source"/>
- <feature id="org.eclipse.wst.xml.xpath2.processor.sdk.feature.source"/>
+ <feature id="org.eclipse.wst.web_userdoc.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.wst.xml_userdoc.feature.source"><category name="wtp.sources"/></feature>
- <feature id="org.eclipse.wst.json_tests.feature.source"/>
- <feature id="org.eclipse.wst.web_tests.feature.source"/>
- <feature id="org.eclipse.wst.xml_tests.feature.source"/>
- <feature id="org.eclipse.wst.xsl_tests.feature.source"/>
+ <feature id="org.eclipse.wst.json_sdk.feature.source"><category name="wtp.sdk.sources"/></feature>
+ <feature id="org.eclipse.wst.web_sdk.feature.source"><category name="wtp.sdk.sources"/></feature>
+ <feature id="org.eclipse.wst.xml_sdk.feature.source"><category name="wtp.sdk.sources"/></feature>
+ <feature id="org.eclipse.wst.xsl_sdk.feature.source"><category name="wtp.sdk.sources"/></feature>
+ <feature id="org.eclipse.wst.xml.xpath2.processor.sdk.feature.source"><category name="wtp.sdk.sources"/></feature>
+ <bundle id="org.eclipse.wst.xml.xpath2.processor.sdk.doc.source"><category name="wtp.bundles.sdk.sources"/></bundle>
- <bundle id="org.eclipse.jst.jsp.core.source"/>
- <bundle id="org.eclipse.jst.jsp.ui.source"/>
- <!-- <bundle id="org.eclipse.jst.jsp.core.tests.source"/> -->
- <bundle id="org.eclipse.jst.jsp.tests.encoding.source"/>
+ <feature id="org.eclipse.wst.json_tests.feature.source"><category name="wtp.tests"/></feature>
+ <feature id="org.eclipse.wst.web_tests.feature.source"><category name="wtp.tests"/></feature>
+ <feature id="org.eclipse.wst.xml_tests.feature.source"><category name="wtp.tests"/></feature>
+ <feature id="org.eclipse.wst.xsl_tests.feature.source"><category name="wtp.tests"/></feature>
+ <bundle id="org.eclipse.wst.xml.xpath2.wtptypes.tests.source"><category name="wtp.tests"/></bundle>
- <category-def
- name="Web Tools Platform (WTP)"
- label="Web Tools Platform (WTP)">
- <description>
- These features provide functionality with the executable code only and are recommended for most users.
- </description>
- </category-def>
- <category-def
- name="Web Tools Platform SDK (WTP SDK)"
- label="Web Tools Platform SDK (WTP SDK)">
- <description>
- These features provide functionality with the executable code and the source code and are recommended for those
- extending or debugging
- WTP.
- </description>
- </category-def>
- <category-def
- name="Web Tools Platform Tests (WTP Tests)"
- label="Web Tools Platform Tests (WTP Tests)">
- <description>
- These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least
- their PDE Targets.
- </description>
- </category-def>
+ <bundle id="org.eclipse.jst.jsp.core.source"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.jst.jsp.ui.source"><category name="wtp.bundles"/></bundle>
+ <bundle id="org.eclipse.jst.jsp.tests.encoding.source"><category name="wtp.bundles"/></bundle>
+
+ <bundle id="org.eclipse.wtp.javascript.capabilities.source"><category name="wtp.bundles.sources"/></bundle>
+ <bundle id="org.eclipse.wtp.web.capabilities.source"><category name="wtp.bundles.sources"/></bundle>
+ <bundle id="org.eclipse.wtp.xml.capabilities.source"><category name="wtp.bundles.sources"/></bundle>
+
+ <category-def name="wtp" label="Web Tools Platform (WTP)"><description>These features provide functionality with the executable code only and are recommended for most users.</description></category-def>
+ <category-def name="wtp.sdk" label="Web Tools Platform SDK (WTP SDK)"><description>These features provide functionality with the executable code and the source code and are recommended for those extending or debugging WTP.</description></category-def>
+
+ <category-def name="wtp.sources" label="Web Tools Platform (WTP) Sources"><description>These features provide sources.</description></category-def>
+ <category-def name="wtp.sdk.sources" label="Web Tools Platform SDK (WTP SDK) Sources"><description>These features provide sources.</description></category-def>
+
+ <category-def name="wtp.bundles" label="Web Tools Platform (WTP) Bundles"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def>
+ <category-def name="wtp.bundles.sdk" label="Web Tools Platform SDK (WTP SDK) Bundles"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def>
+
+ <category-def name="wtp.bundles.sources" label="Web Tools Platform (WTP) Bundle Sources"><description>These bundles provide sources.</description></category-def>
+ <category-def name="wtp.bundles.sdk.sources" label="Web Tools Platform SDK (WTP SDK) Bundle Sources"><description>These bundles provide sources.</description></category-def>
+
</site>
diff --git a/web/bundles/org.eclipse.wtp.javascript.capabilities/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wtp.javascript.capabilities/META-INF/MANIFEST.MF
index a0b2924..5d2cb4e 100644
--- a/web/bundles/org.eclipse.wtp.javascript.capabilities/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wtp.javascript.capabilities/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wtp.javascript.capabilities;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui.workbench,
org.eclipse.help.ui
diff --git a/web/bundles/org.eclipse.wtp.javascript.capabilities/build.properties b/web/bundles/org.eclipse.wtp.javascript.capabilities/build.properties
index 41197a4..cb39032 100644
--- a/web/bundles/org.eclipse.wtp.javascript.capabilities/build.properties
+++ b/web/bundles/org.eclipse.wtp.javascript.capabilities/build.properties
@@ -4,3 +4,7 @@
plugin.xml,\
OSGI-INF/l10n/,\
about.html
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/web/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml b/web/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml
index a030cd4..18fe52d 100644
--- a/web/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml
+++ b/web/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wtp.javascript.capabilities</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/web/bundles/org.eclipse.wtp.web.capabilities/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wtp.web.capabilities/META-INF/MANIFEST.MF
index 5efdcd19..078aefe 100644
--- a/web/bundles/org.eclipse.wtp.web.capabilities/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wtp.web.capabilities/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wtp.web.capabilities;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui.workbench,
org.eclipse.help.ui
diff --git a/web/bundles/org.eclipse.wtp.web.capabilities/build.properties b/web/bundles/org.eclipse.wtp.web.capabilities/build.properties
index cef084d..5795917 100644
--- a/web/bundles/org.eclipse.wtp.web.capabilities/build.properties
+++ b/web/bundles/org.eclipse.wtp.web.capabilities/build.properties
@@ -3,3 +3,7 @@
plugin.xml,\
OSGI-INF/l10n/,\
about.html
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/web/bundles/org.eclipse.wtp.web.capabilities/pom.xml b/web/bundles/org.eclipse.wtp.web.capabilities/pom.xml
index 4ecae93..b3595ca 100644
--- a/web/bundles/org.eclipse.wtp.web.capabilities/pom.xml
+++ b/web/bundles/org.eclipse.wtp.web.capabilities/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wtp.web.capabilities</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/web/tests/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF b/web/tests/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
index befdcfd..2e46bd7 100644
--- a/web/tests/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
+++ b/web/tests/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.sse.unittests; singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/web/tests/org.eclipse.wst.sse.unittests/build.properties b/web/tests/org.eclipse.wst.sse.unittests/build.properties
index bde1454..b13ab5f 100644
--- a/web/tests/org.eclipse.wst.sse.unittests/build.properties
+++ b/web/tests/org.eclipse.wst.sse.unittests/build.properties
@@ -13,3 +13,6 @@
plugin.xml,\
plugin.properties
source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/web/tests/org.eclipse.wst.sse.unittests/pom.xml b/web/tests/org.eclipse.wst.sse.unittests/pom.xml
index 62434d9..2fd6133 100644
--- a/web/tests/org.eclipse.wst.sse.unittests/pom.xml
+++ b/web/tests/org.eclipse.wst.sse.unittests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.sse.unittests</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/web/tests/pom.xml b/web/tests/pom.xml
index a6fd487..26ec0f3 100644
--- a/web/tests/pom.xml
+++ b/web/tests/pom.xml
@@ -37,5 +37,6 @@
<module>org.eclipse.wst.html.ui.tests</module>
<module>org.eclipse.wst.jsdt.web.core.tests</module>
<module>org.eclipse.wst.jsdt.web.ui.tests</module>
+ <!-- test does not work: 198 failures / 1 error <module>org.eclipse.wst.sse.unittests</module> -->
</modules>
</project>
diff --git a/xml/bundles/org.eclipse.wtp.xml.capabilities/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wtp.xml.capabilities/META-INF/MANIFEST.MF
index 7464693..333fc8c 100644
--- a/xml/bundles/org.eclipse.wtp.xml.capabilities/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wtp.xml.capabilities/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wtp.xml.capabilities;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui.workbench,
org.eclipse.help.ui
diff --git a/xml/bundles/org.eclipse.wtp.xml.capabilities/build.properties b/xml/bundles/org.eclipse.wtp.xml.capabilities/build.properties
index cef084d..5795917 100644
--- a/xml/bundles/org.eclipse.wtp.xml.capabilities/build.properties
+++ b/xml/bundles/org.eclipse.wtp.xml.capabilities/build.properties
@@ -3,3 +3,7 @@
plugin.xml,\
OSGI-INF/l10n/,\
about.html
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/xml/bundles/org.eclipse.wtp.xml.capabilities/pom.xml b/xml/bundles/org.eclipse.wtp.xml.capabilities/pom.xml
index 2e91e21..77ba2b5 100644
--- a/xml/bundles/org.eclipse.wtp.xml.capabilities/pom.xml
+++ b/xml/bundles/org.eclipse.wtp.xml.capabilities/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wtp.xml.capabilities</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 f2ceea3..529eedf 100644
--- a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.xml_sdk.feature"
label="%featureName"
- version="3.9.2.qualifier"
+ version="3.9.3.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -22,6 +22,5 @@
<requires>
<import feature="org.eclipse.wst.common_sdk.feature" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.wst.xml_ui.feature" version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.xml_ui.feature.source" version="0.0.0" match="greaterOrEqual"/>
</requires>
</feature>
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 02aff0f..2b34c9e 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.9.2-SNAPSHOT</version>
+ <version>3.9.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/META-INF/MANIFEST.MF b/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/META-INF/MANIFEST.MF
index 766ac11..6037eaf 100644
--- a/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/META-INF/MANIFEST.MF
+++ b/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xml.xpath2.processor.sdk.doc; singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
Bundle-Activator: org.eclipse.wst.xml.xpath2.processor.sdk.doc.Activator
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/build.properties b/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/build.properties
index 440ecc2..4707f08 100644
--- a/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/build.properties
+++ b/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/build.properties
@@ -1,5 +1,7 @@
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
bin.includes = plugin.xml,\
META-INF/,\
.,\
@@ -8,8 +10,4 @@
bin/,\
doc/,\
plugin.properties
-src.includes = about.html,\
- toc.xml,\
- doc/
bin.excludes = doc/html/deleteme.html
-
diff --git a/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml b/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml
index 827f616..bb6297d 100644
--- a/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml
+++ b/xpath/docs/org.eclipse.wst.xml.xpath2.processor.sdk.doc/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xml.xpath2.processor.sdk.doc</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>PsychoPath XPath 2.0 Processor: SDK Documentation</name>
</project>
diff --git a/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/META-INF/MANIFEST.MF b/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/META-INF/MANIFEST.MF
index 070d88b..c2ae9e5 100644
--- a/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/META-INF/MANIFEST.MF
+++ b/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.wst.xml.xpath2.wtptypes.tests;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
diff --git a/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/build.properties b/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/build.properties
index e6de9a0..44f934f 100644
--- a/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/build.properties
+++ b/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/build.properties
@@ -5,4 +5,5 @@
bin/,\
about.html,\
OSGI-INF/
-src.includes = about.html
+src.includes = *
+src.excludes = src
diff --git a/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml b/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
index 57b0e36..f10535f 100644
--- a/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
+++ b/xpath/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xml.xpath2.wtptypes.tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<name>PsychoPath XPath 2.0 Processor: Tests for WTP type support</name>
diff --git a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
index 973824b..24a2e31 100644
--- a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
+++ b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.xsl_sdk.feature"
label="%featureName"
- version="1.1.501.qualifier"
+ version="1.1.502.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -20,7 +20,6 @@
</license>
<requires>
<import feature="org.eclipse.wst.xsl.feature" version="0.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.xsl.feature.source" version="0.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.wst.xml.xpath2.processor.feature" version="0.0.0" match="greaterOrEqual"/>
</requires>
diff --git a/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml b/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml
index 531ff06..a52e286 100644
--- a/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml
+++ b/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xsl_sdk.feature</artifactId>
- <version>1.1.501-SNAPSHOT</version>
+ <version>1.1.502-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
