Author: nickboldt Date: 2010-05-17 21:40:47 -0400 (Mon, 17 May 2010) New Revision: 22155 Added: trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml trunk/xulrunner/features/pom.xml Removed: trunk/xulrunner/features/org.jboss.tools.xulrunner.feature_1.9.1.2_v201003050540R.jar trunk/xulrunner/features/org.mozilla.xpcom.feature/target/ trunk/xulrunner/features/org.mozilla.xulrunner.feature/target/ Log: merge from branch to trunk Deleted: trunk/xulrunner/features/org.jboss.tools.xulrunner.feature_1.9.1.2_v201003050540R.jar =================================================================== (Binary files differ) Added: trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml =================================================================== --- trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml (rev 0) +++ trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2010-05-18 01:40:47 UTC (rev 22155) @@ -0,0 +1,14 @@ +<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.feature</artifactId> + <version>1.9.1.2a</version> + <packaging>eclipse-feature</packaging> +</project> Added: trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml =================================================================== --- trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml (rev 0) +++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2010-05-18 01:40:47 UTC (rev 22155) @@ -0,0 +1,14 @@ +<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.feature</artifactId> + <version>1.9.1.2</version> + <packaging>eclipse-feature</packaging> +</project> Added: trunk/xulrunner/features/pom.xml =================================================================== --- trunk/xulrunner/features/pom.xml (rev 0) +++ trunk/xulrunner/features/pom.xml 2010-05-18 01:40:47 UTC (rev 22155) @@ -0,0 +1,19 @@ +<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>xulrunner.features</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>org.mozilla.xpcom.feature</module> + <module>org.mozilla.xulrunner.feature</module> + </modules> +</project> + \ No newline at end of file