You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2010/07/28 20:53:50 UTC

svn commit: r980156 - in /uima/sandbox/trunk/sandbox-osgi-runtime: alchemyapi/pom.xml cfe/pom.xml conceptmapper/pom.xml dictionary/pom.xml hmmtagger/pom.xml lucas/pom.xml opencalais/pom.xml pom.xml snowball/pom.xml tika/pom.xml whitespacetokenizer/pom.xml

Author: tommaso
Date: Wed Jul 28 18:53:49 2010
New Revision: 980156

URL: http://svn.apache.org/viewvc?rev=980156&view=rev
Log:
[UIMA-1845] - fixed alchemyapi and opencalais

Modified:
    uima/sandbox/trunk/sandbox-osgi-runtime/alchemyapi/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/cfe/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/conceptmapper/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/dictionary/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/hmmtagger/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/lucas/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/opencalais/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/snowball/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/tika/pom.xml
    uima/sandbox/trunk/sandbox-osgi-runtime/whitespacetokenizer/pom.xml

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/alchemyapi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/alchemyapi/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/alchemyapi/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/alchemyapi/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,19 +34,39 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>alchemy-annotator</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.8.2</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.alchemyapi_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.alchemyapi_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Export-Package>org.apache.uima.alchemy.*, org.apache.commons.*, org.apache.uima.*</Export-Package>
+            <Export-Package>org.apache.uima.alchemy.*</Export-Package>
             <Bundle-SymbolicName>org.apache.uima.alchemyapi;${singleton}</Bundle-SymbolicName>
           </instructions>
         </configuration>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/cfe/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/cfe/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/cfe/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/cfe/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,12 +34,87 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ConfigurableFeatureExtractor</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
+      <version>1.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.7.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.8.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlbeans</groupId>
+      <artifactId>xmlbeans</artifactId>
+      <version>2.4.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>xml-resolver</groupId>
+      <artifactId>xml-resolver</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.emf.ecore</groupId>
+      <artifactId>xmi</artifactId>
+      <version>2.3.0-v200706262000</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.emf</groupId>
+      <artifactId>common</artifactId>
+      <version>2.3.0-v200706262000</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.emf</groupId>
+      <artifactId>ecore</artifactId>
+      <version>2.3.0-v200706262000</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>runtime</artifactId>
+      <version>3.2.0-v20060603</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.osgi</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>3.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.equinox</groupId>
+      <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <version>3.2.1</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.cfe_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.cfe_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/conceptmapper/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/conceptmapper/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/conceptmapper/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/conceptmapper/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>ConceptMapper</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.conceptmapper_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.conceptmapper_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/dictionary/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/dictionary/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/dictionary/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/dictionary/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>DictionaryAnnotator</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.dictionary_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.dictionary_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/hmmtagger/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/hmmtagger/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/hmmtagger/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/hmmtagger/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>Tagger</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.tagger_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.tagger_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/lucas/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/lucas/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/lucas/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/lucas/pom.xml Wed Jul 28 18:53:49 2010
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>Lucas</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.lucas_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.lucas_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/opencalais/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/opencalais/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/opencalais/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/opencalais/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,19 +34,19 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>OpenCalaisAnnotator</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.opencalais_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.opencalais_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Export-Package>org.apache.uima.annotator.calais.*</Export-Package>
+            <Export-Package>org.apache.uima.annotator.calais.*,org.apache.uima.calais.*</Export-Package>
             <Bundle-SymbolicName>org.apache.uima.opencalais;${singleton}</Bundle-SymbolicName>
           </instructions>
         </configuration>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/pom.xml Wed Jul 28 18:53:49 2010
@@ -45,12 +45,13 @@
   <description>OSGi version of UIMA Sandbox components (mainly Annotators)</description>
   <properties>
     <singleton>singleton:=true</singleton>
+    <osgiVersion>2.3.1.SNAPSHOT</osgiVersion>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
   <build>
@@ -63,8 +64,8 @@
             <manifestLocation>META-INF</manifestLocation>
             <instructions>
               <_nouses>true</_nouses>
-              <Import-Package>org.apache.uima,*</Import-Package>
-              <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+              <Embed-Dependency>*</Embed-Dependency>
+              <Embed-Transitive>true</Embed-Transitive>
               <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
               <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
               <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/snowball/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/snowball/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/snowball/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/snowball/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>SnowballAnnotator</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.snowball_${parsedVersion.osgiVersion}
+    <finalName>org.apache.uima.snowball_${osgiVersion}
     </finalName>
     <plugins>
       <plugin>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/tika/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/tika/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/tika/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/tika/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>TikaAnnotator</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.tika_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.tika_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: uima/sandbox/trunk/sandbox-osgi-runtime/whitespacetokenizer/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/sandbox-osgi-runtime/whitespacetokenizer/pom.xml?rev=980156&r1=980155&r2=980156&view=diff
==============================================================================
--- uima/sandbox/trunk/sandbox-osgi-runtime/whitespacetokenizer/pom.xml (original)
+++ uima/sandbox/trunk/sandbox-osgi-runtime/whitespacetokenizer/pom.xml Wed Jul 28 18:53:49 2010
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>WhitespaceTokenizer</artifactId>
-      <version>2.3.1-SNAPSHOT</version>
+      <version>${uimaDependencyVersion}</version>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.whitespacetokenizer_${parsedVersion.osgiVersion}</finalName>
+    <finalName>org.apache.uima.whitespacetokenizer_${osgiVersion}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>