Author: nickboldt Date: 2012-05-09 13:10:47 -0400 (Wed, 09 May 2012) New Revision: 40877 Modified: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml Log: JBDS-2098 set 3rd party deps as REQUIRED, not INCLUDED; fix version of javax.servlet(.jsp) to lower minimum 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:03:22 UTC (rev 40876) +++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-09 17:10:47 UTC (rev 40877) @@ -18,72 +18,72 @@ <import feature="org.eclipse.mylyn.team_feature" version="3.6.5" match="greaterOrEqual" /> <import feature="org.eclipse.mylyn.versions" version="0.8.5" match="greaterOrEqual" /> - </requires> - <!-- 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" /> - <plugin id="com.atlassian.connector.eclipse.crucible.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.fisheye.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <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" /> - --> + <!-- 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" /> + <plugin id="com.atlassian.connector.eclipse.crucible.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.fisheye.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <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" /> - <plugin id="org.eclipse.mylyn.tasks.bugs" 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" /> + <plugin id="org.eclipse.mylyn.tasks.bugs" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.commons" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.branding.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.commons.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.commons.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.cvs.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.cvs.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.directclickthrough.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.help" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.jira.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.jira.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.monitor.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.monitor.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="com.atlassian.connector.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.commons" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.branding.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.commons.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.commons.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.cvs.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.cvs.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.directclickthrough.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.help" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.jira.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.jira.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.monitor.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.monitor.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="com.atlassian.connector.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <!-- JBDS-1682 dependent 3rd party plugins needed to install Atlassian JIRA support --> - <plugin id="com.thoughtworks.xstream" version="1.3.0" match="greaterOrEqual" unpack="false" /> + <!-- JBDS-1682 dependent 3rd party plugins needed to install Atlassian JIRA support --> + <plugin id="com.thoughtworks.xstream" version="1.3.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.osgi" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.core.filesystem" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.team.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.team.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.jface" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.eclipse.compare" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.osgi" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.core.filesystem" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.team.core" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.team.ui" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.jface" version="0.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.eclipse.compare" version="0.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.apache.axis" version="1.4.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.apache.commons.logging" version="1.1.1" match="greaterOrEqual" unpack="false" /> - <plugin id="org.apache.commons.io" version="2.0.1" match="greaterOrEqual" unpack="false" /> - <plugin id="org.apache.commons.httpclient" version="3.1.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.apache.commons.lang" version="2.4.0" match="greaterOrEqual" unpack="false" /> - <plugin id="org.apache.commons.codec" version="1.3.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.apache.axis" version="1.4.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.apache.commons.logging" version="1.1.1" match="greaterOrEqual" unpack="false" /> + <plugin id="org.apache.commons.io" version="2.0.1" match="greaterOrEqual" unpack="false" /> + <plugin id="org.apache.commons.httpclient" version="3.1.0" match="greaterOrEqual" unpack="false" /> + <plugin id="org.apache.commons.lang" version="2.4.0" match="greaterOrEqual" unpack="false" /> + <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.apache.jasper" version="5.5.17" match="greaterOrEqual" unpack="false" /> - <plugin id="org.joda.time" version="1.6.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.apache.jasper" version="5.5.17" match="greaterOrEqual" unpack="false" /> + <plugin id="org.joda.time" version="1.6.0" match="greaterOrEqual" unpack="false" /> - <plugin id="javax.servlet" version="3.0.0" match="greaterOrEqual" unpack="false" /> - <plugin id="javax.servlet.jsp" version="2.2.0" match="greaterOrEqual" unpack="false" /> - <plugin id="javax.xml.rpc" version="1.1.0" match="greaterOrEqual" unpack="false" /> - <plugin id="javax.el" version="2.2.0" match="greaterOrEqual" unpack="false" /> + <plugin id="javax.servlet" version="2.5.0" match="greaterOrEqual" unpack="false" /> + <plugin id="javax.servlet.jsp" version="2.0.0" match="greaterOrEqual" unpack="false" /> + <plugin id="javax.xml.rpc" version="1.1.0" match="greaterOrEqual" unpack="false" /> + <plugin id="javax.el" version="2.2.0" match="greaterOrEqual" unpack="false" /> + </requires> </feature>