JBoss Tools SVN: r43788 - trunk/central/features/org.jboss.tools.central.themes.feature.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-18 05:11:55 -0400 (Tue, 18 Sep 2012)
New Revision: 43788
Modified:
trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml
Log:
JBIDE-12552: Pack plugin in feature
Modified: trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml
===================================================================
--- trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml 2012-09-18 09:07:46 UTC (rev 43787)
+++ trunk/central/features/org.jboss.tools.central.themes.feature/feature.xml 2012-09-18 09:11:55 UTC (rev 43788)
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.central.themes.feature" label="%featureName" version="1.1.0.qualifier" provider-name="%providerName" plugin="org.jboss.tools.community.central">
+<feature
+ id="org.jboss.tools.central.themes.feature"
+ label="%featureName"
+ version="1.1.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.community.central">
+
<description>
%description
</description>
@@ -12,6 +18,11 @@
%license
</license>
- <plugin id="org.jboss.tools.central.themes" download-size="0" install-size="0" version="0.0.0"/> -->
+ <plugin
+ id="org.jboss.tools.central.themes"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
13 years, 6 months
JBoss Tools SVN: r43787 - trunk/central/plugins/org.jboss.tools.central.themes/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-18 05:07:46 -0400 (Tue, 18 Sep 2012)
New Revision: 43787
Modified:
trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF
Log:
JBIDE-12552: Make bundle a singleton since it has extensions
Modified: trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF 2012-09-18 08:54:02 UTC (rev 43786)
+++ trunk/central/plugins/org.jboss.tools.central.themes/META-INF/MANIFEST.MF 2012-09-18 09:07:46 UTC (rev 43787)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Themes
-Bundle-SymbolicName: org.jboss.tools.central.themes
+Bundle-SymbolicName: org.jboss.tools.central.themes;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.jboss.tools.central.themes.Activator
Bundle-Vendor: JBoss, by Red Hat
13 years, 6 months
JBoss Tools SVN: r43786 - trunk/build/target-platforms/multiple.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-18 04:54:02 -0400 (Tue, 18 Sep 2012)
New Revision: 43786
Modified:
trunk/build/target-platforms/multiple/multiple.target
Log:
JBIDE-12566: Composite target-platform
Modified: trunk/build/target-platforms/multiple/multiple.target
===================================================================
--- trunk/build/target-platforms/multiple/multiple.target 2012-09-18 08:38:25 UTC (rev 43785)
+++ trunk/build/target-platforms/multiple/multiple.target 2012-09-18 08:54:02 UTC (rev 43786)
@@ -10,7 +10,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/juno/SR0a/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20120526..."/>
<!-- for these IUs we need multiple versions -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
@@ -21,10 +21,9 @@
<unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
- <unit id="javax.servlet" version="2.5.0.v200910301333"/>
+ <unit id="javax.servlet" version="2.5.0.v201103041518"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
- <!-- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/> -->
- <unit id="javax.servlet.jsp" version="2.0.0.v200806031607"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl" version="1.5.1.v201012040544"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
@@ -40,21 +39,6 @@
<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
- <!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
- <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
- <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
- <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
- <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
-
<!-- Orbit bundles -->
<unit id="javax.activation" version="1.1.0.v201108011116"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
@@ -75,6 +59,41 @@
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="3.5.0.v20120319-2345"/>
+ <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
+ <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
+ <unit id="javax.ejb" version="3.1.1.v201204261316"/>
+ <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+ <unit id="javax.el" version="2.2.0.v201108011116"/>
+ <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+ </location>
+
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120..."/>
+
+ <!-- m2e, m2e-wtp + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
+ <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+ <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
+ <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
+ </location>
+
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/juno/20120905-1..."/>
+
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
+
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.6.0.v20120328-0001-37708s734E377I3B4C2"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.6.0.v20120328-0001-479-9oB56N5BBR6LCA6"/>
@@ -133,14 +152,6 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.1.v20120814-120134-7IAPA8BrHQicRz-uqOwIfyKe6z01"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.1.v20120814-104528-7c7vFixFFt6Zr5aB7PM0LGWSd"/>
<unit id="org.eclipse.help.feature.group" version="1.4.1.v20120726-051048-8R7xFOUFLWUl7MoRL__LBXl27"/>
- <!-- update.ui is on the 3.8 site, not the 4.2 site -->
- <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
- <!-- there are two versions of this IU -
- 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
- 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
- -->
- <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
- <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
<!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.10.1.v201208161415-7707FCcNBHLCgLUEdUb"/>
@@ -177,6 +188,7 @@
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.10.1.v201208161415-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
<!-- RSE, TM -->
<unit id="org.eclipse.rse.feature.group" version="3.4.0.201205300905-7L7IFBV83omxZWwIDyHWipb2Sz-f"/>
@@ -193,61 +205,6 @@
<unit id="org.eclipse.tm.terminal.feature.group" version="3.2.0.201205300905-41-312316411A16"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201205300905-308Z312316411A16"/>
- <!-- WTP -->
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
- <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
- <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
- <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
- <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
- <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
- <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
- <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
- <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
- <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
- <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
- <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
- <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
- <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVwFE9LeAJKuz0oawQtyivz-0sSxz003877"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX4qvgnXz0LZCANyQ0Tu--0sw0wF"/>
- <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
- <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjItPz-R0QS"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJuQz00S1RT"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
- <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
- <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
- <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLiq_snjZB2o"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9hKl7gJbS"/>
- <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
- <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
- <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
- <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwiRz011T2"/>
- <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
-
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.400.v20120522-1148"/>
<unit id="org.eclipse.jsch.core" version="1.1.400.v20120522-1148"/>
@@ -265,7 +222,6 @@
<unit id="org.eclipse.mylyn.commons.ui" version="3.8.1.v20120725-0100"/>
<unit id="org.eclipse.mylyn.commons.net" version="3.8.1.v20120725-0100"/>
<unit id="org.eclipse.mylyn.commons.screenshots" version="3.8.1.v20120725-0100"/>
-
<!-- JBDS-1904, JBIDE-9351, JBIDE-10094 add mylyn and jira to JBT/JBDS TP -->
<unit id="org.eclipse.mylyn_feature.feature.group" version="3.8.1.v20120725-0100"/>
<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.8.1.v20120725-0100"/>
@@ -291,6 +247,39 @@
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.1.v20120725-0100"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.1.v20120725-0100"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.1.v20120725-0100"/>
+
+ <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
+ <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
+ <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
+ <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
+ <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
+ <unit id="org.eclipse.osgi" version="3.8.1.v20120824-123705"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
+ <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
+ <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
+ <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
+ <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
+ <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
+ </location>
+
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/eclipse/M201208..."/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
+ </location>
+
+
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/atlassian/3.0.6..."/>
+
<unit id="com.atlassian.connector.commons" version="4.0.0.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.6.v20120628"/>
@@ -314,55 +303,101 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
<!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
- <unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
- <unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
- <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
- <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
- <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
- <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
- <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
- <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
- <unit id="org.eclipse.osgi" version="3.8.1.v20120824-123705"/>
- <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
- <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
- <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
- <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
- <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
- <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
- <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
- <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
- <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
- <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
- <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
+
<unit id="org.jdom_jaxen" version="1.0.0.20081203-1100"/>
- <unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
- <unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
- <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
- <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
- <unit id="javax.ejb" version="3.1.1.v201204261316"/>
- <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+ <unit id="org.mortbay.jetty.server" version="6.1.23.v201004211559"/>
+ <unit id="org.mortbay.jetty.util" version="6.1.23.v201004211559"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
- <unit id="javax.el" version="2.2.0.v201108011116"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools/M-3.4...."/>
+
+ <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
+
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+
+ <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
+ <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
+ <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
+ <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
+ <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
+ <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
+ <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
+ <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVwFE9LeAJKuz0oawQtyivz-0sSxz003877"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX4qvgnXz0LZCANyQ0Tu--0sw0wF"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
+
+ <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjItPz-R0QS"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJuQz00S1RT"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
+ <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
+ <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLiq_snjZB2o"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9hKl7gJbS"/>
+ <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
+ <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
+ <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
+ <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwiRz011T2"/>
+ <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
+ </location>
+
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot/2.0.5/"/>
<!-- SWTBot -->
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/birt/4.2.1.v201..."/>
<!-- BIRT -->
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.2.1.v20120820-793187qD_Cz0RBQLXOVGu3BTF-Oc"/>
<unit id="org.eclipse.birt.feature.group" version="4.2.1.v20120820-ChBG8RGYgRQlJ7iVBW4z0tnDWYPt"/>
<unit id="org.eclipse.birt.integration.wtp.feature.group" version="4.2.1.v20120904-1129-5107w31231A150223A"/>
<unit id="org.eclipse.birt.chart.feature.group" version="4.2.1.v20120820-828i7DFQCnvK_6tK4mbB8"/>
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.1.v20120904-1129-5107w31231A150223A"/>
+ </location>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/3.1.0.v2012..."/>
<!-- GWT/GPE dependencies (include only those which are EPL or other OSS licensed!) -->
<unit id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.1.0.v201208080121-rel-r42"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201208080121-rel-r42"/>
</location>
+
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
</target>
13 years, 6 months
JBoss Tools SVN: r43785 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-18 04:38:25 -0400 (Tue, 18 Sep 2012)
New Revision: 43785
Modified:
trunk/build/parent/pom.xml
Log:
JBIDE-12565: update profiles in parent pom.
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-09-18 08:05:25 UTC (rev 43784)
+++ trunk/build/parent/pom.xml 2012-09-18 08:38:25 UTC (rev 43785)
@@ -21,10 +21,10 @@
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
<platformSystemProperties></platformSystemProperties>
- <applejdkProperties></applejdkProperties>
-
+ <applejdkProperties></applejdkProperties>
+
<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
-
+
<swtbot.test.skip>true</swtbot.test.skip>
<!-- Used to install 3rd-party runtimes for testing -->
<skipRequirements>${skipTests}</skipRequirements>
@@ -33,15 +33,10 @@
<skipPrivateRequirements>true</skipPrivateRequirements>
<requirementsDirectory>${project.build.directory}/requirements</requirementsDirectory>
<!-- Tests Timeout in seconds -->
- <surefire.timeout>2400</surefire.timeout>
+ <surefire.timeout>2400</surefire.timeout>
<!-- Default coverage filter, to be overriden when necessary -->
<coverage.filter>org.jboss.tools.*</coverage.filter>
- <!-- target files available for building: multiple sites, 1 unified site,
- 1 local mirrored site -->
- <target.platform.classifier.unified>unified</target.platform.classifier.unified>
- <target.platform.classifier.local>local</target.platform.classifier.local>
-
<!-- 1a. URL of latest JBT target platform site -->
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0...</jbosstools-target-site>
@@ -50,7 +45,7 @@
<!-- TODO: see also 'hudson' profile below for other default value -->
<local.site>file:///${user.home}/.m2/jbosstools-target-platform_4.0.juno.SR0a/</local.site>
- <!-- 2a. URL of latest JBT nightly staging composite site (all the components
+ <!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
<!-- for trunk use _composite_/trunk; for 4.0_stable_branch, use _composite_/4.0.juno -->
<jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/</jbosstools-nightly-staging-composite>
@@ -70,7 +65,7 @@
<!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
<local.requirements>file:///qa/services/http/binaries/RHDS/updates/juno/</local.requirements>
- <!-- 4. published aggregate update sites go here, for consumption by QE
+ <!-- 4. published aggregate update sites go here, for consumption by QE
and downstream JBDS builds -->
<jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/trunk/</jbosstools-nightly>
<jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/trunk/</jbosstools-nightly-tests>
@@ -81,9 +76,9 @@
<!-- 5. extra requirements (for 3rd party "Extras" site) -->
<jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/juno/extras/</jboss-requirements-composite-extras-mirror>
- <!-- JBIDE-12294, JBIDE-12629 latest stable build of m2e, m2e-wtp, and m2e-apt for use with JBDS product builds -->
+ <!-- JBIDE-12294, JBIDE-12629 latest stable build of m2e, m2e-wtp, and m2e-apt for use with JBDS product builds -->
<m2e>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/20120...</m2e>
-
+
</properties>
<build>
@@ -179,9 +174,9 @@
</environments>
</configuration>
</plugin>
-
- <!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip
- To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
+
+ <!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip
+ To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
at end) -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -197,7 +192,7 @@
<!-- set useUIThread=true for regular ui tests -->
<!-- set useUIThread=false for swtbot tests -->
- <!-- TODO: add new profile to permit running against JBDS product/application
+ <!-- TODO: add new profile to permit running against JBDS product/application
for JBDS tests, against Eclipse SDK for JBT -->
<product>org.eclipse.platform.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
@@ -281,10 +276,10 @@
</executions>
</plugin>
</plugins>
-
+
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only.
+ <!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -304,9 +299,9 @@
</goals>
</pluginExecutionFilter>
<action>
- <!-- m2e doesn't know what to do with jacoco,
+ <!-- m2e doesn't know what to do with jacoco,
let's ignore it or annoying error markers appear
- see http://wiki.eclipse.org/M2E_plugin_execution_not_covered
+ see http://wiki.eclipse.org/M2E_plugin_execution_not_covered
-->
<ignore></ignore>
</action>
@@ -334,7 +329,7 @@
</configuration>
</plugin>
</plugins>
- </pluginManagement>
+ </pluginManagement>
</build>
<scm>
@@ -353,13 +348,13 @@
<profiles>
- <!-- Latest JBT work-in-progress component builds (CI builds), not yet
+ <!-- Latest JBT work-in-progress component builds (CI builds), not yet
pushed to the above nightly update site -->
<!-- disabled by default because it causes local compilation problems -->
<profile>
<id>jbosstools-nightly-staging-composite</id>
<activation>
- <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
@@ -383,7 +378,7 @@
<profile>
<id>jbosstools-nightly-staging-composite-soa-tooling</id>
<activation>
- <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
@@ -411,7 +406,7 @@
<profile>
<id>jbosstools-staging-aggregate</id>
<activation>
- <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
@@ -444,7 +439,7 @@
</repositories>
</profile>
- <!-- same contents as jboss-requirements-composite-mirror, but locally
+ <!-- same contents as jboss-requirements-composite-mirror, but locally
available (to improve network lag) -->
<profile>
<id>local.requirements</id>
@@ -466,7 +461,7 @@
</repositories>
</profile>
- <!-- same contents as jbosstools-nightly-staging-composite, but locally
+ <!-- same contents as jbosstools-nightly-staging-composite, but locally
available (to improve network lag) -->
<profile>
<id>local.composite</id>
@@ -488,10 +483,10 @@
</repositories>
</profile>
- <!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org.
- This is the superset of sites from which the TP is created. Should be disabled
+ <!-- Contains all the Eclipse.org deps, mirrored onto download.jboss.org.
+ This is the superset of sites from which the TP is created. Should be disabled
closer to GA so we're only using the TP contents exclusively. -->
- <!-- deactivated by default, because target platform should be enough to
+ <!-- deactivated by default, because target platform should be enough to
compile everything -->
<profile>
<id>jboss-requirements-composite-mirror</id>
@@ -513,7 +508,7 @@
</repositories>
</profile>
- <!-- Contains all the Third Party Extras deps. This is the superset of
+ <!-- Contains all the Third Party Extras deps. This is the superset of
sites from which the JBDS Extras site is created. -->
<profile>
<id>jboss-requirements-composite-extras-mirror</id>
@@ -535,8 +530,33 @@
</repositories>
</profile>
- <!-- Target platform file pointing at a single update site from which to
- resolve. See unified.site if you want to resolve against a site w/o using
+ <!-- Target platform file pointing at the composite target platform
+ AKA multiple.target -->
+ <profile>
+ <id>multiple.target</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools.target-platforms</groupId>
+ <artifactId>multiple</artifactId>
+ <version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version>
+ <classifier>multiple</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Target platform file pointing at a single update site from which to
+ resolve. See unified.site if you want to resolve against a site w/o using
the unified.target file -->
<profile>
<id>unified.target</id>
@@ -549,10 +569,10 @@
<configuration>
<target>
<artifact>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.target.platform</artifactId>
+ <groupId>org.jboss.tools.target-platforms</groupId>
+ <artifactId>unified</artifactId>
<version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version>
- <classifier>${target.platform.classifier.unified}</classifier>
+ <classifier>unified</classifier>
</artifact>
</target>
</configuration>
@@ -561,12 +581,12 @@
</build>
</profile>
- <!-- To use this profile, must have first created a local.target file,
- which points to a local repo. You can do this by hand or generate it from
- multiple.target using: cd ~/trunk/build/target-platform; ant See also the
- README in target-platform/ folder for additional usage examples. You can
- also run `ant help`. If you want to build the target-platform/pom.xml AND
- generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
+ <!-- To use this profile, must have first created a local.target file,
+ which points to a local repo. You can do this by hand or generate it from
+ multiple.target using: cd ~/trunk/build/target-platform; ant See also the
+ README in target-platform/ folder for additional usage examples. You can
+ also run `ant help`. If you want to build the target-platform/pom.xml AND
+ generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
mvn clean install -Pget.local.target -f /path/to/target-platform/pom.xml -->
<profile>
<id>local.target</id>
@@ -579,10 +599,10 @@
<configuration>
<target>
<artifact>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.target.platform</artifactId>
+ <groupId>org.jboss.tools.target-platofms</groupId>
+ <artifactId>local</artifactId>
<version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version>
- <classifier>${target.platform.classifier.local}</classifier>
+ <classifier>local</classifier>
</artifact>
</target>
</configuration>
@@ -591,8 +611,8 @@
</build>
</profile>
- <!-- if you have a local repo mirror of the unified.site, you can use this
- profile with the -Dlocal.site=file:///path/to/repo to resolve dependencies
+ <!-- if you have a local repo mirror of the unified.site, you can use this
+ profile with the -Dlocal.site=file:///path/to/repo to resolve dependencies
without needing to use a local.site file -->
<profile>
<id>local.site</id>
@@ -656,7 +676,7 @@
</repository>
</repositories>
</profile>
-
+
<profile>
<id>hudson</id>
<activation>
@@ -887,7 +907,7 @@
<id>jboss-staging-repository</id>
<name>JBoss Staging Repository</name>
<uniqueVersion>false</uniqueVersion>
- <url>https://repository.jboss.org/nexus/content/groups/staging/</url>
+ <url>https://repository.jboss.org/nexus/content/groups/staging/</url>
</repository>
</distributionManagement>
</project>
13 years, 6 months
JBoss Tools SVN: r43784 - trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-18 04:05:25 -0400 (Tue, 18 Sep 2012)
New Revision: 43784
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java
Log:
JBIDE-12563 npe bug
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2012-09-18 07:21:17 UTC (rev 43783)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2012-09-18 08:05:25 UTC (rev 43784)
@@ -156,11 +156,15 @@
private void switchListener(IStructuredSelection previousSelection, IStructuredSelection newSel) {
if( previousSelection != null ) {
- IServer s = (IServer)previousSelection.getFirstElement();
- s.removeServerListener(serverListener);
+ Object o = previousSelection.getFirstElement();
+ if( o instanceof IServer) {
+ ((IServer)o).removeServerListener(serverListener);
+ }
}
- IServer s2 = (IServer)newSel.getFirstElement();
- s2.addServerListener(serverListener);
+ Object newSel1 = newSel.getFirstElement();
+ if( newSel1 instanceof IServer) {
+ ((IServer)newSel1).addServerListener(serverListener);
+ }
}
public void perform(final IServer server) {
13 years, 6 months
JBoss Tools SVN: r43783 - in trunk/build/target-platforms: unified and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-18 03:21:17 -0400 (Tue, 18 Sep 2012)
New Revision: 43783
Modified:
trunk/build/target-platforms/local/pom.xml
trunk/build/target-platforms/unified/pom.xml
Log:
JBIDE-12565: Fix typo in pom
Modified: trunk/build/target-platforms/local/pom.xml
===================================================================
--- trunk/build/target-platforms/local/pom.xml 2012-09-18 06:00:17 UTC (rev 43782)
+++ trunk/build/target-platforms/local/pom.xml 2012-09-18 07:21:17 UTC (rev 43783)
@@ -72,7 +72,7 @@
<include>multiple.target</include>
</includes>
<stylesheet>multiple2local.xsl</stylesheet>
- <outputDir>${project.build.directory}/local</outputDir>
+ <outputDir>${project.build.directory}/${project.artifactId}</outputDir>
<outputProperties>
<outputPropertie>
<name>indent</name>
@@ -103,7 +103,7 @@
</goals>
<configuration>
<targetFiles>
- <param>${project.build.directory}/local/multiple.target</param>
+ <param>${project.build.directory}/${project.artifactId}/multiple.target</param>
</targetFiles>
<failOnError>true</failOnError>
</configuration>
@@ -124,7 +124,7 @@
<configuration>
<artifacts>
<artifact>
- <file>${project.build.directory}/local/multiple.target</file>
+ <file>${project.build.directory}/${project.artifactId}/multiple.target</file>
<type>target</type>
<classifier>local</classifier>
</artifact>
Modified: trunk/build/target-platforms/unified/pom.xml
===================================================================
--- trunk/build/target-platforms/unified/pom.xml 2012-09-18 06:00:17 UTC (rev 43782)
+++ trunk/build/target-platforms/unified/pom.xml 2012-09-18 07:21:17 UTC (rev 43783)
@@ -59,7 +59,7 @@
<include>multiple.target</include>
</includes>
<stylesheet>multiple2unified.xsl</stylesheet>
- <outputDir>${project.build.directory}/outputTarget</outputDir>
+ <outputDir>${project.build.directory}/${project.artifactId}</outputDir>
<outputProperties>
<outputPropertie>
<name>indent</name>
@@ -90,7 +90,7 @@
</goals>
<configuration>
<targetFiles>
- <param>${project.build.directory}/outputTarget/multiple.target</param>
+ <param>${project.build.directory}/${project.artifactId}/multiple.target</param>
</targetFiles>
<failOnError>true</failOnError>
</configuration>
@@ -111,7 +111,7 @@
<configuration>
<artifacts>
<artifact>
- <file>${project.build.directory}/outputTarget/mutliple.target</file>
+ <file>${project.build.directory}/${project.artifactId}/multiple.target</file>
<type>target</type>
<classifier>unified</classifier>
</artifact>
13 years, 6 months
JBoss Tools SVN: r43781 - trunk/build/publish.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-18 01:58:27 -0400 (Tue, 18 Sep 2012)
New Revision: 43781
Modified:
trunk/build/publish/publish.sh
Log:
JBIDE-8667 after publishing a new build, call jbosstools-cleanup.sh to regen composite*.xml files in the builds/nightly/*/*/ folders
Modified: trunk/build/publish/publish.sh
===================================================================
--- trunk/build/publish/publish.sh 2012-09-18 05:58:19 UTC (rev 43780)
+++ trunk/build/publish/publish.sh 2012-09-18 05:58:27 UTC (rev 43781)
@@ -471,5 +471,11 @@
# purge tmpdir
rm -fr $tmpdir
+# regenerate http://download.jboss.org/jbosstools/builds/nightly/*/*/composite*.xml files for up to 5 builds, cleaning anything older than 5 days old
+wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate
+chmod +x jbosstools-cleanup.sh
+./jbosstools-cleanup.sh 5 5
+rm -f jbosstools-cleanup.sh
+
# to avoid looking for files that are still being synched/nfs-copied, wait a bit before trying to run tests (the next step usually)
sleep 15s
13 years, 6 months
JBoss Tools SVN: r43780 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-18 01:58:19 -0400 (Tue, 18 Sep 2012)
New Revision: 43780
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
stop cleaning bottests because we no longer produce them; use for loop instead of 5-6 method calls; parameterize values for numbuildstokeep and threshholdwhendelete so we can call this script from within publish/publish.sh (JBIDE-8667)
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-18 05:58:11 UTC (rev 43779)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-18 05:58:19 UTC (rev 43780)
@@ -10,6 +10,10 @@
echo "Logfile: $log" | tee -a $log
echo "" | tee -a $log
+#commandline options so we can call this by itself using `jbosstools-cleanup.sh 1 2` or call it from within publish.sh using `jbosstools-cleanup.sh 5 5`
+if [[ $1 ]] && [[ $1 -gt 0 ]]; then numbuildstokeep=$1; else numbuildstokeep=1; fi # number of builds to keep per branch
+if [[ $2 ]] && [[ $2 -gt 0 ]]; then threshholdwhendelete=$2; else threshholdwhendelete=2; fi # age at which a build is available for delete
+
getSubDirs ()
{
getSubDirsReturn="";
@@ -147,9 +151,7 @@
" >> ${fileName}
}
-clean nightly/core 1 2
-clean nightly/coretests 1 2
-clean nightly/soa-tooling 1 2
-clean nightly/soatests 1 2
-clean nightly/webtools 1 2
-clean nightly/bottests 1 2
+# now that we have all the methods and vars defined, let's do some cleaning!
+for dir in nightly/core nightly/coretests nightly/soa-tooling nightly/soatests nightly/webtools; do
+ clean $dir $numbuildstokeep $threshholdwhendelete
+done
13 years, 6 months
JBoss Tools SVN: r43779 - trunk/examples/plugins/org.jboss.tools.project.examples.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-18 01:58:11 -0400 (Tue, 18 Sep 2012)
New Revision: 43779
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml
Log:
use 4.0 instead of 3.4
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml 2012-09-18 04:36:17 UTC (rev 43778)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml 2012-09-18 05:58:11 UTC (rev 43779)
@@ -19,12 +19,12 @@
<!-- _stable_branch jobs could use this profile but the above default (last
stable milestone) is probably better -->
<profile>
- <id>3.4.juno</id>
+ <id>4.0.juno</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/nightly/core/3.4.juno/jbosst...</jboss.discovery.directory.url>
+ <jboss.discovery.directory.url>http://download.jboss.org/jbosstools/updates/nightly/core/4.0.juno/jbosst...</jboss.discovery.directory.url>
</properties>
</profile>
13 years, 6 months