org.eclipse.wst.sse.core is now at 1.2, so fix deps; also fix features add org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.source to update site Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml index d62a9e5..87fcb53 100644 --- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml +++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" label="%featureName" - version="2.6.0.qualifier" + version="2.6.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier"> @@ -24,10 +24,10 @@ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.emf.ecore.xmi" version="2.2.0" match="compatible"/> <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/> - <import plugin="org.eclipse.jst.jsf.common" version="1.1.0" match="compatible"/> - <import plugin="org.eclipse.jst.pagedesigner" version="1.1.0" match="compatible"/> - <import plugin="org.eclipse.jst.jsf.core" version="1.1.0" match="compatible"/> + <import plugin="org.eclipse.wst.sse.core"/> + <import plugin="org.eclipse.jst.jsf.common"/> + <import plugin="org.eclipse.jst.pagedesigner"/> + <import plugin="org.eclipse.jst.jsf.core"/> <import plugin="org.eclipse.jdt.core" version="3.4.0" match="compatible"/> <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/> </requires>
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/pom.xml b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/pom.xml index 135c502..097280e 100644 --- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/pom.xml +++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.jsf</groupId> <artifactId>org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature</artifactId> - <version>2.6.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml index 66e4a67..8af87c0 100644 --- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml +++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature" label="%featureName" - version="2.6.0.qualifier" + version="2.6.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier"> @@ -19,12 +19,8 @@ %license </license> - <includes - id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.source" - version="0.0.0"/> + <requires> + <import feature="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"/> + </requires> </feature>
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/pom.xml b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/pom.xml index 9eca352..266ca6c 100644 --- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/pom.xml +++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.jsf</groupId> <artifactId>org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature</artifactId> - <version>2.6.0-SNAPSHOT</version> + <version>2.6.1-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF index 5e3cd4a..da7d735 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.jsf.apache.trinidad.tagsupport;singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.4.1.qualifier Bundle-Localization: plugin Bundle-Activator: org.eclipse.jst.jsf.apache.trinidad.tagsupport.TrinidadTagSupportActivator Bundle-Vendor: %pluginProvider @@ -10,7 +10,7 @@ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", org.eclipse.gef;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)", + org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.jsf.common;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.pagedesigner;bundle-version="[1.1.0,2.0.0)", org.eclipse.jst.jsf.core;bundle-version="[1.1.0,2.0.0)",
diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/pom.xml b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/pom.xml index e32e13e..efdbc96 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/pom.xml +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.jsf</groupId> <artifactId>org.eclipse.jst.jsf.apache.trinidad.tagsupport</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/site/category.xml b/site/category.xml index 81bbe3b..e709ee0 100755 --- a/site/category.xml +++ b/site/category.xml
@@ -15,6 +15,8 @@ <bundle id="org.eclipse.jst.jsf.doc.dev"/> <bundle id="org.eclipse.jst.jsf.doc.user"/> + <feature id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.source"/> + <category-def name="jsf" label="Web Tools Platform (WTP) Java Server Faces"><description> Java Server Faces plugins shared by WTP features </description></category-def>