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 2011/05/18 16:27:48 UTC
svn commit: r1124281 - in /uima/sandbox/trunk/addons-osgi-runtime: ./
BSFAnnotator-osgi/ ConceptMapper-osgi/ ConfigurableFeatureExtractor-osgi/
DictionaryAnnotator-osgi/ Lucas-osgi/ OpenCalaisAnnotator-osgi/
RegularExpressionAnnotator-osgi/ SnowballAnn...
Author: tommaso
Date: Wed May 18 14:27:48 2011
New Revision: 1124281
URL: http://svn.apache.org/viewvc?rev=1124281&view=rev
Log:
[UIMA-2144] - changed addons-osgi-runtime build to set valid osgi version
Modified:
uima/sandbox/trunk/addons-osgi-runtime/BSFAnnotator-osgi/ (props changed)
uima/sandbox/trunk/addons-osgi-runtime/BSFAnnotator-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/ConceptMapper-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/ConfigurableFeatureExtractor-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/DictionaryAnnotator-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/Lucas-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/OpenCalaisAnnotator-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/RegularExpressionAnnotator-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/SnowballAnnotator-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/Solrcas-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/Tagger-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/TikaAnnotator-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/WhitespaceTokenizer-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/alchemy-annotator-osgi/ (props changed)
uima/sandbox/trunk/addons-osgi-runtime/alchemy-annotator-osgi/pom.xml
uima/sandbox/trunk/addons-osgi-runtime/pom.xml
Propchange: uima/sandbox/trunk/addons-osgi-runtime/BSFAnnotator-osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 18 14:27:48 2011
@@ -1,6 +1,5 @@
-*.iml
-*.settings
-META-INF
-target
.classpath
.project
+target
+*.settings
+META-INF
Modified: uima/sandbox/trunk/addons-osgi-runtime/BSFAnnotator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/BSFAnnotator-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/BSFAnnotator-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/BSFAnnotator-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -28,7 +28,7 @@
<artifactId>BSFAnnotator-osgi</artifactId>
<name>BSFAnnotator bundle</name>
<description>BSFAnnotator OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -74,18 +74,23 @@
</dependencies>
<build>
- <finalName>org.apache.uima.bsf_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.bsf_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>org.python.*;tcl.lang.*;org.apache.xpath.*;COM.*;com.sun.*;javax.jms.*;netrexx.lang.*;org.apache.tools.ant.*;resolution:=optional,*</Import-Package>
- <Export-Package>org.apache.uima.annotator.bsf.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.bsf;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Import-Package>org.apache.log.*;org.python.*;tcl.lang.*;org.apache.xpath.*;COM.*;com.sun.*;javax.jms.*;netrexx.lang.*;org.apache.tools.ant.*;resolution:=optional,*</Import-Package>
+ <Export-Package>org.apache.uima.annotator.bsf.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.bsf;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/ConceptMapper-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/ConceptMapper-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/ConceptMapper-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/ConceptMapper-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>ConceptMapper-osgi</artifactId>
<name>ConceptMapper bundle</name>
<description>ConceptMapper OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -39,17 +39,22 @@
</dependencies>
<build>
- <finalName>org.apache.uima.conceptmapper_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.conceptmapper_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.uima.conceptMapper.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.conceptmapper;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.uima.conceptMapper.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.conceptmapper;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/ConfigurableFeatureExtractor-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/ConfigurableFeatureExtractor-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/ConfigurableFeatureExtractor-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/ConfigurableFeatureExtractor-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -28,7 +28,7 @@
<artifactId>ConfigurableFeatureExtractor-osgi</artifactId>
<name>ConfigurableFeatureExtractor bundle</name>
<description>ConfigurableFeatureExtractor OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -123,19 +123,24 @@
</dependencies>
<build>
- <finalName>org.apache.uima.cfe_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.cfe_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>sun.*;org.jaxen.*;oracle.*;com.sun.*;javax.servlet.*;org.apache.log4j;org.apache.log;org.apache.tools.ant.*;org.eclipse.*;resolution:=optional,*</Import-Package>
- <Export-Package>org.apache.uima.tools.cfe*</Export-Package>
- <Embed-Dependency>*;scope=compile</Embed-Dependency>
- <Bundle-SymbolicName>org.apache.uima.tools.cfe;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Import-Package>sun.*;org.jaxen.*;oracle.*;com.sun.*;javax.servlet.*;org.apache.log4j;org.apache.log;org.apache.tools.ant.*;org.eclipse.*;resolution:=optional,*</Import-Package>
+ <Export-Package>org.apache.uima.tools.cfe*</Export-Package>
+ <Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Bundle-SymbolicName>org.apache.uima.tools.cfe;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/DictionaryAnnotator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/DictionaryAnnotator-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/DictionaryAnnotator-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/DictionaryAnnotator-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>DictionaryAnnotator-osgi</artifactId>
<name>DictionaryAnnotator bundle</name>
<description>DictionaryAnnotator OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -49,18 +49,23 @@
</dependencies>
<build>
- <finalName>org.apache.uima.dictionary_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.dictionary_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>org.apache.tools.ant.*;com.sun.*;javax.xml.stream.*;resolution:=optional,*</Import-Package>
- <Export-Package>org.apache.uima.annotator.dict_annot.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.dictionary;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Import-Package>org.apache.tools.ant.*;com.sun.*;javax.xml.stream.*;resolution:=optional,*</Import-Package>
+ <Export-Package>org.apache.uima.annotator.dict_annot.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.dictionary;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/Lucas-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/Lucas-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/Lucas-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/Lucas-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -29,7 +29,7 @@
<artifactId>Lucas-osgi</artifactId>
<name>Lucas bundle</name>
<description>Lucas OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -58,9 +58,9 @@
<version>2.9.3</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- <version>2.9.3</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>2.9.3</version>
</dependency>
<dependency>
<groupId>com.google.collections</groupId>
@@ -69,18 +69,23 @@
</dependency>
</dependencies>
<build>
- <finalName>org.apache.uima.lucas_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.lucas_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>javax.jms.*;com.sun.*;resolution:=optional,*</Import-Package>
- <Export-Package>org.apache.uima.lucas.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.lucas;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Import-Package>javax.jms.*;com.sun.*;resolution:=optional,*</Import-Package>
+ <Export-Package>org.apache.uima.lucas.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.lucas;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/OpenCalaisAnnotator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/OpenCalaisAnnotator-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/OpenCalaisAnnotator-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/OpenCalaisAnnotator-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>OpenCalaisAnnotator-osgi</artifactId>
<name>OpenCalaisAnnotator bundle</name>
<description>OpenCalaisAnnotator OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -39,17 +39,22 @@
</dependencies>
<build>
- <finalName>org.apache.uima.opencalais_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.opencalais_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.uima.annotator.calais.*,org.apache.uima.calais.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.opencalais;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.uima.annotator.calais.*,org.apache.uima.calais.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.opencalais;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/RegularExpressionAnnotator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/RegularExpressionAnnotator-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/RegularExpressionAnnotator-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/RegularExpressionAnnotator-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>RegularExpressionAnnotator-osgi</artifactId>
<name>RegularExpressionAnnotator bundle</name>
<description>RegularExpressionAnnotator OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -39,17 +39,22 @@
</dependencies>
<build>
- <finalName>org.apache.uima.opencalais_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.regexann_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.uima.annotator.regex.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.annotator.regex;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.uima.annotator.regex.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.annotator.regex;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/SnowballAnnotator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/SnowballAnnotator-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/SnowballAnnotator-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/SnowballAnnotator-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>SnowballAnnotator-osgi</artifactId>
<name>SnowballAnnotator bundle</name>
<description>SnowballAnnotator OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -39,19 +39,23 @@
</dependencies>
<build>
- <finalName>org.apache.uima.snowball_${osgiVersion}
+ <finalName>org.apache.uima.snowball_${parsedVersion.osgiVersion}
</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.uima.annotator.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.snowball;${singleton}
- </Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.uima.annotator.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.snowball;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/Solrcas-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/Solrcas-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/Solrcas-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/Solrcas-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -29,7 +29,7 @@
<artifactId>Solrcas-osgi</artifactId>
<name>Solrcas bundle</name>
<description>Solrcas OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -119,18 +119,23 @@
</dependency>
</dependencies>
<build>
- <finalName>org.apache.uima.solrcas_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.solrcas_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>junit.*;javax.xml.stream.*;resolution:=optional,*</Import-Package>
- <Export-Package>org.apache.uima.solrcas.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.solrcas;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Import-Package>org.relaxng.*;org.apache.log.*;com.sun.*;junit.*;javax.xml.stream.*;resolution:=optional,*</Import-Package>
+ <Export-Package>org.apache.uima.solrcas.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.solrcas;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/Tagger-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/Tagger-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/Tagger-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/Tagger-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>Tagger-osgi</artifactId>
<name>HmmTagger bundle</name>
<description>HmmTagger OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -39,17 +39,22 @@
</dependencies>
<build>
- <finalName>org.apache.uima.tagger_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.tagger_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.uima.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.hmmtagger;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.uima.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.hmmtagger;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/TikaAnnotator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/TikaAnnotator-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/TikaAnnotator-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/TikaAnnotator-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>TikaAnnotator-osgi</artifactId>
<name>TikaAnnotator bundle</name>
<description>TikaAnnotator OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -139,18 +139,23 @@
</dependencies>
<build>
- <finalName>org.apache.uima.tika_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.tika_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>org.ccil.*;javax.xml.stream.*;com.drew.*;sun.io.*;schemasMicrosoftCom*;org.xmlpull.*;org.relaxng.*;org.openxmlformats.*;org.bouncycastle.*;org.apache.lucene.demo.*;junit.*;org.gjt.*;org.jaxen.*;com.sun.*;org.apache.tools.ant.*;resolution:=optional,*</Import-Package>
- <Export-Package>org.apache.uima.tika.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.tika;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Import-Package>org.apache.log.*;org.ccil.*;javax.jms.*;javax.xml.stream.*;com.drew.*;sun.io.*;schemasMicrosoftCom*;org.xmlpull.*;org.relaxng.*;org.openxmlformats.*;org.bouncycastle.*;org.apache.lucene.demo.*;junit.*;org.gjt.*;org.jaxen.*;com.sun.*;org.apache.tools.ant.*;resolution:=optional,*</Import-Package>
+ <Export-Package>org.apache.uima.tika.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.tika;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/WhitespaceTokenizer-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/WhitespaceTokenizer-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/WhitespaceTokenizer-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/WhitespaceTokenizer-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>WhitespaceTokenizer-osgi</artifactId>
<name>WhitespaceTokenizer bundle</name>
<description>WhitespaceTokenizer OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -39,17 +39,22 @@
</dependencies>
<build>
- <finalName>org.apache.uima.whitespacetokenizer_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.whitespacetokenizer_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.uima.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.whitespacetokenizer;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.uima.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.whitespacetokenizer;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: uima/sandbox/trunk/addons-osgi-runtime/alchemy-annotator-osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 18 14:27:48 2011
@@ -1,6 +1,5 @@
-.settings
-META-INF
-*.iml
-target
.classpath
.project
+target
+META-INF
+.settings
Modified: uima/sandbox/trunk/addons-osgi-runtime/alchemy-annotator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/alchemy-annotator-osgi/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/alchemy-annotator-osgi/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/alchemy-annotator-osgi/pom.xml Wed May 18 14:27:48 2011
@@ -1,6 +1,6 @@
<project
- 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">
+ 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">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<artifactId>alchemy-annotator-osgi</artifactId>
<name>AlchemyAPIAnnotator bundle</name>
<description>AlchemyAPIAnnotator OSGi bundle</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -59,17 +59,22 @@
</dependencies>
<build>
- <finalName>org.apache.uima.alchemyapi_${osgiVersion}</finalName>
+ <finalName>org.apache.uima.alchemyapi_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>org.apache.uima.alchemy.*</Export-Package>
- <Bundle-SymbolicName>org.apache.uima.alchemyapi;${singleton}</Bundle-SymbolicName>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.uima.alchemy.*</Export-Package>
+ <Bundle-SymbolicName>org.apache.uima.alchemyapi;${singleton}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/sandbox/trunk/addons-osgi-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/addons-osgi-runtime/pom.xml?rev=1124281&r1=1124280&r2=1124281&view=diff
==============================================================================
--- uima/sandbox/trunk/addons-osgi-runtime/pom.xml (original)
+++ uima/sandbox/trunk/addons-osgi-runtime/pom.xml Wed May 18 14:27:48 2011
@@ -46,12 +46,11 @@
</modules>
<properties>
<singleton>singleton:=true</singleton>
- <osgiVersion>2.3.1.SNAPSHOT</osgiVersion>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
+ <artifactId>uimaj-ep-runtime</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
@@ -61,17 +60,53 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Embed-Dependency>*;inline=true</Embed-Dependency>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Import-Package>org.apache.log.*;resolution:=optional</Import-Package>
+ <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+ <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
+ <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpackDependentJars</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <excludes>**\/*.MF,**\/*.txt,**\/DEPENDENCIES,**\/NOTICE,**\/eclipse.inf,**\/ECLIPSE.RSA,**\/ECLIPSE.SF,
+ **\/ECLIPSEF.RSA,**\/ECLIPSEF.SF,**\/INDEX.LIST,**\/info.xml,**/BCKEY.DSA,**/BCKEY.SF
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.directory}/classes/META-INF/MANIFEST.MF
+ </manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ <!--</pluginManagement>-->
</build>
</project>