Author: nickboldt Date: 2011-08-23 17:25:31 -0400 (Tue, 23 Aug 2011) New Revision: 34180 Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml Log: JBIDE-9549: org.jboss.ide.eclipse.as.server.egit.integration.feature is NOT included here because it would cause eGit to become a Core dependency Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2011-08-23 21:25:20 UTC (rev 34179) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2011-08-23 21:25:31 UTC (rev 34180) @@ -24,34 +24,6 @@ Raleigh NC 27606 USA. </license> - <includes - id="org.jboss.ide.eclipse.archives.feature" - version="0.0.0"/> - - <includes - id="org.jboss.ide.eclipse.as.archives.integration" - version="0.0.0"/> - - <includes - id="org.jboss.ide.eclipse.as.jmx.integration" - version="0.0.0"/> - - <includes - id="org.jboss.ide.eclipse.as.server.rse.integration" - version="0.0.0"/> - - <includes - id="org.jboss.ide.eclipse.as.serverAdapter.wtp" - version="0.0.0"/> - - <includes - id="org.jboss.tools.jmx.feature" - version="0.0.0"/> - - <includes - id="org.jboss.ide.eclipse.archives.feature" - version="0.0.0"/> - <requires> <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.debug.core"/> @@ -116,4 +88,34 @@ version="0.0.0" unpack="false"/> + <includes + id="org.jboss.ide.eclipse.archives.feature" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.as.archives.integration" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.as.jmx.integration" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.as.server.rse.integration" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.as.serverAdapter.wtp" + version="0.0.0"/> + + <includes + id="org.jboss.tools.jmx.feature" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.archives.feature" + version="0.0.0"/> + + <!-- JBIDE-9549: org.jboss.ide.eclipse.as.server.egit.integration.feature is NOT included here because it would cause eGit to become a Core dependency in JBDS instead of an Extra; therefore keep the egit feature SEPARATE for now --> + </feature>