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 2010/05/05 15:56:57 UTC
svn commit: r941292 - in /uima/uimaj/branches/mavenAlign:
uimaj-ep-cas-editor/pom.xml uimaj-ep-configurator/pom.xml
uimaj-ep-debug/pom.xml uimaj-ep-jcasgen/pom.xml
uimaj-ep-pear-packager/pom.xml uimaj-ep-runtime/pom.xml
Author: schor
Date: Wed May 5 13:56:56 2010
New Revision: 941292
URL: http://svn.apache.org/viewvc?rev=941292&view=rev
Log:
[UIMA-1756] switch mode of running felix to goal: manifest, and use normal jar packaging to get the apache license/notice files in the Eclipse plugin jars in the conventional spot. Change the final name to use the osgiVersion; have the maven version follow maven version conventions (e.g. "-" in front of SNAPSHOT). Remove hardcoded versions except for the main artifact version and specific dependencies - so that release plugin has a chance of maintaining these.
Remove factored out things from configuration.
Put configuration into the uima-bundle execution.
Modified:
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml?rev=941292&r1=941291&r2=941292&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml Wed May 5 13:56:56 2010
@@ -27,8 +27,8 @@
</parent>
<artifactId>uimaj-ep-cas-editor</artifactId>
- <version>2.3.1.SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Allows editing the contents of a saved CAS</description>
<url>${uimaWebsiteUrl}</url>
@@ -56,7 +56,7 @@
<properties>
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ <uimaDependencyVersion>${project.version}</uimaDependencyVersion>
</properties>
<dependencies>
@@ -154,62 +154,54 @@
</dependencies>
<build>
- <finalName>org.apache.uima.caseditor_${project.version}</finalName>
- <!--resources>
- <resource>
- <targetPath>icons</targetPath>
- <directory>${basedir}/icons</directory>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes><include>plugin.xml</include></includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources-->
-
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.caseditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>org.apache.uima.caseditor;singleton:=true</Bundle-SymbolicName>
- <Bundle-Activator>org.apache.uima.caseditor.CasEditorPlugin</Bundle-Activator>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <Export-Package>
- org.apache.uima.caseditor.*
- </Export-Package>
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit4;bundle-version="4.5.0";resolution:=optional
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !org.eclipse.jface.text.link,
- !org.eclipse.jface.text.source,
- !org.eclipse.jface.text.templates,
- !org.eclipse.ui.texteditor,
- !org.eclipse.ui,
- !org.eclipse.ui.actions,
- !org.eclipse.ui.dialogs,
- !org.eclipse.ui.model,
- !org.eclipse.ui.part,
- !org.eclipse.core.runtime,
- *</Import-Package>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.uima.caseditor;singleton:=true</Bundle-SymbolicName>
+ <Bundle-Activator>org.apache.uima.caseditor.CasEditorPlugin</Bundle-Activator>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Export-Package>
+ org.apache.uima.caseditor.*
+ </Export-Package>
+ <Require-Bundle>
+ org.eclipse.jface.text,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.junit4;bundle-version="4.5.0";resolution:=optional
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ !org.eclipse.core.runtime,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml?rev=941292&r1=941291&r2=941292&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml Wed May 5 13:56:56 2010
@@ -30,8 +30,8 @@
</parent>
<artifactId>uimaj-ep-configurator</artifactId>
- <version>2.3.1.SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}: Descriptor Editor</name>
<description>A frame-based editor for most of the UIMA XML
descriptors</description>
@@ -60,7 +60,7 @@
<properties>
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependenciesVersion>2.3.1-SNAPSHOT</uimaDependenciesVersion>
+ <uimaDependenciesVersion>${project.version}</uimaDependenciesVersion>
</properties>
<dependencies>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-jcasgen</artifactId>
- <version>2.3.1.SNAPSHOT</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>provided</scope>
</dependency>
@@ -223,121 +223,123 @@
<build>
- <finalName>org.apache.uima.desceditor_${project.version}</finalName>
-
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.desceditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.taeconfigurator,
- org.apache.uima.taeconfigurator.editors,
- org.apache.uima.taeconfigurator.editors.point,
- org.apache.uima.taeconfigurator.editors.ui,
- org.apache.uima.taeconfigurator.editors.ui.dialogs,
- org.apache.uima.taeconfigurator.editors.xml,
- org.apache.uima.taeconfigurator.files,
- org.apache.uima.taeconfigurator.model,
- org.apache.uima.taeconfigurator.wizards
- </Export-Package>
- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-
- <!-- handle split packages in Eclipse.
- We do this by using Require-Bundle, and excluding from the Import-Package those
- split packages covered by those bundles - this is required by OSGi.
-
- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
- org.eclipse.jface.text and org.eclipse.text.
- Packages:
- org.eclipse.jface.text
- org.eclipse.jface.text.link
- org.eclipse.jface.text.source
- org.eclipse.jface.text.templates
- org.eclipse.ui.texteditor is split between
- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
- Packages:
- org.eclipse.ui.texteditor
- There are 5 packages in org.eclipse.ui.* that are split between
- org.eclipse.ui.ide and org.eclipse.ui.workbench.
- The Notes say not to require org.eclipse.ui.workbench, but instead just require
- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
- Packages:
- org.eclipse.ui
- org.eclipse.ui.actions
- org.eclipse.ui.dialogs
- org.eclipse.ui.model
- org.eclipse.ui.part
- org.eclipse.core.runtime has combined apis (that were split in later
- point releases of 3.x)
- -->
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.core.runtime
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !org.eclipse.jface.text,
- !org.eclipse.jface.text.link,
- !org.eclipse.jface.text.source,
- !org.eclipse.jface.text.templates,
- !org.eclipse.ui.texteditor,
- !org.eclipse.ui,
- !org.eclipse.ui.actions,
- !org.eclipse.ui.dialogs,
- !org.eclipse.ui.model,
- !org.eclipse.ui.part,
- *,
- org.apache.uima.jcas.jcasgenp,
- org.eclipse.jdt.ui
- </Import-Package>
-
-
- <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
- it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
- are not visible - this is a static final constant that gets compiled into a number
-
- Also, we stick a minimum version of 3.1.0 to insure we have that at least
-
- First import specifies bundle, since package exists in more than 1 bundle
- -->
- <!--Import-Package>org.eclipse.jface.text.source;bundle-symbolic-name=org.eclipse.jface.text,
- org.eclipse.jface.text;bundle-symbolic-name=org.eclipse.jface.text,
- *,
- org.eclipse.core.commands.common,
- org.eclipse.core.runtime.jobs,
- org.eclipse.core.runtime.content,
- org.eclipse.swt,
- org.eclipse.jface.window,
- org.apache.uima.jcas.jcasgenp,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui
- </Import-Package-->
-
- <!--Import-Package>
- *,
- org.eclipse.jdt.launching,
- org.apache.uima.jcas.jcasgenp</Import-Package-->
-
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- <Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.taeconfigurator,
+ org.apache.uima.taeconfigurator.editors,
+ org.apache.uima.taeconfigurator.editors.point,
+ org.apache.uima.taeconfigurator.editors.ui,
+ org.apache.uima.taeconfigurator.editors.ui.dialogs,
+ org.apache.uima.taeconfigurator.editors.xml,
+ org.apache.uima.taeconfigurator.files,
+ org.apache.uima.taeconfigurator.model,
+ org.apache.uima.taeconfigurator.wizards
+ </Export-Package>
+ <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+
+ <!-- handle split packages in Eclipse.
+ We do this by using Require-Bundle, and excluding from the Import-Package those
+ split packages covered by those bundles - this is required by OSGi.
+
+ There are 4 packages in org.eclipse.jface.* that are "split" between bundles
+ org.eclipse.jface.text and org.eclipse.text.
+ Packages:
+ org.eclipse.jface.text
+ org.eclipse.jface.text.link
+ org.eclipse.jface.text.source
+ org.eclipse.jface.text.templates
+ org.eclipse.ui.texteditor is split between
+ org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
+ Packages:
+ org.eclipse.ui.texteditor
+ There are 5 packages in org.eclipse.ui.* that are split between
+ org.eclipse.ui.ide and org.eclipse.ui.workbench.
+ The Notes say not to require org.eclipse.ui.workbench, but instead just require
+ org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
+ Packages:
+ org.eclipse.ui
+ org.eclipse.ui.actions
+ org.eclipse.ui.dialogs
+ org.eclipse.ui.model
+ org.eclipse.ui.part
+ org.eclipse.core.runtime has combined apis (that were split in later
+ point releases of 3.x)
+ -->
+ <Require-Bundle>
+ org.eclipse.jface.text,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.core.runtime
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ *,
+ org.apache.uima.jcas.jcasgenp,
+ org.eclipse.jdt.ui
+ </Import-Package>
+
+
+ <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
+ it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
+ are not visible - this is a static final constant that gets compiled into a number
+
+ Also, we stick a minimum version of 3.1.0 to insure we have that at least
+
+ First import specifies bundle, since package exists in more than 1 bundle
+ -->
+ <!--Import-Package>org.eclipse.jface.text.source;bundle-symbolic-name=org.eclipse.jface.text,
+ org.eclipse.jface.text;bundle-symbolic-name=org.eclipse.jface.text,
+ *,
+ org.eclipse.core.commands.common,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.runtime.content,
+ org.eclipse.swt,
+ org.eclipse.jface.window,
+ org.apache.uima.jcas.jcasgenp,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.ui
+ </Import-Package-->
+
+ <!--Import-Package>
+ *,
+ org.eclipse.jdt.launching,
+ org.apache.uima.jcas.jcasgenp</Import-Package-->
+
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml?rev=941292&r1=941291&r2=941292&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml Wed May 5 13:56:56 2010
@@ -30,8 +30,8 @@
</parent>
<artifactId>uimaj-ep-debug</artifactId>
- <version>2.3.1.SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Adds structure knowledge for common
UIMA data structures to the Eclipse Debug displays</description>
@@ -60,7 +60,7 @@
<properties>
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependenciesVersion>2.3.1-SNAPSHOT</uimaDependenciesVersion>
+ <uimaDependenciesVersion>${project.version}</uimaDependenciesVersion>
</properties>
<dependencies>
@@ -102,34 +102,37 @@
</dependency>
</dependencies>
- <build>
- <finalName>org.apache.uima.debug_${project.version}</finalName>
+ <build>
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.debug_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.ep_debug
- </Export-Package>
-
- <Import-Package>*,
- org.eclipse.ui.plugin
- </Import-Package>
-
- <Bundle-Activator>org.apache.uima.ep_debug.DebugPlugin</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.debug;singleton:=true</Bundle-SymbolicName>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.ep_debug
+ </Export-Package>
+
+ <Import-Package>*,
+ org.eclipse.ui.plugin
+ </Import-Package>
+
+ <Bundle-Activator>org.apache.uima.ep_debug.DebugPlugin</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.debug;singleton:=true</Bundle-SymbolicName>
+
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ </instructions>
+ </configuration>
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- </instructions>
- </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen/pom.xml?rev=941292&r1=941291&r2=941292&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen/pom.xml Wed May 5 13:56:56 2010
@@ -30,8 +30,8 @@
</parent>
<artifactId>uimaj-ep-jcasgen</artifactId>
- <packaging>bundle</packaging>
- <version>2.3.1.SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Provides a connection to the JCasGen tooling, for
the Component Descriptor Editor</description>
@@ -60,7 +60,7 @@
<properties>
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ <uimaDependencyVersion>${project.version}</uimaDependencyVersion>
</properties>
<dependencies>
@@ -117,36 +117,38 @@
<build>
- <finalName>org.apache.uima.jcas.jcasgenp_${project.version}</finalName>
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.jcas.jcasgenp_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.jcas.jcasgenp
- </Export-Package>
- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
- <!-- these next imports are needed by Eclipse to get things to compile, but
- not needed by maven -->
- <Import-Package>*,
- org.eclipse.core.runtime.jobs,
- org.osgi.framework,
- org.eclipse.jdt.core.jdom
- </Import-Package>
- <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.jcas.jcasgenp
+ </Export-Package>
+ <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
+ <!-- these next imports are needed by Eclipse to get things to compile, but
+ not needed by maven -->
+ <Import-Package>*,
+ org.eclipse.core.runtime.jobs,
+ org.osgi.framework,
+ org.eclipse.jdt.core.jdom
+ </Import-Package>
+ <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager/pom.xml?rev=941292&r1=941291&r2=941292&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager/pom.xml Wed May 5 13:56:56 2010
@@ -30,8 +30,8 @@
</parent>
<artifactId>uimaj-ep-pear-packager</artifactId>
- <version>2.3.1.SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Provides an Eclipse Wizard to construct
a PEAR package</description>
@@ -60,7 +60,7 @@
<properties>
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ <uimaDependencyVersion>${project.version}</uimaDependencyVersion>
</properties>
<dependencies>
@@ -132,94 +132,96 @@
</dependencies>
<build>
- <finalName>org.apache.uima.pear_${project.version}</finalName>
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.pear_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.pear,
- org.apache.uima.pear.actions,
- org.apache.uima.pear.generate,
- org.apache.uima.pear.insd.edit,
- org.apache.uima.pear.insd.edit.vars,
- org.apache.uima.pear.nature
- </Export-Package>
-
- <!-- handle split packages in Eclipse.
- We do this by using Require-Bundle, and excluding from the Import-Package those
- split packages covered by those bundles - this is required by OSGi.
-
- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
- org.eclipse.jface.text and org.eclipse.text.
- Packages:
- org.eclipse.jface.text
- org.eclipse.jface.text.link
- org.eclipse.jface.text.source
- org.eclipse.jface.text.templates
- org.eclipse.ui.texteditor is split between
- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
- Packages:
- org.eclipse.ui.texteditor
- There are 5 packages in org.eclipse.ui.* that are split between
- org.eclipse.ui.ide and org.eclipse.ui.workbench.
- The Notes say not to require org.eclipse.ui.workbench, but instead just require
- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
- Packages:
- org.eclipse.ui
- org.eclipse.ui.actions
- org.eclipse.ui.dialogs
- org.eclipse.ui.model
- org.eclipse.ui.part
- org.eclipse.core.runtime has combined apis (that were split in later
- point releases of 3.x)
- -->
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !org.eclipse.jface.text,
- !org.eclipse.jface.text.link,
- !org.eclipse.jface.text.source,
- !org.eclipse.jface.text.templates,
- !org.eclipse.ui.texteditor,
- !org.eclipse.ui,
- !org.eclipse.ui.actions,
- !org.eclipse.ui.dialogs,
- !org.eclipse.ui.model,
- !org.eclipse.ui.part,
- *
- </Import-Package>
- <!--Import-Package>*,
- org.eclipse.core.runtime.jobs,
- org.eclipse.core.commands.common,
- org.eclipse.swt,
- org.eclipse.jface.window
- </Import-Package-->
-
- <Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.pear;singleton:=true</Bundle-SymbolicName>
-
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.pear,
+ org.apache.uima.pear.actions,
+ org.apache.uima.pear.generate,
+ org.apache.uima.pear.insd.edit,
+ org.apache.uima.pear.insd.edit.vars,
+ org.apache.uima.pear.nature
+ </Export-Package>
+
+ <!-- handle split packages in Eclipse.
+ We do this by using Require-Bundle, and excluding from the Import-Package those
+ split packages covered by those bundles - this is required by OSGi.
+
+ There are 4 packages in org.eclipse.jface.* that are "split" between bundles
+ org.eclipse.jface.text and org.eclipse.text.
+ Packages:
+ org.eclipse.jface.text
+ org.eclipse.jface.text.link
+ org.eclipse.jface.text.source
+ org.eclipse.jface.text.templates
+ org.eclipse.ui.texteditor is split between
+ org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
+ Packages:
+ org.eclipse.ui.texteditor
+ There are 5 packages in org.eclipse.ui.* that are split between
+ org.eclipse.ui.ide and org.eclipse.ui.workbench.
+ The Notes say not to require org.eclipse.ui.workbench, but instead just require
+ org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
+ Packages:
+ org.eclipse.ui
+ org.eclipse.ui.actions
+ org.eclipse.ui.dialogs
+ org.eclipse.ui.model
+ org.eclipse.ui.part
+ org.eclipse.core.runtime has combined apis (that were split in later
+ point releases of 3.x)
+ -->
+ <Require-Bundle>
+ org.eclipse.jface.text,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.runtime
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ *
+ </Import-Package>
+ <!--Import-Package>*,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.commands.common,
+ org.eclipse.swt,
+ org.eclipse.jface.window
+ </Import-Package-->
+
+ <Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.pear;singleton:=true</Bundle-SymbolicName>
+
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml?rev=941292&r1=941291&r2=941292&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml Wed May 5 13:56:56 2010
@@ -30,8 +30,8 @@
</parent>
<artifactId>uimaj-ep-runtime</artifactId>
- <version>2.3.1.SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>UIMA Eclipse: ${project.artifactId}</name>
<description>Provides the core UIMA Framework to other Eclipse
plugins for their use</description>
@@ -60,7 +60,7 @@
<properties>
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependenciesVersion>2.3.1-SNAPSHOT</uimaDependenciesVersion>
+ <uimaDependenciesVersion>${project.version}</uimaDependenciesVersion>
</properties>
<!-- These dependencies should just be all the jars that
@@ -119,128 +119,129 @@
</dependencies>
<build>
- <finalName>org.apache.uima.runtime_${project.version}</finalName>
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.runtime_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <!-- export contents because we don't want the actual
- java code included (although we could... as an
- alternative to the jars - but might have a
- versioning / control issue -->
- <_exportcontents>
- org.apache.uima,
- org.apache.uima.adapter.vinci,
- org.apache.uima.adapter.vinci.util,
- org.apache.uima.analysis_component,
- org.apache.uima.analysis_engine,
- org.apache.uima.analysis_engine.annotator,
- org.apache.uima.analysis_engine.asb,
- org.apache.uima.analysis_engine.asb.impl,
- org.apache.uima.analysis_engine.impl,
- org.apache.uima.analysis_engine.impl.compatibility,
- org.apache.uima.analysis_engine.metadata,
- org.apache.uima.analysis_engine.metadata.impl,
- org.apache.uima.analysis_engine.service.impl,
- org.apache.uima.cas,
- org.apache.uima.cas.admin,
- org.apache.uima.cas.impl,
- org.apache.uima.cas.text,
- org.apache.uima.cas_data,
- org.apache.uima.cas_data.impl,
- org.apache.uima.cas_data.impl.vinci,
- org.apache.uima.collection,
- org.apache.uima.collection.base_cpm,
- org.apache.uima.collection.impl,
- org.apache.uima.collection.impl.base_cpm.container,
- org.apache.uima.collection.impl.base_cpm.container.deployer,
- org.apache.uima.collection.impl.cpm,
- org.apache.uima.collection.impl.cpm.container,
- org.apache.uima.collection.impl.cpm.container.deployer,
- org.apache.uima.collection.impl.cpm.container.deployer.socket,
- org.apache.uima.collection.impl.cpm.container.deployer.vinci,
- org.apache.uima.collection.impl.cpm.container.deployer.vns,
- org.apache.uima.collection.impl.cpm.engine,
- org.apache.uima.collection.impl.cpm.utils,
- org.apache.uima.collection.impl.cpm.vinci,
- org.apache.uima.collection.impl.cpm.vinci.cas_data,
- org.apache.uima.collection.impl.metadata,
- org.apache.uima.collection.impl.metadata.cpe,
- org.apache.uima.collection.metadata,
- org.apache.uima.flow,
- org.apache.uima.flow.impl,
- org.apache.uima.impl,
- org.apache.uima.internal.util,
- org.apache.uima.internal.util.rb_trees,
- org.apache.uima.internal.util.text,
- org.apache.uima.jcas,
- org.apache.uima.jcas.cas,
- org.apache.uima.jcas.impl,
- org.apache.uima.jcas.tcas,
- org.apache.uima.pear.tools,
- org.apache.uima.pear.util,
- org.apache.uima.resource,
- org.apache.uima.resource.impl,
- org.apache.uima.resource.metadata,
- org.apache.uima.resource.metadata.impl,
- org.apache.uima.resource.service.impl,
- org.apache.uima.search,
- org.apache.uima.search.impl,
- org.apache.uima.tools,
- org.apache.uima.tools.annot_view,
- org.apache.uima.tools.cpm,
- org.apache.uima.tools.cvd,
- org.apache.uima.tools.cvd.control,
- org.apache.uima.tools.cvd.tsview,
- org.apache.uima.tools.docanalyzer,
- org.apache.uima.tools.images,
- org.apache.uima.tools.jcasgen,
- org.apache.uima.tools.pear.install,
- org.apache.uima.tools.pear.merger,
- org.apache.uima.tools.stylemap,
- org.apache.uima.tools.util.gui,
- org.apache.uima.tools.util.htmlview,
- org.apache.uima.tools.viewer,
- org.apache.uima.uimacpp,
- org.apache.uima.util,
- org.apache.uima.util.impl,
- org.apache.vinci.debug,
- org.apache.vinci.transport,
- org.apache.vinci.transport.context,
- org.apache.vinci.transport.document,
- org.apache.vinci.transport.util,
- org.apache.vinci.transport.vns,
- org.apache.vinci.transport.vns.client,
- org.apache.vinci.transport.vns.service
- </_exportcontents>
-
- <!-- excluded packages:
- org.apache.uima.adapter.soap,
- org.apache.uima.adapter.soap.axis11,
- -->
- <Import-Package>org.apache.log4j;resolution:=optional,*
- </Import-Package>
- <!-- causes the other Jars from the maven
- dependencies, at the proper version, to be
- included in this, and also sets up the bundle
- classpath to include them -->
- <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
-
- <!-- These just get made into the corresponding manifest entries -->
- <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
- <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <!-- export contents because we don't want the actual
+ java code included (although we could... as an
+ alternative to the jars - but might have a
+ versioning / control issue -->
+ <_exportcontents>
+ org.apache.uima,
+ org.apache.uima.adapter.vinci,
+ org.apache.uima.adapter.vinci.util,
+ org.apache.uima.analysis_component,
+ org.apache.uima.analysis_engine,
+ org.apache.uima.analysis_engine.annotator,
+ org.apache.uima.analysis_engine.asb,
+ org.apache.uima.analysis_engine.asb.impl,
+ org.apache.uima.analysis_engine.impl,
+ org.apache.uima.analysis_engine.impl.compatibility,
+ org.apache.uima.analysis_engine.metadata,
+ org.apache.uima.analysis_engine.metadata.impl,
+ org.apache.uima.analysis_engine.service.impl,
+ org.apache.uima.cas,
+ org.apache.uima.cas.admin,
+ org.apache.uima.cas.impl,
+ org.apache.uima.cas.text,
+ org.apache.uima.cas_data,
+ org.apache.uima.cas_data.impl,
+ org.apache.uima.cas_data.impl.vinci,
+ org.apache.uima.collection,
+ org.apache.uima.collection.base_cpm,
+ org.apache.uima.collection.impl,
+ org.apache.uima.collection.impl.base_cpm.container,
+ org.apache.uima.collection.impl.base_cpm.container.deployer,
+ org.apache.uima.collection.impl.cpm,
+ org.apache.uima.collection.impl.cpm.container,
+ org.apache.uima.collection.impl.cpm.container.deployer,
+ org.apache.uima.collection.impl.cpm.container.deployer.socket,
+ org.apache.uima.collection.impl.cpm.container.deployer.vinci,
+ org.apache.uima.collection.impl.cpm.container.deployer.vns,
+ org.apache.uima.collection.impl.cpm.engine,
+ org.apache.uima.collection.impl.cpm.utils,
+ org.apache.uima.collection.impl.cpm.vinci,
+ org.apache.uima.collection.impl.cpm.vinci.cas_data,
+ org.apache.uima.collection.impl.metadata,
+ org.apache.uima.collection.impl.metadata.cpe,
+ org.apache.uima.collection.metadata,
+ org.apache.uima.flow,
+ org.apache.uima.flow.impl,
+ org.apache.uima.impl,
+ org.apache.uima.internal.util,
+ org.apache.uima.internal.util.rb_trees,
+ org.apache.uima.internal.util.text,
+ org.apache.uima.jcas,
+ org.apache.uima.jcas.cas,
+ org.apache.uima.jcas.impl,
+ org.apache.uima.jcas.tcas,
+ org.apache.uima.pear.tools,
+ org.apache.uima.pear.util,
+ org.apache.uima.resource,
+ org.apache.uima.resource.impl,
+ org.apache.uima.resource.metadata,
+ org.apache.uima.resource.metadata.impl,
+ org.apache.uima.resource.service.impl,
+ org.apache.uima.search,
+ org.apache.uima.search.impl,
+ org.apache.uima.tools,
+ org.apache.uima.tools.annot_view,
+ org.apache.uima.tools.cpm,
+ org.apache.uima.tools.cvd,
+ org.apache.uima.tools.cvd.control,
+ org.apache.uima.tools.cvd.tsview,
+ org.apache.uima.tools.docanalyzer,
+ org.apache.uima.tools.images,
+ org.apache.uima.tools.jcasgen,
+ org.apache.uima.tools.pear.install,
+ org.apache.uima.tools.pear.merger,
+ org.apache.uima.tools.stylemap,
+ org.apache.uima.tools.util.gui,
+ org.apache.uima.tools.util.htmlview,
+ org.apache.uima.tools.viewer,
+ org.apache.uima.uimacpp,
+ org.apache.uima.util,
+ org.apache.uima.util.impl,
+ org.apache.vinci.debug,
+ org.apache.vinci.transport,
+ org.apache.vinci.transport.context,
+ org.apache.vinci.transport.document,
+ org.apache.vinci.transport.util,
+ org.apache.vinci.transport.vns,
+ org.apache.vinci.transport.vns.client,
+ org.apache.vinci.transport.vns.service
+ </_exportcontents>
+
+ <!-- excluded packages:
+ org.apache.uima.adapter.soap,
+ org.apache.uima.adapter.soap.axis11,
+ -->
+ <Import-Package>org.apache.log4j;resolution:=optional,*
+ </Import-Package>
+ <!-- causes the other Jars from the maven
+ dependencies, at the proper version, to be
+ included in this, and also sets up the bundle
+ classpath to include them -->
+ <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+
+ <!-- These just get made into the corresponding manifest entries -->
+ <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+ <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>