Author: nickboldt Date: 2010-08-24 12:26:43 -0400 (Tue, 24 Aug 2010) New Revision: 24387 Modified: trunk/build/parent/pom.xml trunk/parent-pom.xml Log: meerge changes between build/parent/pom.xml and parent-pom.xml Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2010-08-24 16:07:07 UTC (rev 24386) +++ trunk/build/parent/pom.xml 2010-08-24 16:26:43 UTC (rev 24387) @@ -11,6 +11,7 @@ </modules> <properties> + <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion--> <tychoVersion>0.9.0</tychoVersion> <scmBranch>trunk</scmBranch> <BUILD_ALIAS>M2</BUILD_ALIAS> Modified: trunk/parent-pom.xml =================================================================== --- trunk/parent-pom.xml 2010-08-24 16:07:07 UTC (rev 24386) +++ trunk/parent-pom.xml 2010-08-24 16:26:43 UTC (rev 24387) @@ -11,8 +11,8 @@ </modules> <properties> - <tychoVersion>0.10.0-SNAPSHOT</tychoVersion> - <!--tychoVersion>0.9.0</tychoVersion--> + <!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion--> + <tychoVersion>0.9.0</tychoVersion> <scmBranch>trunk</scmBranch> <BUILD_ALIAS>M2</BUILD_ALIAS> <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> @@ -195,6 +195,18 @@ <enabled>true</enabled> </releases> </repository--> + <repository> + <id>eclipse36</id> + <url>http://download.eclipse.org/eclipse/updates/3.6.x/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> <repository> <id>jboss-helios</id> <url>http://download.jboss.org/jbosstools/updates/requirements/helios/&...