Author: dgolovin Date: 2011-05-16 09:14:24 -0400 (Mon, 16 May 2011) New Revision: 31332 Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml trunk/freemarker/features/pom.xml trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml trunk/freemarker/plugins/pom.xml trunk/freemarker/pom.xml trunk/freemarker/site/pom.xml trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml trunk/freemarker/tests/pom.xml Log: https://issues.jboss.org/browse/JBIDE-8518 fix pom.xml files in JBT and JBDS repo such that only component root poms reference parent pom (all others just look up to .. for parent) moved parent/pom.xml reference to component's root pom.xml fixed maven repo structure Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml =================================================================== --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,12 +2,12 @@ <project 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"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.features</groupId> <artifactId>org.jboss.ide.eclipse.freemarker.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml =================================================================== --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,12 +2,12 @@ <project 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"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>features</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.features</groupId> <artifactId>org.jboss.ide.eclipse.freemarker.test.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/features/pom.xml =================================================================== --- trunk/freemarker/features/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/features/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -1,9 +1,15 @@ <project 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"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.features</artifactId> + <artifactId>features</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.features</name> <packaging>pom</packaging> <modules> <module>org.jboss.ide.eclipse.freemarker.feature</module> Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,12 +2,12 @@ <project 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"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>plugins</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.plugins</groupId> <artifactId>org.jboss.ide.eclipse.freemarker</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/plugins/pom.xml =================================================================== --- trunk/freemarker/plugins/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/plugins/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -1,9 +1,15 @@ <project 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"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.plugins</artifactId> + <artifactId>plugins</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.plugins</name> <packaging>pom</packaging> <modules> <module>org.jboss.ide.eclipse.freemarker</module> Modified: trunk/freemarker/pom.xml =================================================================== --- trunk/freemarker/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,9 +2,16 @@ 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> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.freemarker.all</artifactId> + <artifactId>freemarker</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.all</name> <packaging>pom</packaging> <modules> <module>plugins</module> Modified: trunk/freemarker/site/pom.xml =================================================================== --- trunk/freemarker/site/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/site/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -3,11 +3,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.freemarker.site</artifactId> + <artifactId>freemarker.site</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml =================================================================== --- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -2,11 +2,11 @@ <project 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"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.2-SNAPSHOT</version> + <groupId>org.jboss.tools.freemarker</groupId> + <artifactId>tests</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.freemarker</groupId> + <groupId>org.jboss.tools.freemarker.tests</groupId> <artifactId>org.jboss.ide.eclipse.freemarker.test</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -14,4 +14,4 @@ <emma.filter>org.jboss.ide.eclipse.freemarker*</emma.filter> <emma.instrument.bundles>org.jboss.ide.eclipse.freemarker</emma.instrument.bundles> </properties> -</project> \ No newline at end of file +</project> Modified: trunk/freemarker/tests/pom.xml =================================================================== --- trunk/freemarker/tests/pom.xml 2011-05-16 12:16:45 UTC (rev 31331) +++ trunk/freemarker/tests/pom.xml 2011-05-16 13:14:24 UTC (rev 31332) @@ -1,9 +1,15 @@ <project 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"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>freemarker</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> <groupId>org.jboss.tools.freemarker</groupId> - <artifactId>org.jboss.tools.freemarker.tests</artifactId> + <artifactId>tests</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>freemarker.tests</name> <packaging>pom</packaging> <modules> <module>org.jboss.ide.eclipse.freemarker.test</module>