You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/09/20 17:08:36 UTC
svn commit: r577788 - in /incubator/uima/uimaj/trunk/uimaj-ep-pear-packager:
META-INF/MANIFEST.MF pom.xml
Author: schor
Date: Thu Sep 20 08:08:35 2007
New Revision: 577788
URL: http://svn.apache.org/viewvc?rev=577788&view=rev
Log:
[UIMA-579] recompute dependencies for plugins, and update POMs
to include all dependencies. *** Will require upgrading to
maven 2.0.7 to avoid a NullPointerException ***
Modified:
incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/META-INF/MANIFEST.MF
incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
Modified: incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/META-INF/MANIFEST.MF?rev=577788&r1=577787&r2=577788&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/META-INF/MANIFEST.MF (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/META-INF/MANIFEST.MF Thu Sep 20 08:08:35 2007
@@ -7,7 +7,12 @@
Bundle-Activator: org.apache.uima.pear.PearPlugin
Bundle-Vendor: The Apache Software Foundation
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,org.eclipse.ui.ide,org.eclipse.ui.views,org.eclipse.jface.text,org.eclipse.ui.workbench.texteditor,org.eclipse.ui.editors,org.eclipse.core.resources,org.eclipse.ui,org.eclipse.jdt,org.eclipse.jdt.ui,org.eclipse.jdt.core,org.apache.uima.runtime
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.jdt.core,
+ org.apache.uima.runtime
Eclipse-AutoStart: true
Plugin-Class: org.apache.uima.pear.PearPlugin
Export-Package: org.apache.uima.pear,
Modified: incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml?rev=577788&r1=577787&r2=577788&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml Thu Sep 20 08:08:35 2007
@@ -43,12 +43,15 @@
<version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
+ <!-- UIMA dependencies -->
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
<version>2.3.0-SNAPSHOT</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
+
+ <!-- Eclipse dependencies -->
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
@@ -61,24 +64,34 @@
<version>3.2.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.ui</artifactId>
- <version>3.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>org.eclipse.jface.text</artifactId>
- <version>3.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
- <version>3.2.0</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
+ <version>3.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
+ <version>3.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- next one causes NPE with maven 2.0.7. Might be related to http://jira.codehaus.org/browse/MNG-3086 -->
+ <!--dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>org.eclipse.ui</artifactId>
+ <version>3.2.0</version>
+ </dependency-->
+
+ <!-- the need for this one may go away when the ui dependency
+ can be included -->
+ <dependency>
+ <groupId>org.eclipse.swt</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+ <version>3.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
<finalName>uima-ep-pear-packager</finalName>