[jbosstools-commits] JBoss Tools SVN: r22488 - trunk.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Wed Jun 2 13:37:35 EDT 2010


Author: nickboldt
Date: 2010-06-02 13:37:35 -0400 (Wed, 02 Jun 2010)
New Revision: 22488

Modified:
   trunk/parent-pom.xml
Log:
port changes from helios branch to trunk

Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml	2010-06-02 17:35:23 UTC (rev 22487)
+++ trunk/parent-pom.xml	2010-06-02 17:37:35 UTC (rev 22488)
@@ -9,7 +9,6 @@
 
 	<properties>
 		<tychoVersion>0.9.0-SNAPSHOT</tychoVersion>
-		<!-- <tychoVersion>0.8.0</tychoVersion> -->
 		<scmBranch>trunk</scmBranch>
 		<BUILD_ALIAS>M1</BUILD_ALIAS>
 	</properties>
@@ -167,6 +166,157 @@
 		<url>https://jira.jboss.org/jira/secure/</url>
 	</issueManagement>
 
+	<repositories>
+		<repository>
+			<id>galileo</id>
+			<url>http://download.eclipse.org/releases/galileo/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>eclipse35</id>
+			<url>http://download.eclipse.org/eclipse/updates/3.5/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>birt25r</id>
+			<url>http://download.eclipse.org/birt/update-site/2.5</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>swtbot-galileo</id>
+			<url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
+			</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>webtools</id>
+			<url>http://download.eclipse.org/webtools/updates/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+			
+		<!--
+		<repository>
+			<id>helios</id>
+			<url>http://download.eclipse.org/releases/helios/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>webtools32</id>
+			<url>http://download.eclipse.org/webtools/repository/helios</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>eclipse36</id>
+			<url>http://download.eclipse.org/eclipse/updates/3.6/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>birt26r</id>
+			<url>http://download.eclipse.org/birt/update-site/2.6/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>birt26i</id>
+			<url>http://download.eclipse.org/birt/update-site/2.6-interim/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>swtbot-helios</id>
+			<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+			</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		-->
+		<repository>
+			<id>m2eclipse</id>
+			<url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>m2eclipse-extras</id>
+			<url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</repositories>
+
 	<profiles>
 		<!-- TODO: verify that this profile overrides the default profile if BUILD_NUMBER 
 			is set (by a Hudson job) -->
@@ -193,72 +343,6 @@
 			</build>
 		</profile>
 		<profile>
-			<id>helios</id>
-			<activation>
-				<property>
-					<name>helios</name>
-				</property>
-			</activation>
-			<repositories>
-				<repository>
-					<id>helios</id>
-					<url>http://download.eclipse.org/releases/helios/</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>webtools32</id>
-					<url>http://download.eclipse.org/webtools/repository/helios</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>eclipse36</id>
-					<url>http://download.eclipse.org/eclipse/updates/3.6/</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>birt26</id>
-					<url>http://download.eclipse.org/birt/update-site/2.6/</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>swtbot-helios</id>
-					<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site
-					</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-			</repositories>
-		</profile>
-		<profile>
 			<id>svn-repos</id>
 			<activation>
 				<property>
@@ -312,94 +396,10 @@
 						<enabled>true</enabled>
 					</releases>
 				</repository>
-
 			</repositories>
 		</profile>
 	</profiles>
 
-	<repositories>
-		<!-- TODO: add JBT nightly update site so we can build against binaries -->
-		<repository>
-			<id>galileo</id>
-			<url>http://download.eclipse.org/releases/galileo/</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>eclipse35</id>
-			<url>http://download.eclipse.org/eclipse/updates/3.5/</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>birt25r</id>
-			<url>http://download.eclipse.org/birt/update-site/2.5</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>swtbot-galileo</id>
-			<url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site
-			</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-
-		<repository>
-			<id>webtools</id>
-			<url>http://download.eclipse.org/webtools/updates/</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>m2eclipse</id>
-			<url>http://m2eclipse.sonatype.org/sites/m2e/</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>m2eclipse-extras</id>
-			<url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
-			<layout>p2</layout>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-	</repositories>
-
 	<pluginRepositories>
 		<pluginRepository>
 			<id>sonatype-maven-central</id>
@@ -446,24 +446,4 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<!-- https://issues.sonatype.org/browse/TYCHO-413: does not work - doesn't 
-		respect username & ssh key -->
-	<distributionManagement>
-		<!-- http://download.jboss.org/jbosstools/ -->
-		<!-- <repository> <id>jbosstools.internal.repo</id> <url> scp://filemgmt.jboss.org/downloads_htdocs/tools/repository/ 
-			</url> </repository> -->
-		<!-- https://sourceforge.net/projects/jboss/files/JBossTools/JBossTools3.2.x -->
-		<!-- <repository> <id>jbosstools.external.repo</id> <name>JBoss Developer 
-			Studio Repository</name> <url>scp://nickboldt,jboss@frs.sourceforge.net/home/frs/project/j/jb/jboss/JBossTools/JBossTools3.2.x/</url> 
-			</repository> -->
-
-		<!-- http://reports.qa.atl.jboss.com/binaries/RHDS/ -->
-		<!-- <repository> <id>jbds.internal.repo</id> <name>JBoss Developer Studio 
-			Repository</name> <url>scp://hudson@localhost/qa/services/http/binaries/RHDS/repository/</url> 
-			</repository> -->
-		<!-- http://devstudio.jboss.com -->
-		<!-- <repository> <id>jbds.external.repo</id> <name>JBoss Developer Studio 
-			Repository</name> <url>scp://nboldt@wallace.redhat.com/mnt/devstudio/repository/</url> 
-			</repository> -->
-	</distributionManagement>
 </project>



More information about the jbosstools-commits mailing list