[tika] 11/23: Remove optional-parser-dependencies.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Nov 30 20:27:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository tika.
commit 9f2baf15680554d3c48ae1d8d84bf9c263517cd3
Author: Markus Koschany <apo at debian.org>
Date: Mon Nov 30 16:11:37 2015 +0000
Remove optional-parser-dependencies.patch
---
debian/patches/optional-parser-dependencies.patch | 303 ----------------------
debian/patches/series | 1 -
2 files changed, 304 deletions(-)
diff --git a/debian/patches/optional-parser-dependencies.patch b/debian/patches/optional-parser-dependencies.patch
deleted file mode 100644
index 5d933bc..0000000
--- a/debian/patches/optional-parser-dependencies.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 30 Nov 2015 16:08:14 +0000
-Subject: optional parser dependencies
-
----
- tika-parsers/pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
-
-diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
-index c0f673f..6872101 100644
---- a/tika-parsers/pom.xml
-+++ b/tika-parsers/pom.xml
-@@ -76,16 +76,19 @@
- <groupId>org.gagravarr</groupId>
- <artifactId>vorbis-java-tika</artifactId>
- <version>${vorbis.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.healthmarketscience.jackcess</groupId>
- <artifactId>jackcess</artifactId>
- <version>2.1.2</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.healthmarketscience.jackcess</groupId>
- <artifactId>jackcess-encrypt</artifactId>
- <version>2.1.1</version>
-+ <optional>true</optional>
- </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 @@
- <groupId>net.sourceforge.jmatio</groupId>
- <artifactId>jmatio</artifactId>
- <version>1.0</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>${mime4j.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${mime4j.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>${commons.compress.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.tukaani</groupId>
- <artifactId>xz</artifactId>
- <version>${tukaani.version}</version>
-+ <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>${pdfbox.version}</version>
-+ <optional>true</optional>
- </dependency>
- <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies
- as optional, but we prefer to have them always to avoid
-@@ -139,26 +150,31 @@
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15on</artifactId>
- <version>1.52</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.52</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${poi.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-scratchpad</artifactId>
- <version>${poi.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
-+ <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
-@@ -174,61 +190,73 @@
- <groupId>org.ccil.cowan.tagsoup</groupId>
- <artifactId>tagsoup</artifactId>
- <version>1.2.1</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>5.0.4</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.googlecode.mp4parser</groupId>
- <artifactId>isoparser</artifactId>
- <version>1.0.2</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.drewnoakes</groupId>
- <artifactId>metadata-extractor</artifactId>
- <version>2.8.0</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>de.l3s.boilerpipe</groupId>
- <artifactId>boilerpipe</artifactId>
- <version>1.1.0</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <version>1.0</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.gagravarr</groupId>
- <artifactId>vorbis-java-core</artifactId>
- <version>${vorbis.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.googlecode.juniversalchardet</groupId>
- <artifactId>juniversalchardet</artifactId>
- <version>1.0.3</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.codelibs</groupId>
- <artifactId>jhighlight</artifactId>
- <version>1.0.2</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.pff</groupId>
- <artifactId>java-libpst</artifactId>
- <version>0.8.1</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.github.junrar</groupId>
- <artifactId>junrar</artifactId>
- <version>0.7</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
-+ <optional>true</optional>
- </dependency>
-
-
-@@ -238,30 +266,35 @@
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.8.10.1</version>
- <scope>provided</scope>
-+ <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-tools</artifactId>
- <version>1.5.3</version>
-+ <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
-+ <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-exec</artifactId>
- <version>1.3</version>
-+ <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
-+ <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
-@@ -274,6 +307,7 @@
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20140107</version>
-+ <optional>true</optional>
- </dependency>
-
-
-@@ -299,16 +333,19 @@
- <groupId>edu.ucar</groupId>
- <artifactId>netcdf4</artifactId>
- <version>${netcdf-java.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>grib</artifactId>
- <version>${netcdf-java.version}</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
- <version>${netcdf-java.version}</version>
-+ <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
-@@ -320,33 +357,39 @@
- <groupId>edu.ucar</groupId>
- <artifactId>httpservices</artifactId>
- <version>${netcdf-java.version}</version>
-+ <optional>true</optional>
- </dependency>
- <!-- Apache Commons CSV -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- <version>1.0</version>
-+ <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-utility</artifactId>
- <version>0.5</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-netcdf</artifactId>
- <version>0.5</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-metadata</artifactId>
- <version>0.5</version>
-+ <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.opengis</groupId>
- <artifactId>geoapi</artifactId>
- <version>3.0.0</version>
-+ <optional>true</optional>
- </dependency>
- <!-- Apache cTAKES -->
- <dependency>
-@@ -354,6 +397,7 @@
- <artifactId>ctakes-core</artifactId>
- <version>3.2.2</version>
- <scope>provided</scope>
-+ <optional>true</optional>
- </dependency>
- </dependencies>
-
diff --git a/debian/patches/series b/debian/patches/series
index 9c90618..89780df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
MP4Parser.patch
netcdf.patch
osgi.patch
-optional-parser-dependencies.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tika.git
More information about the pkg-java-commits
mailing list