Author: rob.stryker(a)jboss.com Date: 2012-01-05 23:09:33 -0500 (Thu, 05 Jan 2012) New Revision: 37668 Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml trunk/as/pom.xml Log: JBIDE-10469 Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-01-06 03:03:35 UTC (rev 37667) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-01-06 04:09:33 UTC (rev 37668) @@ -1,15 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.jboss.ide.eclipse.as.feature" label="%featureName" version="2.3.0.qualifier" provider-name="%providerName" plugin="org.jboss.ide.eclipse.as.ui"> +<feature + id="org.jboss.ide.eclipse.as.feature" + label="%featureName" + version="2.3.0.qualifier" + provider-name="%providerName" + plugin="org.jboss.ide.eclipse.as.ui"> - <description url="http://www.jboss.org/tools"> + <description url="http://www.jboss.org/tools"> %description </description> - <copyright> + <copyright> %copyright </copyright> - <license url="license.html"> + <license url="license.html"> Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, @@ -19,62 +24,43 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.core.runtime" /> - <import plugin="org.eclipse.debug.core" /> - <import plugin="org.eclipse.core.resources" /> - <import plugin="org.eclipse.jdt.launching" /> - <import plugin="org.eclipse.jdt.core" /> - <import plugin="org.eclipse.jst.server.core" version="1.0.102" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.core" version="1.0.102" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.boot" /> - <import plugin="org.eclipse.jst.j2ee" /> - <import plugin="org.eclipse.jst.j2ee.core" version="1.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.project.facet.core" version="1.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jst.common.project.facet.core" version="1.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui" /> - <import plugin="org.eclipse.ui.forms" /> - <import plugin="org.eclipse.jst.server.ui" /> - <import plugin="org.eclipse.wst.server.ui" version="1.0.102" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.ui.doc.user" /> - <import plugin="org.eclipse.jst.server.generic.core" version="1.0.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.jst.server.generic.ui" /> - <import plugin="org.eclipse.jdt.debug" /> - <import plugin="org.eclipse.jdt.debug.ui" /> - <import plugin="org.eclipse.ui.console" /> - <import plugin="org.eclipse.text" /> - <import plugin="org.eclipse.jface.text" /> - <import plugin="org.eclipse.debug.ui" /> - <import plugin="org.eclipse.ui.views" /> - <import plugin="org.eclipse.ui.editors" /> - <import plugin="org.eclipse.wst.xml.ui" /> - <import plugin="org.eclipse.wst.sse.ui" /> - <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.filesystem" /> - <import plugin="org.eclipse.jst.server.tomcat.core" /> - <import plugin="org.eclipse.jst.servlet.ui" /> - <import plugin="org.eclipse.jst.j2ee.ui" /> - <import plugin="org.eclipse.wst.web.ui" /> - <import plugin="org.eclipse.wst.common.frameworks.ui" /> - <import plugin="org.eclipse.jst.server.tomcat.ui" /> - <import plugin="org.eclipse.core.variables" /> - <import plugin="org.eclipse.search" /> - <import plugin="org.eclipse.jst.ws" /> - <import plugin="org.eclipse.jst.ws.ui" /> - <import plugin="org.eclipse.jst.ws.consumption" /> - <import plugin="org.eclipse.jst.ws.consumption.ui" /> - <import plugin="org.eclipse.jst.ws.axis.creation.ui" /> - <import plugin="org.eclipse.wst.ws" /> - <import plugin="org.eclipse.wst.ws.ui" /> - <import plugin="org.jboss.ide.eclipse.archives.core" /> - <import plugin="org.apache.ant" /> - <import plugin="org.jboss.ide.eclipse.archives.ui" /> - <import plugin="org.eclipse.jdt" /> - <import plugin="org.eclipse.wst.xml.ui.infopop" /> - <import plugin="org.jboss.ide.eclipse.archives.webtools" /> - </requires> + <requires> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.xml.core" version="1.1.600" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.xml.ui" version="1.1.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.sse.ui" version="1.3.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jface.text" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.sse.core" version="1.1.600" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.core" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.debug" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.debug.ui" version="3.6.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.xml.ui.infopop" version="1.0.400" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.ui"/> + <import plugin="org.eclipse.jst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.jst.common.project.facet.ui" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.project.facet.ui" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.frameworks" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.core" version="2.3.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.web" version="1.1.500" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.web.ui" version="1.1.400" match="greaterOrEqual"/> + <import plugin="org.eclipse.jst.server.core" version="1.2.202" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="2.3.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jst.j2ee" version="1.1.500" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.modulecore.ui" version="1.0.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jst.j2ee.core" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jst.j2ee.ui" version="1.1.500" match="greaterOrEqual"/> + <import plugin="org.eclipse.jst.common.frameworks" version="1.1.500" match="greaterOrEqual"/> + </requires> <includes id="org.jboss.ide.eclipse.archives.feature" version="0.0.0" /> <includes id="org.jboss.ide.eclipse.as.archives.integration.feature" version="0.0.0" /> @@ -83,7 +69,12 @@ <includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" 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 --> - <plugin id="org.jboss.ide.eclipse.as.ui.mbeans" download-size="0" install-size="0" version="0.0.0" unpack="false" /> + <plugin + id="org.jboss.ide.eclipse.as.ui.mbeans" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: trunk/as/pom.xml =================================================================== --- trunk/as/pom.xml 2012-01-06 03:03:35 UTC (rev 37667) +++ trunk/as/pom.xml 2012-01-06 04:09:33 UTC (rev 37668) @@ -18,14 +18,5 @@ <module>features</module> <module>site</module> </modules> - <!-- no longer needed (https://issues.jboss.org/browse/JBIDE-9585) <repositories> - <repository> - <id>egit11</id> - <url>http://download.jboss.org/jbosstools/updates/requirements/egit/1.1... - <layout>p2</layout> - <snapshots><enabled>true</enabled></snapshots> - <releases><enabled>true</enabled></releases> - </repository> - </repositories> --> </project>