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 2017/11/29 21:14:15 UTC
svn commit: r1816652 - in /uima/uv3/uimaj-v3/trunk: uimaj-ep-configurator/
uimaj-ep-configurator/pom.xml uimaj-ep-jcasgen/ uimaj-ep-jcasgen/pom.xml
Author: schor
Date: Wed Nov 29 21:14:15 2017
New Revision: 1816652
URL: http://svn.apache.org/viewvc?rev=1816652&view=rev
Log:
[UIMA-5658]
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml
uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 29 21:14:15 2017
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-configurator:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator:933273-944402
-/uima/uimaj/trunk/uimaj-ep-configurator:1690273-1768794
+/uima/uimaj/trunk/uimaj-ep-configurator:1690273-1816651
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml?rev=1816652&r1=1816651&r2=1816652&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml Wed Nov 29 21:14:15 2017
@@ -365,8 +365,8 @@ org.eclipse.core.runtime
!org.eclipse.ui.dialogs,
!org.eclipse.ui.part,
!org.eclipse.core.runtime,
- *,
- org.eclipse.jdt.ui
+ org.eclipse.jdt.ui,
+ *
</Import-Package>
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 29 21:14:15 2017
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-jcasgen:961329-961746
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-jcasgen:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen:933273-944403
-/uima/uimaj/trunk/uimaj-ep-jcasgen:1690273-1768794
+/uima/uimaj/trunk/uimaj-ep-jcasgen:1690273-1816651
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml?rev=1816652&r1=1816651&r2=1816652&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml Wed Nov 29 21:14:15 2017
@@ -104,12 +104,6 @@
<version>2.1.0</version>
<scope>provided</scope>
</dependency>
- <!-- dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>org.eclipse.emf.codegen</artifactId>
- <version>2.10.0-v20150123-0452</version>
- <scope>provided</scope>
- </dependency-->
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>common</artifactId>
@@ -201,7 +195,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version> <!-- using 3.0.1 causes the subsequent update site generation to skip this plugin for unknown reasons -->
<configuration>
<instructions>
<!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
@@ -224,9 +217,9 @@
not needed by maven -->
<Import-Package>
!org.eclipse.core.runtime,
- *,
org.osgi.framework,
- org.eclipse.jdt.core.jdom
+ org.eclipse.jdt.core.jdom,
+ *
</Import-Package>
<Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
<Eclipse-AutoStart>true</Eclipse-AutoStart>