This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository tika.
commit 31789e0e514bd00f68e20cecd87a8d9895640913 Author: Markus Koschany <[email protected]> Date: Mon Nov 30 15:49:57 2015 +0000 Drop 06-optional-parser-dependencies.patch --- .../patches/06-optional-parser-dependencies.patch | 149 --------------------- debian/patches/series | 1 - 2 files changed, 150 deletions(-) diff --git a/debian/patches/06-optional-parser-dependencies.patch b/debian/patches/06-optional-parser-dependencies.patch deleted file mode 100644 index dab8468..0000000 --- a/debian/patches/06-optional-parser-dependencies.patch +++ /dev/null @@ -1,149 +0,0 @@ -Description: Mark the parser dependencies as optional -Author: Emmanuel Bourg <[email protected]> -Forwarded: no ---- a/tika-parsers/pom.xml -+++ b/tika-parsers/pom.xml -@@ -62,6 +62,7 @@ - <groupId>org.gagravarr</groupId> - <artifactId>vorbis-java-tika</artifactId> - <version>${vorbis.version}</version> -+ <optional>true</optional> - </dependency> - - <!-- Optional OSGi dependencies, used only when running within OSGi --> -@@ -76,31 +77,37 @@ - <groupId>edu.ucar</groupId> - <artifactId>netcdf</artifactId> - <version>4.2-min</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>1.5</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>1.8.4</version> -+ <optional>true</optional> - </dependency> - <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies - as optional, but we prefer to have them always to avoid -@@ -109,26 +116,31 @@ - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15</artifactId> - <version>1.45</version> -+ <optional>true</optional> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15</artifactId> - <version>1.45</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> -@@ -149,46 +161,55 @@ - <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-debug-all</artifactId> - <version>4.1</version> -+ <optional>true</optional> - </dependency> - <dependency> - <groupId>com.googlecode.mp4parser</groupId> - <artifactId>isoparser</artifactId> - <version>1.0-RC-1</version> -+ <optional>true</optional> - </dependency> - <dependency> - <groupId>com.drewnoakes</groupId> - <artifactId>metadata-extractor</artifactId> - <version>2.6.2</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>0.9</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>com.uwyn</groupId> - <artifactId>jhighlight</artifactId> - <version>1.0</version> -+ <optional>true</optional> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> ---- a/tika-xmp/pom.xml -+++ b/tika-xmp/pom.xml -@@ -75,6 +75,7 @@ - <groupId>com.adobe.xmp</groupId> - <artifactId>xmpcore</artifactId> - <version>5.1.2</version> -+ <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> diff --git a/debian/patches/series b/debian/patches/series index 8551c41..da693f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01-jar-packaging.patch -06-optional-parser-dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tika.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
