Author: nickboldt Date: 2012-05-09 16:26:00 -0400 (Wed, 09 May 2012) New Revision: 40888 Modified: branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/feature.xml branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/pom.xml Log: apply JBDS2098-common-central.patch1-revisited.txt to change from INCLUDING to REQUIRING third party deps Modified: branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/feature.xml =================================================================== --- branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-09 19:59:01 UTC (rev 40887) +++ branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-09 20:26:00 UTC (rev 40888) @@ -5,85 +5,84 @@ <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> - <import feature="org.eclipse.mylyn_feature" version="3.6.2" match="greaterOrEqual" /> - <import feature="org.eclipse.mylyn.ide_feature" version="3.6.2" match="greaterOrEqual" /> - <import feature="org.eclipse.mylyn.commons" version="3.6.2" match="greaterOrEqual" /> - <import feature="org.eclipse.mylyn.context_feature" version="3.6.2" match="greaterOrEqual" /> - <import feature="org.eclipse.mylyn.bugzilla_feature" version="3.6.2" match="greaterOrEqual" /> - <import feature="org.eclipse.mylyn.java_feature" version="3.6.2" match="greaterOrEqual" /> - <import feature="org.eclipse.mylyn.pde_feature" version="3.6.2" match="greaterOrEqual" /> - <import feature="org.eclipse.mylyn.team_feature" version="3.6.2" match="greaterOrEqual" /> + <import feature="org.eclipse.mylyn_feature" version="3.6.5" match="greaterOrEqual" /> + <import feature="org.eclipse.mylyn.ide_feature" version="3.6.5" match="greaterOrEqual" /> + <import feature="org.eclipse.mylyn.commons" version="3.6.5" match="greaterOrEqual" /> + <import feature="org.eclipse.mylyn.context_feature" version="3.6.5" match="greaterOrEqual" /> + <import feature="org.eclipse.mylyn.bugzilla_feature" version="3.6.5" match="greaterOrEqual" /> + <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" /> - <import feature="org.eclipse.mylyn.versions" version="0.8.2" 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" /> - --> + <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.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" /> - <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> Modified: branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/pom.xml =================================================================== --- branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/pom.xml 2012-05-09 19:59:01 UTC (rev 40887) +++ branches/jbosstools-3.3.0.Beta3/common/features/org.jboss.tools.common.mylyn.feature/pom.xml 2012-05-09 20:26:00 UTC (rev 40888) @@ -28,40 +28,8 @@ </executions> <configuration> <excludes> - <plugin id="com.thoughtworks.xstream"/> - <plugin id="org.apache.axis"/> - <plugin id="org.apache.commons.logging"/> - <plugin id="org.apache.commons.io"/> - <plugin id="org.apache.commons.httpclient"/> - <plugin id="org.apache.commons.lang"/> - <plugin id="org.apache.commons.codec"/> - <plugin id="org.jdom_jaxen"/> - <plugin id="org.mortbay.jetty.server"/> - <plugin id="org.mortbay.jetty.util"/> - <plugin id="org.apache.jasper"/> - <plugin id="org.joda.time"/> - <plugin id="javax.servlet"/> - <plugin id="javax.servlet.jsp"/> - <plugin id="javax.xml.rpc"/> - <plugin id="javax.el"/> - <plugin id="org.eclipse.mylyn.tasks.ui"/> - <plugin id="org.eclipse.mylyn.tasks.core"/> - <plugin id="org.eclipse.mylyn.tasks.bugs"/> - <plugin id="com.atlassian.connector.commons"/> - <plugin id="com.atlassian.connector.eclipse.branding.ui"/> - <plugin id="com.atlassian.connector.eclipse.commons.core"/> - <plugin id="com.atlassian.connector.eclipse.commons.ui"/> - <plugin id="com.atlassian.connector.eclipse.core"/> - <plugin id="com.atlassian.connector.eclipse.cvs.core"/> - <plugin id="com.atlassian.connector.eclipse.cvs.ui"/> - <plugin id="com.atlassian.connector.eclipse.directclickthrough.ui"/> - <plugin id="com.atlassian.connector.eclipse.help"/> - <plugin id="com.atlassian.connector.eclipse.jira.core"/> - <plugin id="com.atlassian.connector.eclipse.jira.ui"/> - <plugin id="com.atlassian.connector.eclipse.monitor.core"/> - <plugin id="com.atlassian.connector.eclipse.monitor.ui"/> - <plugin id="com.atlassian.connector.eclipse.ui"/> - <!-- <feature id="sourcefeature.feature.nosource"/> --> + <!-- <plugin id="sourceplugin.nosource"/> --> + <!-- <feature id="sourcefeature.feature.nosource"/> --> </excludes> </configuration> </plugin>