Author: schor
Date: Tue Sep 14 19:14:28 2010
New Revision: 997045
URL: http://svn.apache.org/viewvc?rev=997045&view=rev
Log:
[UIMA-1873] add common to set of dependencies so jmerge will load
Modified:
uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml
uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml?rev=997045&r1=997044&r2=997045&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml Tue Sep 14
19:14:28 2010
@@ -80,6 +80,7 @@ under the License.
<import plugin="org.eclipse.jdt.launching"/>
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.emf.codegen"/>
+ <import plugin="org.eclipse.emf.common"/> <!-- eclipse 3.5 complains
about unresolved dependencies -->
<import plugin="org.eclipse.ui.views"/>
<import plugin="org.eclipse.jdt"/>
<import plugin="org.eclipse.text"/>
Modified: uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml?rev=997045&r1=997044&r2=997045&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml Tue Sep 14 19:14:28 2010
@@ -113,6 +113,12 @@
<version>2.1.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>common</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+
<!-- These next dependencies are just to lock down the
transitive dependencies of the above.
