[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[bpel-commits] nickb org.eclipse.bpel/parent pom.xml

Update of /cvsroot/technology/org.eclipse.bpel/parent
In directory dev2:/tmp/cvs-serv8769/parent

Modified Files:
	pom.xml 
Log Message:
comment out all the JBT parent pom cruft (not needed); enable http://download.eclipse.org/releases/helios/

Index: pom.xml
===================================================================
RCS file: /cvsroot/technology/org.eclipse.bpel/parent/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pom.xml	2 May 2011 23:49:48 -0000	1.6
+++ pom.xml	3 May 2011 15:30:56 -0000	1.7
@@ -52,33 +52,12 @@
 				<configuration>
 					<resolver>p2</resolver>
 					<ignoreTychoRepositories>true</ignoreTychoRepositories>
-					<environments>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>carbon</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
+					<!-- NOT NEEDED? <environments> <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> 
+						</environment> <environment> <os>macosx</os> <ws>carbon</ws> <arch>x86</arch> 
+						</environment> <environment> <os>win32</os> <ws>win32</ws> <arch>x86</arch> 
+						</environment> <environment> <os>linux</os> <ws>gtk</ws> <arch>x86</arch> 
+						</environment> <environment> <os>linux</os> <ws>gtk</ws> <arch>x86_64</arch> 
+						</environment> </environments> -->
 				</configuration>
 			</plugin>
 
@@ -213,154 +192,33 @@
 			To enable it use -P helios-no-target in command line. Do not remove repos 
 			that contains the same artefacts, it is done for purpose to make build more 
 			stable in case one of the repos is offline. -->
-		<profile>
-			<id>helios-no-target</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</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>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>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>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>
-				<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>
-
-				<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>emf26</id>
-					<url>http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201006141136/
-					</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-
-				<repository>
-					<id>gef</id>
-					<url>http://download.eclipse.org/tools/gef/updates
-					</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-
-			</repositories>
-		</profile>
-
-		<profile>
-			<id>helios-maintenance-no-target</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>eclipse36x</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>
-			</repositories>
-		</profile>
+		<!-- NOT NEEDED? <profile> <id>helios-no-target</id> <activation> <activeByDefault>true</activeByDefault> 
+			</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>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>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>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> <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> <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>emf26</id> <url>http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201006141136/ 
+			</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> 
+			<releases> <enabled>true</enabled> </releases> </repository> <repository> 
+			<id>gef</id> <url>http://download.eclipse.org/tools/gef/updates </url> <layout>p2</layout> 
+			<snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled> 
+			</releases> </repository> </repositories> </profile> -->
 
 		<profile>
 			<id>hudson</id>
@@ -384,57 +242,19 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>svn-repos</id>
-			<repositories>
-				<repository>
-					<id>svnkit13</id>
-					<url>http://eclipse.svnkit.com/1.3.x/</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>subclipse16</id>
-					<url>http://subclipse.tigris.org/update_1.6.x/</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>subversive07</id>
-					<url>http://download.eclipse.org/technology/subversive/0.7/update-site/
-					</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>subversive20</id>
-					<url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/
-					</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-			</repositories>
-		</profile>
+		<!-- NOT NEEDED? <profile> <id>svn-repos</id> <repositories> <repository> 
+			<id>svnkit13</id> <url>http://eclipse.svnkit.com/1.3.x/</url> <layout>p2</layout> 
+			<snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled> 
+			</releases> </repository> <repository> <id>subclipse16</id> <url>http://subclipse.tigris.org/update_1.6.x/</url> 
+			<layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases> 
+			<enabled>true</enabled> </releases> </repository> <repository> <id>subversive07</id> 
+			<url>http://download.eclipse.org/technology/subversive/0.7/update-site/ </url> 
+			<layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases> 
+			<enabled>true</enabled> </releases> </repository> <repository> <id>subversive20</id> 
+			<url>http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/ 
+			</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> 
+			<releases> <enabled>true</enabled> </releases> </repository> </repositories> 
+			</profile> -->
 		<profile>
 			<id>coverage</id>
 			<activation>
@@ -565,86 +385,45 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>requirements</id>
-			<activation>
-				<file>
-					<exists>${basedir}/requirements.properties</exists>
-				</file>
-			</activation>
-			<properties>
-				<requirements.root>${basedir}/../../../requirements
-				</requirements.root>
-				<requirement.build.root>${requirements.root}/target
-				</requirement.build.root>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<dependencies>
-							<dependency>
-								<groupId>ant-contrib</groupId>
-								<artifactId>ant-contrib</artifactId>
-								<version>1.0b3</version>
-								<exclusions>
-									<exclusion>
-										<groupId>ant</groupId>
-										<artifactId>ant</artifactId>
-									</exclusion>
-								</exclusions>
-							</dependency>
-						</dependencies>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.3</version>
-						<executions>
-							<execution>
-								<id>download-plugin-requirements</id>
-								<phase>generate-test-resources</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-										<if>
-											<available file="${requirements.root}" type="dir" />
-											<then>
-												<property file="requirements.properties" />
-												<echo>Requirements build</echo>
-												<ant dir="${requirements.root}" inheritAll="true">
-													<property name="requirements" value="${requirements}" />
-													<property name="settings.offline" value="${settings.offline}" />
-													<property name="skipDownload" value="${skipDownload}" />
-												</ant>
-											</then>
-										</if>
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
+		<!-- NOT NEEDED? <profile> <id>requirements</id> <activation> <file> <exists>${basedir}/requirements.properties</exists> 
+			</file> </activation> <properties> <requirements.root>${basedir}/../../../requirements 
+			</requirements.root> <requirement.build.root>${requirements.root}/target 
+			</requirement.build.root> </properties> <build> <plugins> <plugin> <dependencies> 
+			<dependency> <groupId>ant-contrib</groupId> <artifactId>ant-contrib</artifactId> 
+			<version>1.0b3</version> <exclusions> <exclusion> <groupId>ant</groupId> 
+			<artifactId>ant</artifactId> </exclusion> </exclusions> </dependency> </dependencies> 
+			<artifactId>maven-antrun-plugin</artifactId> <version>1.3</version> <executions> 
+			<execution> <id>download-plugin-requirements</id> <phase>generate-test-resources</phase> 
+			<goals> <goal>run</goal> </goals> <configuration> <tasks> <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
+			/> <if> <available file="${requirements.root}" type="dir" /> <then> <property 
+			file="requirements.properties" /> <echo>Requirements build</echo> <ant dir="${requirements.root}" 
+			inheritAll="true"> <property name="requirements" value="${requirements}" 
+			/> <property name="settings.offline" value="${settings.offline}" /> <property 
+			name="skipDownload" value="${skipDownload}" /> </ant> </then> </if> </tasks> 
+			</configuration> </execution> </executions> </plugin> </plugins> </build> 
+			</profile> -->
 
-		<profile>
-			<id>bpel-nightly-trunk</id>
-			<repositories>
-				<repository>
-					<id>bpel-nightly-trunk</id>
-					<url>http://download.eclipse.org/technology/bpel/updates/nightly/trunk/</url>
-					<layout>p2</layout>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-				</repository>
-			</repositories>
-		</profile>
+		<!-- NOT NEEDED? <profile> <id>bpel-nightly-trunk</id> <repositories> <repository> 
+			<id>bpel-nightly-trunk</id> <url>http://download.eclipse.org/technology/bpel/updates/nightly/trunk/</url> 
+			<layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> <releases> 
+			<enabled>true</enabled> </releases> </repository> </repositories> </profile> -->
 
 	</profiles>
+
+	<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>
+	</repositories>
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>sonatype-maven-central</id>