Author: bimargulies Date: Mon Aug 29 12:28:22 2011 New Revision: 1162759 URL: http://svn.apache.org/viewvc?rev=1162759&view=rev Log: Check in a cleaned up version in spite of my spinning around on making m2e work.
Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.help/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/pom.xml maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -35,16 +35,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - APT UI Plugin</name> <description>Eclipse IDE - APT UI Plugin</description> - - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> <finalName>org.apache.maven.doxia.ide.eclipse.apt.ui_${project.version}</finalName> </build> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF Mon Aug 29 12:28:22 2011 @@ -4,7 +4,7 @@ Bundle-Name: Doxia Eclipse IDE plugins c Bundle-SymbolicName: org.apache.maven.doxia.ide.eclipse.common.ui ;singleton:=true Bundle-Version: 1.0.0.qualifier -Require-Bundle: org.apache.maven.doxia.ide.dependencies, +Require-Bundle: org.apache.maven.doxia.ide.dependencies;bundle-version="[1.0.0,1.1.0)", org.eclipse.equinox.common;bundle-version="3.6.0", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.ui.ide, Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide.plugins</groupId> @@ -34,15 +34,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - Common UI Plugin</name> <description>Eclipse IDE - Common UI Plugin</description> - - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> <build> <finalName>org.apache.maven.doxia.ide.eclipse.common.ui_${project.version}</finalName> </build> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -35,16 +35,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - Confluence UI Plugin</name> <description>Eclipse IDE - Confluence UI Plugin</description> - - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> <finalName>org.apache.maven.doxia.ide.eclipse.confluence.ui_${project.version}</finalName> </build> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide.plugins</groupId> @@ -34,14 +34,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - Docbook UI Plugin</name> <description>Eclipse IDE - Docbook UI Plugin</description> - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> <build> <finalName>org.apache.maven.doxia.ide.eclipse.docbook.ui_${project.version}</finalName> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide.plugins</groupId> @@ -34,15 +34,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - Fml UI Plugin</name> <description>Eclipse IDE - Fml UI Plugin</description> - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> <finalName>org.apache.maven.doxia.ide.eclipse.fml.ui_${project.version}</finalName> </build> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.help/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.help/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.help/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.help/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,8 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide.plugins</groupId> @@ -35,15 +34,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - Help Plugin</name> <description>Eclipse IDE - Help Plugin</description> - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> <finalName>org.apache.maven.doxia.ide.eclipse.help_${project.version}</finalName> </build> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide.plugins</groupId> @@ -34,16 +34,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - Twiki UI Plugin</name> <description>Eclipse IDE - Twiki UI Plugin</description> - - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> <finalName>org.apache.maven.doxia.ide.eclipse.twiki.ui_${project.version}</finalName> </build> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,8 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide.plugins</groupId> @@ -35,16 +34,6 @@ under the License. <packaging>eclipse-plugin</packaging> <name>Doxia Tools :: Eclipse IDE - Xdoc UI Plugin</name> <description>Eclipse IDE - Xdoc UI Plugin</description> - - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - <build> <finalName>org.apache.maven.doxia.ide.eclipse.xdoc.ui_${project.version}</finalName> </build> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,8 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide.plugins</groupId> @@ -36,14 +35,6 @@ under the License. <name>Doxia Tools :: Eclipse IDE - Xhtml UI Plugin</name> <description>Eclipse IDE - Xhtml UI Plugin</description> - <dependencies> - <!-- Doxia pieces as OSGi --> - <dependency> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>dependencies</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> <build> <finalName>org.apache.maven.doxia.ide.eclipse.xhtml.ui_${project.version}</finalName> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/pom.xml Mon Aug 29 12:28:22 2011 @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>eclipse-plugins</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.maven.doxia.ide</groupId> @@ -34,6 +34,16 @@ under the License. <name>Doxia Tools :: Eclipse IDE - Parent Plugins POM</name> <description>Eclipse IDE - Parent Plugins POM</description> + <!-- dependencies in a parent pom are generally evil, but this + is a stopgap until I sort out a dispute with tycho --> + <dependencies> + <dependency> + <groupId>org.apache.maven.doxia.ide</groupId> + <artifactId>dependencies</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + <modules> <module>org.apache.maven.doxia.ide.eclipse.common.ui</module> <module>org.apache.maven.doxia.ide.eclipse.apt.ui</module> Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml?rev=1162759&r1=1162758&r2=1162759&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/pom.xml Mon Aug 29 12:28:22 2011 @@ -5,11 +5,14 @@ <maven>3.0.3</maven> </prerequisites> <parent> - <groupId>org.apache.maven.doxia.ide</groupId> - <artifactId>eclipse</artifactId> - <version>1.0-tycho-SNAPSHOT</version> + <groupId>org.apache.maven</groupId> + <artifactId>maven-parent</artifactId> + <version>21</version> + <relativePath/> </parent> + <groupId>org.apache.maven.doxia.ide</groupId> <artifactId>eclipse-plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <description>The eclipse plugins, features, and update site are here. </description> @@ -25,6 +28,11 @@ <layout>p2</layout> <url>http://download.eclipse.org/releases/helios</url> </repository> + <repository> + <id>doxia-p2</id> + <layout>p2</layout> + <url>http://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/interim-p2</url> + </repository> </repositories> <build> <pluginManagement> @@ -66,8 +74,8 @@ <artifactId>target-platform-configuration</artifactId> <version>${tycho-version}</version> <configuration> - <pomDependencies>consider</pomDependencies> <resolver>p2</resolver> + <pomDependencies>consider</pomDependencies> <environments> <environment> <os>linux</os>