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

[bo...@apache.org]

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

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


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

commit 1f5669dcd6a00f2591122cb6f4cd55b806b1676f
Author: Bob Paulin <bo...@bobpaulin.com>
AuthorDate: Fri Aug 17 21:01:25 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 57d2ba4..7ad25e4 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))"