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 2016/09/09 17:30:53 UTC
svn commit: r1760088 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher: ./ pom.xml
Author: schor
Date: Fri Sep 9 17:30:53 2016
New Revision: 1760088
URL: http://svn.apache.org/viewvc?rev=1760088&view=rev
Log:
no jira merge catchup
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/pom.xml
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 9 17:30:53 2016
@@ -0,0 +1,4 @@
+/uima/uimaj/branches/2.6.0-json/uimaj-ep-launcher:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-ep-launcher:963167-964468
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-launcher:1436573-1462257
+/uima/uimaj/trunk/uimaj-ep-launcher:1690273-1760086
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/pom.xml?rev=1760088&r1=1760087&r2=1760088&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/pom.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/pom.xml Fri Sep 9 17:30:53 2016
@@ -193,6 +193,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.0</version> <!-- get a manifest error with v 2.3.7
+ but changing the parent pom to 2.5.0 causes
+ error - default pkg '.' not permitted, o.a.u.cas.impl -->
<configuration>
<instructions>
<!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
@@ -213,7 +216,6 @@
<Import-Package>
!org.eclipse.core.runtime,
org.eclipse.core.resources,
- org.eclipse.core.runtime.model,
org.eclipse.core.variables,
org.eclipse.core.commands.common,
org.eclipse.debug.core,