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 2016/02/27 06:04:16 UTC
[2/2] tika git commit: Merge remote-tracking branch
'origin/bundle-classifier' into 2.x
Merge remote-tracking branch 'origin/bundle-classifier' into 2.x
Conflicts:
tika-parser-modules/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/322b1c9f
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/322b1c9f
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/322b1c9f
Branch: refs/heads/2.x
Commit: 322b1c9f09eecb8c81f6f2c2d3a5a08620c961d9
Parents: a1a2cdc c6d4476
Author: Bob Paulin <bo...@apache.org>
Authored: Fri Feb 26 23:04:02 2016 -0600
Committer: Bob Paulin <bo...@apache.org>
Committed: Fri Feb 26 23:04:02 2016 -0600
----------------------------------------------------------------------
.gitignore | 3 +-
.../tika/osgi/TikaAbstractBundleActivator.java | 12 +-
tika-parser-modules/pom.xml | 62 +++++-
.../tika-parser-multimedia-module/pom.xml | 83 ++++++++
.../module/multimedia/internal/Activator.java | 36 ++++
.../java/org/apache/tika/module/BundleIT.java | 203 +++++++++++++++++++
6 files changed, 395 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/322b1c9f/tika-parser-modules/pom.xml
----------------------------------------------------------------------
diff --cc tika-parser-modules/pom.xml
index 0e768fa,61b42a0..9d5b5e5
--- a/tika-parser-modules/pom.xml
+++ b/tika-parser-modules/pom.xml
@@@ -59,22 -59,73 +59,80 @@@
</modules>
<dependencies>
- <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
++ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.apache.tika</groupId>
++ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-test-resources</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
++ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-native</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-assembly</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tika-test-resources</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.7</version>