JBoss Tools SVN: r43444 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 17:30:20 -0400 (Wed, 05 Sep 2012)
New Revision: 43444
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
IU renamed from org.maven.ide.eclipse.wtp.feature.feature.group to org.eclipse.m2e.wtp.feature.feature.group
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-09-05 21:28:36 UTC (rev 43443)
+++ trunk/build/target-platform/multiple.target 2012-09-05 21:30:20 UTC (rev 43444)
@@ -41,7 +41,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-09-05 21:28:36 UTC (rev 43443)
+++ trunk/build/target-platform/unified.target 2012-09-05 21:30:20 UTC (rev 43444)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
-<target includeMode="feature" name="e42-wtp34">
+<target includeMode="feature" name="e42-wtp34-jbds6">
<!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
@@ -7,10 +7,9 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
- <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <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 -->
- <!-- for trunk use _composite_/core/trunk; for 4.0_stable_branch, use _composite_/core/4.0.juno -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0..."/>
<!-- for these IUs we need multiple versions -->
@@ -42,7 +41,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
11 years, 9 months
JBoss Tools SVN: r43443 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 17:28:36 -0400 (Wed, 05 Sep 2012)
New Revision: 43443
Modified:
trunk/build/target-platform/jbds.target
Log:
IU renamed from org.maven.ide.eclipse.wtp.feature.feature.group to org.eclipse.m2e.wtp.feature.feature.group
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-09-05 20:34:49 UTC (rev 43442)
+++ trunk/build/target-platform/jbds.target 2012-09-05 21:28:36 UTC (rev 43443)
@@ -41,7 +41,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201206251206"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
11 years, 9 months
JBoss Tools SVN: r43442 - in trunk/download.jboss.org/jbosstools/updates/requirements: emf and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 16:34:49 -0400 (Wed, 05 Sep 2012)
New Revision: 43442
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/egit/README.depr...
trunk/download.jboss.org/jbosstools/updates/requirements/emf/README.depre...
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/README.dep...
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml....
Log:
add deprecation markers
Added: trunk/download.jboss.org/jbosstools/updates/requirements/egit/README.depr...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/egit/README.depr... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/egit/README.depr... 2012-09-05 20:34:49 UTC (rev 43442)
@@ -0,0 +1 @@
+builder now deprecated; content included in Juno
Added: trunk/download.jboss.org/jbosstools/updates/requirements/emf/README.depre...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/emf/README.depre... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/emf/README.depre... 2012-09-05 20:34:49 UTC (rev 43442)
@@ -0,0 +1 @@
+builder now deprecated; content included in Juno
Added: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/README.dep...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/README.dep... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/README.dep... 2012-09-05 20:34:49 UTC (rev 43442)
@@ -0,0 +1 @@
+builder now deprecated; content included in Juno
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml (from rev 43441, trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml....)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2012-09-05 20:34:49 UTC (rev 43442)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="nothing-to-do">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo
+ -->
+
+ <target name="nothing-to-do">
+ <echo>Mylyn content is all on the Juno site except the Atlassian connectors for JIRA, CVS, Subclipse/Subversive.
+Therefore there is no need to produce this mirror any more. See ../atlassian/build.xml</echo>
+ </target>
+
+ <target name="mirror">
+ <!-- core mylyn, if not on Indigo site; includes Bugzilla -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
+ <property name="URL1" value="http://download.eclipse.org/mylyn/releases/latest" />
+ <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
+ <!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
+ <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.8" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.8.1.v20120725-0100/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.8.1.v20120725-0100" name="Mylyn 3.8.1.v20120725-0100" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+
+ <iu id="org.eclipse.mylyn_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.compatibility.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.repositories.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" />
+ <iu id="org.eclipse.mylyn.context_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.discovery.feature.group" />
+
+ <iu id="org.eclipse.mylyn.ide_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.java_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.pde_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.team_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.versions.feature.group" />
+ <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.cvs.feature.group" />
+ <iu id="org.eclipse.mylyn.git.feature.group" />
+
+ <iu id="com.atlassian.connector.eclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.jira.feature.group" />
+ <!-- these last two are described as "obsolete" on the update site -->
+ <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.8.1.v20120725-0100/" artifactRepository="file:${destination}/3.8.1.v20120725-0100/" publishartifacts="true" source="${destination}/3.8.1.v20120725-0100/" compress="${compress}" />
+ </target>
+</project>
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml.... 2012-09-05 20:26:33 UTC (rev 43441)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml.... 2012-09-05 20:34:49 UTC (rev 43442)
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="nothing-to-do">
- <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-
- -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
- -consoleLog -nosplash -data /tmp
- -application org.eclipse.ant.core.antRunner
- -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml"
-
- or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
-
- export JAVA_HOME=/opt/jdk1.6.0; \
- ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
- <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
- -application org.eclipse.ant.core.antRunner \
- -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo
- -->
-
- <target name="nothing-to-do">
- <echo>Mylyn content is all on the Juno site except the Atlassian connectors for JIRA, CVS, Subclipse/Subversive.
-Therefore there is no need to produce this mirror any more. See ../atlassian/build.xml</echo>
- </target>
-
- <target name="mirror">
- <!-- core mylyn, if not on Indigo site; includes Bugzilla -->
- <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
- <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
- <property name="URL1" value="http://download.eclipse.org/mylyn/releases/latest" />
- <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
- <!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.8" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.8.1.v20120725-0100/" />
- <property name="compress" value="true" />
-
- <p2.mirror>
- <repository location="file:${destination}/3.8.1.v20120725-0100" name="Mylyn 3.8.1.v20120725-0100" />
- <source>
- <repository location="${URL1}" />
- <repository location="${URL2}" />
- </source>
-
- <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
-
- <iu id="org.eclipse.mylyn_feature.feature.group" />
-
- <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
- <iu id="org.eclipse.mylyn.commons.compatibility.feature.group" />
- <iu id="org.eclipse.mylyn.commons.feature.group" />
- <iu id="org.eclipse.mylyn.commons.repositories.feature.group" />
- <iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" />
- <iu id="org.eclipse.mylyn.context_feature.feature.group" />
- <iu id="org.eclipse.mylyn.discovery.feature.group" />
-
- <iu id="org.eclipse.mylyn.ide_feature.feature.group" />
- <iu id="org.eclipse.mylyn.java_feature.feature.group" />
- <iu id="org.eclipse.mylyn.pde_feature.feature.group" />
- <iu id="org.eclipse.mylyn.team_feature.feature.group" />
- <iu id="org.eclipse.mylyn.versions.feature.group" />
- <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
-
- <iu id="org.eclipse.mylyn.cvs.feature.group" />
- <iu id="org.eclipse.mylyn.git.feature.group" />
-
- <iu id="com.atlassian.connector.eclipse.feature.group" />
- <iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
- <iu id="com.atlassian.connector.eclipse.jira.feature.group" />
- <!-- these last two are described as "obsolete" on the update site -->
- <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
- <iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.8.1.v20120725-0100/" artifactRepository="file:${destination}/3.8.1.v20120725-0100/" publishartifacts="true" source="${destination}/3.8.1.v20120725-0100/" compress="${compress}" />
- </target>
-</project>
11 years, 9 months
JBoss Tools SVN: r43440 - in trunk/download.jboss.org/jbosstools/updates/requirements: gwt and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 16:01:32 -0400 (Wed, 05 Sep 2012)
New Revision: 43440
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
Log:
update builders for birt 2.4.1, gwt 3.1, and m2e/m2e-wtp 1.2/0.16
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml 2012-09-05 20:00:06 UTC (rev 43439)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/birt/build.xml 2012-09-05 20:01:32 UTC (rev 43440)
@@ -23,12 +23,13 @@
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/birt/update-site/4.2/" />
+ <!-- <property name="URL" value="http://download.eclipse.org/birt/update-site/4.2/" /> -->
+ <property name="URL" value="http://download.eclipse.org/birt/update-site/4.2-interim/" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/birt/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/4.2.0.v20120613/" name="BIRT 4.2.0.v20120613 (Chart + WTP support only)" />
+ <repository location="file:${destination}/4.2.1.v20120904/" name="BIRT 4.2.1.v20120904 (Chart + WTP support only)" />
<source>
<repository location="${URL}" />
</source>
@@ -43,9 +44,9 @@
</p2.mirror>
<delete>
- <fileset dir="${destination}/4.2.0.v20120613/" includes="**/artifacts.jar, **/contents.jar"/>
+ <fileset dir="${destination}/4.2.1.v20120904/" includes="**/artifacts.jar, **/contents.jar"/>
</delete>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.2.0.v20120613/" artifactRepository="file:${destination}/4.2.0.v20120613/" publishartifacts="true" source="${destination}/4.2.0.v20120613/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/4.2.1.v20120904/" artifactRepository="file:${destination}/4.2.1.v20120904/" publishartifacts="true" source="${destination}/4.2.1.v20120904/" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2012-09-05 20:00:06 UTC (rev 43439)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2012-09-05 20:01:32 UTC (rev 43440)
@@ -19,13 +19,13 @@
<property name="URL" value="http://dl.google.com/eclipse/plugin/4.2/"/>
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/gwt/" />
<property name="compress" value="true" />
-
<p2.mirror>
- <repository location="file:${destination}/3.0.1.v201206290132-rel-r42" name="Google Plugin for Eclipse 4.2" />
+ <repository location="file:${destination}/3.1.0.v201208080121-rel-r42" name="Google Plugin for Eclipse 4.2" />
<source>
<repository location="${URL}" />
</source>
- <!-- JBDS-1737: GPE and GWT SDK -->
+ <!-- Google App Engine Tools for Android 3.1.0.v201208080121-rel-r42
+ Google Web Toolkit SDK 2.4.0 2.4.0.v201208080121-rel-r42 -->
<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group"/>
<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group"/>
@@ -39,6 +39,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.0.1.v201206290132-rel-r42" artifactRepository="file:${destination}/3.0.1.v201206290132-rel-r42" publishartifacts="true" source="${destination}/3.0.1.v201206290132-rel-r42" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.1.0.v201208080121-rel-r42" artifactRepository="file:${destination}/3.1.0.v201208080121-rel-r42" publishartifacts="true" source="${destination}/3.1.0.v201208080121-rel-r42" compress="${compress}" />
</target>
</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-09-05 20:00:06 UTC (rev 43439)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-09-05 20:01:32 UTC (rev 43440)
@@ -16,10 +16,11 @@
-f ~/RHDS/updates/requirements/m2eclipse/build.xml -Ddestination=/tmp/m2eclipse-repo
-->
<target name="mirror">
- <property name="URL1" value="http://download.eclipse.org/technology/m2e/releases/"/>
+ <!-- <property name="URL1" value="http://download.eclipse.org/technology/m2e/releases/"/> -->
+ <property name="URL1" value="http://download.eclipse.org/technology/m2e/milestones/1.2/1.2.0.20120903-..."/>
<property name="URL2" value="https://repository.sonatype.org/content/repositories/forge-sites/m2e-extr..."/>
- <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
+ <property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-w..."/> <!-- 0.16 -->
<property name="URL4" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-j..."/>
<property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
@@ -27,7 +28,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/20120627-1400" name="m2e 1.1, m2e-extras 0.15, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0, m2e-apt 1.0 (mirrored 20120627-1400)" />
+ <repository location="file:${destination}/20120905-1550" name="m2e 1.2, m2e-extras 0.15, m2e-wtp 0.16, m2e-jdt-compiler 1.0, m2e-apt 1.0 (mirrored 20120905-1550)" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -39,7 +40,7 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120627-1400/" artifactRepository="file:${destination}/20120627-1400/"
- publishartifacts="true" source="${destination}/20120627-1400/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120905-1550/" artifactRepository="file:${destination}/20120905-1550/"
+ publishartifacts="true" source="${destination}/20120905-1550/" compress="${compress}" />
</target>
</project>
11 years, 9 months
JBoss Tools SVN: r43439 - in trunk/download.jboss.org/jbosstools/updates/juno: SR0a and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 16:00:06 -0400 (Wed, 05 Sep 2012)
New Revision: 43439
Added:
trunk/download.jboss.org/jbosstools/updates/juno/SR0a/
trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeContent.xml
Log:
new Juno SR0a site (preview of upcoming SR1 site next month)
Added: trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeArtifacts.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeArtifacts.xml 2012-09-05 20:00:06 UTC (rev 43439)
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Juno SR0a Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1346873920000'/>
+</properties>
+<children size='13'>
+<!-- new for Juno SR1 -->
+<child location='../../requirements/juno/201209031953-M/'/>
+<child location='../../requirements/birt/4.2.1.v20120904/'/>
+<child location='../../requirements/eclipse/M20120829-1200/'/>
+<child location='../../requirements/webtools/M-3.4.1-20120831042944/'/>
+<child location='../../requirements/gwt/3.1.0.v201208080121-rel-r42/'/>
+<!-- includes m2e 1.2, m2e-extras 0.15, m2e-wtp 0.16, m2e-jdt-compiler 1.0, m2e-apt 1.0 -->
+<child location='../../requirements/m2eclipse/20120905-1550/'/>
+
+<!-- latest integration build -->
+<child location='../../requirements/m2eclipse/m2e-wtp-juno/'/>
+
+<!-- same atlassian version in SR0 -->
+<child location='../../requirements/atlassian/3.0.6.v20120628/'/>
+
+<!-- Added for JBDS theming -->
+<child location='../../requirements/chrome-theme/1.5/'/>
+
+<!-- unchanged since Indigo -->
+<child location='../../requirements/swtbot/2.0.5/'/>
+<child location='../../requirements/xulrunner-1.9.2/'/>
+<!-- need newer orbit for javax.servlet 3.0 -->
+<child location='../../requirements/orbit/R20120526062928/'/>
+<!-- need older orbit for javax.servlet 2.5 -->
+<child location='../../requirements/orbit/R20100519200754/'/>
+
+<!-- 20120905 nboldt: removed to see if we still need this
+<child location='../../requirements/ecf/3.5.6/'/> -->
+
+</children>
+</repository>
+
Added: trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeContent.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/SR0a/compositeContent.xml 2012-09-05 20:00:06 UTC (rev 43439)
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Juno SR0a Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1346873920000'/>
+</properties>
+<children size='13'>
+<!-- new for Juno SR1 -->
+<child location='../../requirements/juno/201209031953-M/'/>
+<child location='../../requirements/birt/4.2.1.v20120904/'/>
+<child location='../../requirements/eclipse/M20120829-1200/'/>
+<child location='../../requirements/webtools/M-3.4.1-20120831042944/'/>
+<child location='../../requirements/gwt/3.1.0.v201208080121-rel-r42/'/>
+<!-- includes m2e 1.2, m2e-extras 0.15, m2e-wtp 0.16, m2e-jdt-compiler 1.0, m2e-apt 1.0 -->
+<child location='../../requirements/m2eclipse/20120905-1550/'/>
+
+<!-- latest integration build -->
+<child location='../../requirements/m2eclipse/m2e-wtp-juno/'/>
+
+<!-- same atlassian version in SR0 -->
+<child location='../../requirements/atlassian/3.0.6.v20120628/'/>
+
+<!-- Added for JBDS theming -->
+<child location='../../requirements/chrome-theme/1.5/'/>
+
+<!-- unchanged since Indigo -->
+<child location='../../requirements/swtbot/2.0.5/'/>
+<child location='../../requirements/xulrunner-1.9.2/'/>
+<!-- need newer orbit for javax.servlet 3.0 -->
+<child location='../../requirements/orbit/R20120526062928/'/>
+<!-- need older orbit for javax.servlet 2.5 -->
+<child location='../../requirements/orbit/R20100519200754/'/>
+
+<!-- 20120905 nboldt: removed to see if we still need this
+<child location='../../requirements/ecf/3.5.6/'/> -->
+
+</children>
+</repository>
+
11 years, 9 months
JBoss Tools SVN: r43438 - trunk/download.jboss.org/jbosstools/updates/requirements/mylyn.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-05 15:59:57 -0400 (Wed, 05 Sep 2012)
New Revision: 43438
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml....
Removed:
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
Log:
rename mylyn/build.xml to mylyn/build.xml.DEPRECATED.ALL.CONTENT.ELSEWHERE
Deleted: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2012-09-05 19:59:48 UTC (rev 43437)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2012-09-05 19:59:57 UTC (rev 43438)
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="nothing-to-do">
- <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-
- -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
- -consoleLog -nosplash -data /tmp
- -application org.eclipse.ant.core.antRunner
- -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml"
-
- or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
-
- export JAVA_HOME=/opt/jdk1.6.0; \
- ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
- <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
- -application org.eclipse.ant.core.antRunner \
- -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo
- -->
-
- <target name="nothing-to-do">
- <echo>Mylyn content is all on the Juno site except the Atlassian connectors for JIRA, CVS, Subclipse/Subversive.
-Therefore there is no need to produce this mirror any more. See ../atlassian/build.xml</echo>
- </target>
-
- <target name="mirror">
- <!-- core mylyn, if not on Indigo site; includes Bugzilla -->
- <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
- <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
- <property name="URL1" value="http://download.eclipse.org/mylyn/releases/latest" />
- <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
- <!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.7" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.8.0.v20120612-0600/" />
- <property name="compress" value="true" />
-
- <p2.mirror>
- <repository location="file:${destination}/3.8.0.v20120612-0600" name="Mylyn 3.8.0.v20120612-0600" />
- <source>
- <repository location="${URL1}" />
- <repository location="${URL2}" />
- </source>
-
- <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
-
- <iu id="org.eclipse.mylyn_feature.feature.group" />
-
- <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
- <iu id="org.eclipse.mylyn.commons.compatibility.feature.group" />
- <iu id="org.eclipse.mylyn.commons.feature.group" />
- <iu id="org.eclipse.mylyn.commons.repositories.feature.group" />
- <iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" />
- <iu id="org.eclipse.mylyn.context_feature.feature.group" />
- <iu id="org.eclipse.mylyn.discovery.feature.group" />
-
- <iu id="org.eclipse.mylyn.ide_feature.feature.group" />
- <iu id="org.eclipse.mylyn.java_feature.feature.group" />
- <iu id="org.eclipse.mylyn.pde_feature.feature.group" />
- <iu id="org.eclipse.mylyn.team_feature.feature.group" />
- <iu id="org.eclipse.mylyn.versions.feature.group" />
- <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
-
- <iu id="org.eclipse.mylyn.cvs.feature.group" />
- <iu id="org.eclipse.mylyn.git.feature.group" />
-
- <iu id="com.atlassian.connector.eclipse.feature.group" />
- <iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
- <iu id="com.atlassian.connector.eclipse.jira.feature.group" />
- <!-- these last two are described as "obsolete" on the update site -->
- <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
- <iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
- </p2.mirror>
-
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.8.0.v20120612-0600/" artifactRepository="file:${destination}/3.8.0.v20120612-0600/" publishartifacts="true" source="${destination}/3.8.0.v20120612-0600/" compress="${compress}" />
- </target>
-</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml.... (from rev 43437, trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml.... 2012-09-05 19:59:57 UTC (rev 43438)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="nothing-to-do">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo
+ -->
+
+ <target name="nothing-to-do">
+ <echo>Mylyn content is all on the Juno site except the Atlassian connectors for JIRA, CVS, Subclipse/Subversive.
+Therefore there is no need to produce this mirror any more. See ../atlassian/build.xml</echo>
+ </target>
+
+ <target name="mirror">
+ <!-- core mylyn, if not on Indigo site; includes Bugzilla -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/" /> -->
+ <property name="URL1" value="http://download.eclipse.org/mylyn/releases/latest" />
+ <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
+ <!-- <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.6/" /> -->
+ <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.8" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.8.1.v20120725-0100/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.8.1.v20120725-0100" name="Mylyn 3.8.1.v20120725-0100" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+
+ <iu id="org.eclipse.mylyn_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.compatibility.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.repositories.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.repositories.http.feature.group" />
+ <iu id="org.eclipse.mylyn.context_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.discovery.feature.group" />
+
+ <iu id="org.eclipse.mylyn.ide_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.java_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.pde_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.team_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.versions.feature.group" />
+ <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.cvs.feature.group" />
+ <iu id="org.eclipse.mylyn.git.feature.group" />
+
+ <iu id="com.atlassian.connector.eclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.jira.feature.group" />
+ <!-- these last two are described as "obsolete" on the update site -->
+ <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.8.1.v20120725-0100/" artifactRepository="file:${destination}/3.8.1.v20120725-0100/" publishartifacts="true" source="${destination}/3.8.1.v20120725-0100/" compress="${compress}" />
+ </target>
+</project>
11 years, 9 months
JBoss Tools SVN: r43436 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test: view and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-05 14:58:32 -0400 (Wed, 05 Sep 2012)
New Revision: 43436
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
Log:
set timeout for waitUntil methods
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-09-05 18:57:33 UTC (rev 43435)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-09-05 18:58:32 UTC (rev 43436)
@@ -21,6 +21,7 @@
import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.condition.TreeItemContainsNode;
import org.jboss.tools.ui.bot.ext.helper.TreeHelper;
import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
@@ -108,7 +109,7 @@
}
private SWTBotTreeItem getArchive(String archive) {
- bot.waitUntil(new TreeItemContainsNode(explorer, archive));
+ bot.waitUntil(new TreeItemContainsNode(explorer, archive), Timing.time5S());
return explorer.getNode(archive);
}
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-09-05 18:57:33 UTC (rev 43435)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-09-05 18:58:32 UTC (rev 43436)
@@ -24,6 +24,7 @@
import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.UserLibrariesFilesetDialog;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.condition.TreeContainsNode;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.JBossToolsProjectarchives;
import org.jboss.tools.ui.bot.ext.helper.TreeHelper;
@@ -117,7 +118,7 @@
}
private SWTBotTreeItem getArchive(String... pathToArchive) {
- bot.waitUntil(new TreeContainsNode(viewTree, pathToArchive));
+ bot.waitUntil(new TreeContainsNode(viewTree, pathToArchive), Timing.time5S());
return TreeHelper.expandNode(this.bot(), pathToArchive);
}
11 years, 9 months