[tika] 19/23: Update optional-parser-dependencies.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository tika.

commit 78eb0a19f1a2f97ade79e4ea926b9f501030b12a
Author: Markus Koschany <apo at debian.org>
Date:   Mon Nov 30 18:15:21 2015 +0000

    Update optional-parser-dependencies.patch
---
 debian/patches/optional-parser-dependencies.patch | 30 +++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/patches/optional-parser-dependencies.patch b/debian/patches/optional-parser-dependencies.patch
index 4e14907..05f2ed7 100644
--- a/debian/patches/optional-parser-dependencies.patch
+++ b/debian/patches/optional-parser-dependencies.patch
@@ -3,12 +3,12 @@ Date: Mon, 30 Nov 2015 16:08:14 +0000
 Subject: optional parser dependencies
 
 ---
- tika-parsers/pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ tika-parsers/pom.xml | 43 +++++++++++++++++++++++++++++++++++++++++++
  tika-xmp/pom.xml     |  1 +
- 2 files changed, 45 insertions(+)
+ 2 files changed, 44 insertions(+)
 
 diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
-index c0f673f..6872101 100644
+index c0f673f..4306397 100644
 --- a/tika-parsers/pom.xml
 +++ b/tika-parsers/pom.xml
 @@ -76,16 +76,19 @@
@@ -31,15 +31,7 @@ index c0f673f..6872101 100644
      </dependency>
  
      <!-- Optional OSGi dependencies, used only when running within OSGi -->
-@@ -93,6 +96,7 @@
-       <groupId>org.apache.felix</groupId>
-       <artifactId>org.apache.felix.scr.annotations</artifactId>
-       <scope>provided</scope>
-+      <optional>true</optional>
-     </dependency>
- 
-     <!-- Upstream parser libraries -->
-@@ -100,37 +104,44 @@
+@@ -100,37 +103,44 @@
        <groupId>net.sourceforge.jmatio</groupId>
        <artifactId>jmatio</artifactId>
        <version>1.0</version>
@@ -84,7 +76,7 @@ index c0f673f..6872101 100644
      </dependency>
      <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies
           as optional, but we prefer to have them always to avoid
-@@ -139,26 +150,31 @@
+@@ -139,26 +149,31 @@
        <groupId>org.bouncycastle</groupId>
        <artifactId>bcmail-jdk15on</artifactId>
        <version>1.52</version>
@@ -116,7 +108,7 @@ index c0f673f..6872101 100644
        <exclusions>
          <exclusion>
            <groupId>stax</groupId>
-@@ -174,61 +190,73 @@
+@@ -174,61 +189,73 @@
        <groupId>org.ccil.cowan.tagsoup</groupId>
        <artifactId>tagsoup</artifactId>
        <version>1.2.1</version>
@@ -190,7 +182,7 @@ index c0f673f..6872101 100644
      </dependency>
  	
  
-@@ -238,30 +266,35 @@
+@@ -238,30 +265,35 @@
        <artifactId>sqlite-jdbc</artifactId>
        <version>3.8.10.1</version> 
        <scope>provided</scope>
@@ -226,7 +218,7 @@ index c0f673f..6872101 100644
        <exclusions>
          <exclusion>
            <groupId>junit</groupId>
-@@ -274,6 +307,7 @@
+@@ -274,6 +306,7 @@
        <groupId>org.json</groupId>
        <artifactId>json</artifactId>
        <version>20140107</version>
@@ -234,7 +226,7 @@ index c0f673f..6872101 100644
      </dependency>
      
  
-@@ -299,16 +333,19 @@
+@@ -299,16 +332,19 @@
        <groupId>edu.ucar</groupId>
        <artifactId>netcdf4</artifactId>
        <version>${netcdf-java.version}</version>
@@ -254,7 +246,7 @@ index c0f673f..6872101 100644
        <exclusions>
          <exclusion>
            <groupId>org.slf4j</groupId>
-@@ -320,33 +357,39 @@
+@@ -320,33 +356,39 @@
        <groupId>edu.ucar</groupId>
        <artifactId>httpservices</artifactId>
        <version>${netcdf-java.version}</version>
@@ -294,7 +286,7 @@ index c0f673f..6872101 100644
      </dependency>
      <!-- Apache cTAKES -->
      <dependency>
-@@ -354,6 +397,7 @@
+@@ -354,6 +396,7 @@
        <artifactId>ctakes-core</artifactId>
        <version>3.2.2</version>
        <scope>provided</scope>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tika.git