You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by bo...@apache.org on 2018/08/18 02:27:08 UTC

[tika] branch master updated: TIKA-2710 - Change Tika OSGi Execution Environment to 1.8

This is an automated email from the ASF dual-hosted git repository.

bob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new 711112c  TIKA-2710 - Change Tika OSGi Execution Environment to 1.8
711112c is described below

commit 711112cc78f0f270dbc66c619d9387ab260aee25
Author: Bob Paulin <bo...@bobpaulin.com>
AuthorDate: Fri Aug 17 21:26:59 2018 -0500

    TIKA-2710 - Change Tika OSGi Execution Environment to 1.8
---
 tika-bundle/pom.xml                                 | 3 ++-
 tika-bundle/src/main/resources/META-INF/MANIFEST.MF | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index dc0aa52..20dfcf4 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -144,7 +144,8 @@
         <configuration>
           <instructions>
             <_runsystempackages>com.sun.xml.bind.marshaller, com.sun.xml.internal.bind.marshaller</_runsystempackages>
-            <_noee>true</_noee>
+            <!--  The file below and the _include entry may be removed once Tika targets OpenJDK 9.0 or above -->
+            <_include>src/main/resources/META-INF/MANIFEST.MF</_include>
             <Bundle-Activator>
               org.apache.tika.parser.internal.Activator
             </Bundle-Activator>
diff --git a/tika-bundle/src/main/resources/META-INF/MANIFEST.MF b/tika-bundle/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6314617
--- /dev/null
+++ b/tika-bundle/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"