10:42 a.m.
Author: nickboldt
Date: 2010-08-03 11:42:49 -0400 (Tue, 03 Aug 2010)
New Revision: 23878
Modified:
trunk/parent-pom.xml
trunk/pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-6429 add xulrunner to parent-pom.xml and remove from
pom.xml
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-08-03 14:50:37 UTC (rev 23877)
+++ trunk/parent-pom.xml 2010-08-03 15:42:49 UTC (rev 23878)
@@ -24,7 +24,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
</plugin>
-
+
<plugin>
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-packaging-plugin</artifactId>
@@ -55,9 +55,12 @@
<ws>cocoa</ws>
<arch>x86</arch>
</environment>
- <!-- <environment> <os>macosx</os> <ws>carbon</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>
@@ -170,10 +173,9 @@
</profile>
<!-- Time saver: to build everything from scratch (without target platform);
- 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.
- -->
+ 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>
@@ -214,6 +216,129 @@
</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/upd...
+ </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>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192...
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-xulrunner-1.9.2</id>
+ <url>http://download.jboss.org/jbosstools/updates/xulrunner-1.9.2/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>helios-sp1-no-target</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>helios-jboss-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/helios/</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.x/
</url>
@@ -284,18 +409,19 @@
</releases>
</repository>
<repository>
- <id>google eclipse plugins</id>
-
<url>http://dl.google.com/eclipse/plugin/3.6</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
+ <id>google eclipse plugins</id>
+ <url>http://dl.google.com/eclipse/plugin/3.6</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</profile>
+
<profile>
<id>hudson</id>
<activation>
@@ -470,33 +596,18 @@
</property>
</activation>
<properties>
- <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file>
+ <emma.session.out.file>${project.build.directory}/emma/coverage.es
+ </emma.session.out.file>
<emma.filter />
<emma.instrument.bundles />
</properties>
<build>
<plugins>
- <!-- plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${emma.session.out.file}</file>
- <type>es</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin-->
+ <!-- plugin> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <executions> <execution> <id>attach-artifacts</id>
<phase>package</phase>
+ <goals> <goal>attach-artifact</goal> </goals>
<configuration> <artifacts>
+ <artifact> <file>${emma.session.out.file}</file>
<type>es</type> </artifact>
+ </artifacts> </configuration> </execution> </executions>
</plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
@@ -515,9 +626,11 @@
<version>${tychoVersion}</version>
<configuration>
<systemProperties combine.children="append">
- <emma.session.out.file>${emma.session.out.file}</emma.session.out.file>
+ <emma.session.out.file>${emma.session.out.file}
+ </emma.session.out.file>
<emma.filter>${emma.filter}</emma.filter>
- <eclemma.instrument.bundles>${emma.instrument.bundles}</eclemma.instrument.bundles>
+ <eclemma.instrument.bundles>${emma.instrument.bundles}
+ </eclemma.instrument.bundles>
</systemProperties>
<frameworkExtensions>
<frameworkExtension>
@@ -555,6 +668,12 @@
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<executions>
@@ -569,15 +688,17 @@
<taskdef resource="emma_ant.properties" />
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<if>
- <available file="${project.build.directory}/emma"
type="dir" />
+ <available file="${project.build.directory}/emma"
+ type="dir" />
<then>
<echo>Process emma report...</echo>
- <!-- emma enabled="true">
- <instr metadatafile="${project.build.directory}/coverage.em"
mode="overwrite"
instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes"
/>
- </emma-->
+ <!-- emma enabled="true"> <instr
metadatafile="${project.build.directory}/coverage.em"
+ mode="overwrite"
instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes"
+ /> </emma -->
<emma enabled="true">
<report>
- <infileset dir="${project.build.directory}/emma"
includes="*.es,*.em" />
+ <infileset dir="${project.build.directory}/emma"
+ includes="*.es,*.em" />
<txt outfile="${project.build.directory}/emma/coverage.txt"
/>
<xml outfile="${project.build.directory}/emma/coverage.xml"
/>
<html outfile="${project.build.directory}/emma/coverage.html"
/>
@@ -605,12 +726,27 @@
</file>
</activation>
<properties>
- <requirements.root>${basedir}/../../../requirements</requirements.root>
- <requirement.build.root>${requirements.root}/target</requirement.build.root>
+ <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>
@@ -622,13 +758,19 @@
</goals>
<configuration>
<tasks>
- <property file="requirements.properties" />
- <echo>Requirements build</echo>
- <ant dir="${basedir}/../../../requirements"
inheritAll="true" >
- <property name="requirements" value="${requirements}"
/>
- <property name="settings.offline"
value="${settings.offline}" />
- <property name="skipDownload" value="${skipDownload}"
/>
- </ant>
+ <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>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-08-03 14:50:37 UTC (rev 23877)
+++ trunk/pom.xml 2010-08-03 15:42:49 UTC (rev 23878)
@@ -1,67 +1,69 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-<groupId>org.jboss</groupId>
-<artifactId>jbosstools</artifactId>
-<version>0.0.1-SNAPSHOT</version>
-<packaging>pom</packaging>
-<modules>
- <module>build/target-platform</module>
- <module>build/libs</module>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbosstools</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>build/target-platform</module>
+ <module>build/libs</module>
- <!-- this order is important! make sure you've run genpom.xml first! -->
- <!-- dgolovin's order -->
- <module>tests</module>
- <module>freemarker</module>
- <module>jmx</module>
- <module>archives</module>
- <module>as</module>
- <module>common</module>
- <module>jst</module>
- <module>xulrunner</module>
- <module>vpe</module>
- <module>jsf</module>
+ <!-- this order is important! make sure you've run genpom.xml first! -->
+ <!-- dgolovin's order -->
+ <module>tests</module>
+ <module>freemarker</module>
+ <module>jmx</module>
+ <module>archives</module>
+ <module>as</module>
+ <module>common</module>
+ <module>jst</module>
+ <!-- Built as external Hudson job,
http://hudson.qa.jboss.com/hudson/view/DevStudio_Tycho/job/xulrunner-1.9.2/,
+ so not needed here <module>xulrunner</module> -->
+ <module>vpe</module>
+ <module>jsf</module>
- <module>hibernatetools</module>
- <module>portlet</module>
- <module>workingset</module>
+ <module>hibernatetools</module>
+ <module>portlet</module>
+ <module>workingset</module>
- <module>struts</module>
+ <module>struts</module>
- <module>profiler</module>
- <module>smooks</module>
- <module>cdi</module>
- <module>birt</module>
- <module>bpel</module>
- <module>esb</module>
- <module>seam</module>
- <module>examples</module>
- <module>maven</module>
- <module>tptp</module>
- <module>ws</module>
- <module>modeshape</module>
- <module>flow</module>
- <module>jbpm</module>
- <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
- ant -q -->
- <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml and
build/aggregate/site/site.xml
- or the build will break! -->
- <module>drools</module>
-
- <module>site</module>
-</modules>
-<profiles>
-<profile>
- <id>emma-coverage</id>
- <activation>
- <property>
- <name>coverage</name>
- </property>
- </activation>
- <modules>
- <module>build/reports/emma-coverage</module>
+ <module>profiler</module>
+ <module>smooks</module>
+ <module>cdi</module>
+ <module>birt</module>
+ <module>bpel</module>
+ <module>esb</module>
+ <module>seam</module>
+ <module>examples</module>
+ <module>maven</module>
+ <module>tptp</module>
+ <module>ws</module>
+ <module>modeshape</module>
+ <module>flow</module>
+ <module>jbpm</module>
+ <!-- NOTE: To build drools, must first bootstrap with ant script: cd drools;
+ ant -q -->
+ <!-- IF YOU REMOVE A MODULE, be sure to also remove it from site/site.xml
+ and build/aggregate/site/site.xml or the build will break! -->
+ <module>drools</module>
+
+ <module>site</module>
</modules>
-</profile>
-</profiles>
+ <profiles>
+ <profile>
+ <id>emma-coverage</id>
+ <activation>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <modules>
+ <module>build/reports/emma-coverage</module>
+ </modules>
+ </profile>
+ </profiles>
</project>