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/08/06 20:22:18 UTC
svn commit: r983085 - /uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
Author: schor
Date: Fri Aug 6 18:22:18 2010
New Revision: 983085
URL: http://svn.apache.org/viewvc?rev=983085&view=rev
Log:
[UIMA-1846] removing executions - not needed, reduce clutter. Needed to add org.eclipse.core.runtime to the Require-Bundle set, and excluded it correspondingly (as required by OSGi) from the <Import-Package> list. Otherwise the generated manifest would be missing things. This change happened when a later version of the maven-bundle-plugin upgraded the way manifest entries were built.
Modified:
uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
Modified: uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml?rev=983085&r1=983084&r2=983085&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml Fri Aug 6 18:22:18 2010
@@ -139,88 +139,80 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <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>
+ <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.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-->
+ <!-- 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)
+ -->
+ <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is potentially wrong -->
+ <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.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui.workbench,
+ !org.eclipse.core.runtime,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ *
+ </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>
+ <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>
</plugin>
</plugins>
</build>