Author: nickboldt Date: 2010-04-20 23:40:25 -0400 (Tue, 20 Apr 2010) New Revision: 21568 Modified: branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml branches/modular_build/xulrunner/features/pom.xml branches/modular_build/xulrunner/plugins/org.mozilla.xpcom/ branches/modular_build/xulrunner/plugins/org.mozilla.xpcom/pom.xml branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/pom.xml branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml branches/modular_build/xulrunner/plugins/pom.xml branches/modular_build/xulrunner/pom.xml branches/modular_build/xulrunner/site/pom.xml Log: regenerate poms to fix indents and artifactId values Modified: branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml =================================================================== --- branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -7,9 +7,8 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools</groupId> <artifactId>org.mozilla.xpcom.feature</artifactId> - <version>1.9.1.2a</version> - <packaging>eclipse-feature</packaging> + <version>1.9.1.2a</version> + <packaging>eclipse-feature</packaging> </project> - Modified: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml =================================================================== --- branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -7,9 +7,8 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools</groupId> <artifactId>org.mozilla.xulrunner.feature</artifactId> - <version>1.9.1.2</version> - <packaging>eclipse-feature</packaging> + <version>1.9.1.2</version> + <packaging>eclipse-feature</packaging> </project> - Modified: branches/modular_build/xulrunner/features/pom.xml =================================================================== --- branches/modular_build/xulrunner/features/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/features/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -2,18 +2,18 @@ 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> <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> + <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>features.all</artifactId> + <artifactId>xulrunner.features</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> - <module>org.mozilla.xpcom.feature</module> + <module>org.mozilla.xpcom.feature</module> <module>org.mozilla.xulrunner.feature</module> </modules> </project> - + \ No newline at end of file Property changes on: branches/modular_build/xulrunner/plugins/org.mozilla.xpcom ___________________________________________________________________ Name: svn:ignore - target + target bin Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xpcom/pom.xml =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xpcom/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xpcom/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -1,15 +1,14 @@ -<project +<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.mozilla.xpcom</artifactId> - <version>1.9.1.2a</version> - <packaging>eclipse-plugin</packaging> - + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.mozilla.xpcom</artifactId> + <version>1.9.1.2a</version> + <packaging>eclipse-plugin</packaging> </project> Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/pom.xml =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -1,33 +1,33 @@ -<project +<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.mozilla.xulrunner.carbon.macosx</artifactId> - <version>1.9.1.2</version> - <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tychoVersion}</version> - <configuration> - <resolver>p2</resolver> - <environments> - <environment> - <os>macosx</os> - <ws>carbon</ws> - <arch>x86</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.mozilla.xulrunner.carbon.macosx</artifactId> + <version>1.9.1.2</version> + <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>macosx</os> + <ws>carbon</ws> + <arch></arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -1,33 +1,33 @@ -<project +<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.mozilla.xulrunner.cocoa.macosx</artifactId> - <version>1.9.1.2</version> - <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tychoVersion}</version> - <configuration> - <resolver>p2</resolver> - <environments> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.mozilla.xulrunner.cocoa.macosx</artifactId> + <version>1.9.1.2</version> + <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch></arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -1,33 +1,33 @@ -<project +<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.mozilla.xulrunner.gtk.linux.x86</artifactId> - <version>1.9.1.2</version> - <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tychoVersion}</version> - <configuration> - <resolver>p2</resolver> - <environments> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.mozilla.xulrunner.gtk.linux.x86</artifactId> + <version>1.9.1.2</version> + <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -1,33 +1,33 @@ -<project +<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.mozilla.xulrunner.gtk.linux.x86_64</artifactId> - <version>1.9.1.2a</version> - <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tychoVersion}</version> - <configuration> - <resolver>p2</resolver> - <environments> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.mozilla.xulrunner.gtk.linux.x86_64</artifactId> + <version>1.9.1.2a</version> + <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml =================================================================== --- branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -1,33 +1,33 @@ -<project +<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <relativePath>../../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.mozilla.xulrunner.win32.win32.x86</artifactId> - <version>1.9.1.2</version> - <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tychoVersion}</version> - <configuration> - <resolver>p2</resolver> - <environments> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.mozilla.xulrunner.win32.win32.x86</artifactId> + <version>1.9.1.2</version> + <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: branches/modular_build/xulrunner/plugins/pom.xml =================================================================== --- branches/modular_build/xulrunner/plugins/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/plugins/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -2,22 +2,22 @@ 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> <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> + <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>plugins.all</artifactId> + <artifactId>xulrunner.plugins</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.mozilla.xpcom</module> + <module>org.mozilla.xulrunner.carbon.macosx</module> <module>org.mozilla.xulrunner.cocoa.macosx</module> + <module>org.mozilla.xulrunner.gtk.linux.x86</module> <module>org.mozilla.xulrunner.gtk.linux.x86_64</module> - <module>org.mozilla.xulrunner.carbon.macosx</module> - <module>org.mozilla.xulrunner.gtk.linux.x86</module> <module>org.mozilla.xulrunner.win32.win32.x86</module> </modules> </project> - + \ No newline at end of file Modified: branches/modular_build/xulrunner/pom.xml =================================================================== --- branches/modular_build/xulrunner/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -2,19 +2,19 @@ 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> <parent> - <relativePath>../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> + <relativePath>../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>xulrunner.all</artifactId> + <artifactId>xulrunner</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> + <module>features</module> <module>plugins</module> - <module>features</module> <module>site</module> </modules> </project> - + \ No newline at end of file Modified: branches/modular_build/xulrunner/site/pom.xml =================================================================== --- branches/modular_build/xulrunner/site/pom.xml 2010-04-21 03:26:29 UTC (rev 21567) +++ branches/modular_build/xulrunner/site/pom.xml 2010-04-21 03:40:25 UTC (rev 21568) @@ -2,17 +2,17 @@ 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> <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> + <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>site.all</artifactId> + <artifactId>xulrunner.site</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.mozilla.xulrunner.site</module> </modules> </project> - + \ No newline at end of file