[jbosstools-commits] JBoss Tools SVN: r40880 - trunk/common/features/org.jboss.tools.common.mylyn.feature.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2012-05-09 13:28:53 -0400 (Wed, 09 May 2012)
New Revision: 40880

Modified:
   trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
Log:
fix versions of dependent upstream stuff; add optional stuff like wikitext, cvs, and subclipse support because then it's consistent w/ the JBDS experience too (JBDS-2098)

Modified: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml	2012-05-09 17:28:44 UTC (rev 40879)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml	2012-05-09 17:28:53 UTC (rev 40880)
@@ -5,6 +5,7 @@
 	<copyright>%copyright</copyright>
 	<license>%license</license>
 
+	<!-- JBDS-2098 add defaults for issues.jboss.org and bugzilla.redhat.com -->
 	<plugin id="org.jboss.tools.common.mylyn" download-size="0" install-size="0" version="0.0.0" />
 
 	<requires>
@@ -16,11 +17,10 @@
 		<import feature="org.eclipse.mylyn.java_feature" version="3.6.5" match="greaterOrEqual" />
 		<import feature="org.eclipse.mylyn.pde_feature" version="3.6.5" match="greaterOrEqual" />
 		<import feature="org.eclipse.mylyn.team_feature" version="3.6.5" match="greaterOrEqual" />
-
+		<import feature="org.eclipse.mylyn.cvs" version="0.8.2" match="greaterOrEqual" />
 		<import feature="org.eclipse.mylyn.versions" version="0.8.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.wikitext_feature" version="1.5.2" match="greaterOrEqual" />
 
-		<!-- JBDS-2098 add required mylyn and atlassian plugins/features; not sure if we need subclipse, bamboo, crucible, or fisheye support -->
-		<!--
 		<plugin id="com.atlassian.connector.eclipse.bamboo.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
 		<plugin id="com.atlassian.connector.eclipse.bamboo.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
 		<plugin id="com.atlassian.connector.eclipse.crucible.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
@@ -29,7 +29,6 @@
 		<plugin id="com.atlassian.connector.eclipse.fisheye.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
 		<plugin id="com.atlassian.connector.eclipse.subclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
 		<plugin id="com.atlassian.connector.eclipse.subclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
-		-->
 
 		<plugin id="org.eclipse.mylyn.tasks.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
 		<plugin id="org.eclipse.mylyn.tasks.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
@@ -76,8 +75,8 @@
 		<plugin id="org.apache.commons.codec" version="1.3.0" match="greaterOrEqual" unpack="false" />
 
 		<plugin id="org.jdom_jaxen" version="1.0.0" match="greaterOrEqual" unpack="false" />
-		<plugin id="org.mortbay.jetty.server" version="6.1.23" match="greaterOrEqual" unpack="false" />
-		<plugin id="org.mortbay.jetty.util" version="6.1.23" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.mortbay.jetty.server" version="6.1.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.mortbay.jetty.util" version="6.1.0" match="greaterOrEqual" unpack="false" />
 		<plugin id="org.apache.jasper" version="5.5.17" match="greaterOrEqual" unpack="false" />
 		<plugin id="org.joda.time" version="1.6.0" match="greaterOrEqual" unpack="false" />