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/12/05 20:48:59 UTC
svn commit: r1772796 - in /uima/uimaj/branches/experiment-v3-jcas:
uimaj-ep-cas-editor-ide/pom.xml uimaj-ep-cas-editor/pom.xml
uimaj-ep-launcher/pom.xml uimaj-ep-runtime/pom.xml
Author: schor
Date: Mon Dec 5 20:48:59 2016
New Revision: 1772796
URL: http://svn.apache.org/viewvc?rev=1772796&view=rev
Log:
[UIMA-5202] java 8, other minor adjustments to make work for v3
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor-ide/pom.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/pom.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/pom.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-runtime/pom.xml
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor-ide/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor-ide/pom.xml?rev=1772796&r1=1772795&r2=1772796&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor-ide/pom.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor-ide/pom.xml Mon Dec 5 20:48:59 2016
@@ -215,7 +215,7 @@
<instructions>
<Bundle-SymbolicName>org.apache.uima.caseditor.ide;singleton:=true</Bundle-SymbolicName>
<Bundle-Activator>org.apache.uima.caseditor.ide.CasEditorIdePlugin</Bundle-Activator>
- <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+ <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Export-Package>
org.apache.uima.caseditor.ide.*
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/pom.xml?rev=1772796&r1=1772795&r2=1772796&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/pom.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/pom.xml Mon Dec 5 20:48:59 2016
@@ -216,7 +216,7 @@
<instructions>
<Bundle-SymbolicName>org.apache.uima.caseditor;singleton:=true</Bundle-SymbolicName>
<Bundle-Activator>org.apache.uima.caseditor.CasEditorPlugin</Bundle-Activator>
- <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+ <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Export-Package>
org.apache.uima.caseditor.*
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=1772796&r1=1772795&r2=1772796&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 Mon Dec 5 20:48:59 2016
@@ -88,7 +88,7 @@
<version>3.2.0</version>
<scope>provided</scope>
</dependency-->
- <dependency>
+ <dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
<!-- changing the lower version number to 3.2.0,
@@ -194,6 +194,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
+ <manifestLocation>META-INF</manifestLocation>
<instructions>
<!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
<_nouses>true</_nouses>
@@ -208,7 +209,10 @@
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 -->
+ <Bundle-Activator>org.apache.uima.ep_launcher.LauncherPlugin</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.launcher;singleton:=true</Bundle-SymbolicName>
+ <!-- Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment invalid value : JavaSE-1.8 -->
+ <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is potentially wrong -->
<Require-Bundle>org.eclipse.core.runtime</Require-Bundle>
<Import-Package>
!org.eclipse.core.runtime,
@@ -236,9 +240,9 @@
org.eclipse.ui.plugin,
org.osgi.framework;version="1.3"
</Import-Package>
- <Bundle-SymbolicName>org.apache.uima.launcher;singleton:=true</Bundle-SymbolicName>
- <Bundle-Activator>org.apache.uima.ep_launcher.LauncherPlugin</Bundle-Activator>
+
<Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Plugin-Class>org.apache.uima.ep_launcher.LauncherPlugin</Plugin-Class>
</instructions>
</configuration>
</plugin>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-runtime/pom.xml?rev=1772796&r1=1772795&r2=1772796&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-runtime/pom.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-runtime/pom.xml Mon Dec 5 20:48:59 2016
@@ -221,7 +221,12 @@
org.apache.uima.adapter.soap,
org.apache.uima.adapter.soap.axis11,
-->
- <Import-Package>org.apache.log4j;resolution:=optional,*
+ <Import-Package>org.apache.log4j;resolution:=optional,
+ !com.strobel.assembler,
+ !com.strobel.assembler.metadata,
+ !com.strobel.decompiler,
+ !javax.annotation.meta,
+ *
</Import-Package>
<!-- causes the other Jars from the maven
dependencies, at the proper version, to be