5:23 p.m.
Author: dgolovin
Date: 2011-07-06 18:23:25 -0400 (Wed, 06 Jul 2011)
New Revision: 32676
Modified:
trunk/build/parent/pom.xml
Log:
fix for parent pom:
1. Removed unnecessary update sites and plugin repositories
2. Changed product that should be started by default and requirement to intsall to
org.eclipse.platfrom.ide to avoid sources and documentation downloading during tests
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-07-06 21:55:11 UTC (rev 32675)
+++ trunk/build/parent/pom.xml 2011-07-06 22:23:25 UTC (rev 32676)
@@ -155,12 +155,12 @@
<!-- TODO: add new profile to permit running against JBDS product/application
for JBDS tests, against Eclipse SDK for JBT -->
- <product>org.eclipse.sdk.ide</product>
+ <product>org.eclipse.platform.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
<dependencies>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.eclipse.sdk.ide</artifactId>
+ <artifactId>org.eclipse.platform.ide</artifactId>
<version>0.0.0</version>
</dependency>
<!-- http://www.jmock.org/maven.html -->
@@ -246,10 +246,11 @@
<!-- 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>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<repositories>
<repository>
@@ -311,10 +312,11 @@
<!-- 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 compile
everything -->
<profile>
<id>jboss-requirements-composite-mirror</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<repositories>
<repository>
@@ -652,9 +654,10 @@
</build>
</profile>
- <profile>
+ <!-- commented, because group/aitifacts ids generated by this plugin should be
adjusted first with approach used in jbosstools/trunk first -->
+ <!-- profile -->
<!-- this plugin is available from
https://github.com/nickboldt/maven-plugins/tree/master/unique-GAV-plugin/ -->
- <id>GAV</id>
+ <!-- id>GAV</id>
<build>
<plugins>
<plugin>
@@ -679,39 +682,26 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile -->
</profiles>
<repositories>
<!-- Single repo containing contents of unified.target, but without using the target
file -->
- <repository>
- <id>jbosstools-target-site</id>
- <url>${jbosstools-target-site}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <!-- Latest JBT nightly published update site (nightly builds) -->
- <repository>
- <id>jbosstools-nightly</id>
- <url>${jbosstools-nightly}</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
<repository>
+ <id>jbosstools-target-site</id>
+ <url>${jbosstools-target-site}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <!-- do not needed because parent pom is not required anymore -->
+ <!-- repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
@@ -724,9 +714,11 @@
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
- </repository>
+ </repository -->
</repositories>
- <pluginRepositories>
+
+ <!-- commented to check if it is added by default on hudson but with https:// -->
+ <!-- pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
@@ -738,7 +730,7 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories -->
<distributionManagement>
<repository>