Author: schor
Date: Thu Jul 21 20:30:44 2011
New Revision: 1149344
URL: http://svn.apache.org/viewvc?rev=1149344&view=rev
Log:
[UIMA-2177] [UIMA-2176] change pom parent, change OSGi packaging to keep Jars
of included things.
Modified:
uima/addons/trunk/addons-osgi-runtime/pom.xml
Modified: uima/addons/trunk/addons-osgi-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/uima/addons/trunk/addons-osgi-runtime/pom.xml?rev=1149344&r1=1149343&r2=1149344&view=diff
==============================================================================
--- uima/addons/trunk/addons-osgi-runtime/pom.xml (original)
+++ uima/addons/trunk/addons-osgi-runtime/pom.xml Thu Jul 21 20:30:44 2011
@@ -21,8 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>2</version>
+ <artifactId>uima-addons-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-addons-parent</relativePath>
</parent>
<groupId>org.apache.uima</groupId>
<artifactId>addons-osgi-runtime</artifactId>
@@ -63,13 +64,13 @@
<module>WhitespaceTokenizer-osgi</module>
<module>Solrcas-osgi</module>
</modules>
- <dependencies>
+ <!-- dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime</artifactId>
<version>${uimaDependencyVersion}</version>
</dependency>
- </dependencies>
+ </dependencies-->
<build>
<finalName>${project.groupId}.${project.artifactId}.${parsedVersion.osgiVersion}</finalName>
<pluginManagement>
@@ -83,7 +84,7 @@
<configuration>
<instructions>
<Import-Package>org.apache.log.*;resolution:=optional</Import-Package>
-
<Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+ <Embed-Dependency>*;scope=compile;</Embed-Dependency>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
<Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
@@ -101,9 +102,9 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpackDependentJars</id>
+ <id>getDependentJars</id>
<goals>
- <goal>unpack-dependencies</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
