Repository: tika Updated Branches: refs/heads/2.x 7fc182f3a -> 73d720a83
TIKA-1851: fix dependency in tika-server to pickup MockParser in tika-test-resources Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/73d720a8 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/73d720a8 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/73d720a8 Branch: refs/heads/2.x Commit: 73d720a83d759f53f531042f7bc204bcb6714660 Parents: 7fc182f Author: tballison <[email protected]> Authored: Fri Feb 5 20:53:56 2016 -0500 Committer: tballison <[email protected]> Committed: Fri Feb 5 20:53:56 2016 -0500 ---------------------------------------------------------------------- tika-server/pom.xml | 6 ++++++ .../META-INF/services/org.apache.tika.parser.Parser | 16 ---------------- .../META-INF/services/org.apache.tika.parser.Parser | 1 + .../META-INF/services/org.apache.tika.parser.Parser | 1 - 4 files changed, 7 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/73d720a8/tika-server/pom.xml ---------------------------------------------------------------------- diff --git a/tika-server/pom.xml b/tika-server/pom.xml index 6f267f6..4634068 100644 --- a/tika-server/pom.xml +++ b/tika-server/pom.xml @@ -120,6 +120,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tika-test-resources</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/tika/blob/73d720a8/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser ---------------------------------------------------------------------- diff --git a/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser deleted file mode 100644 index d0462b1..0000000 --- a/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -org.apache.tika.parser.evil.EvilParser \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tika/blob/73d720a8/tika-test-resources/src/main/resources/META-INF/services/org.apache.tika.parser.Parser ---------------------------------------------------------------------- diff --git a/tika-test-resources/src/main/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-test-resources/src/main/resources/META-INF/services/org.apache.tika.parser.Parser new file mode 100644 index 0000000..69bfdeb --- /dev/null +++ b/tika-test-resources/src/main/resources/META-INF/services/org.apache.tika.parser.Parser @@ -0,0 +1 @@ +org.apache.tika.parser.mock.MockParser \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tika/blob/73d720a8/tika-test-resources/src/test/resources/META-INF/services/org.apache.tika.parser.Parser ---------------------------------------------------------------------- diff --git a/tika-test-resources/src/test/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-test-resources/src/test/resources/META-INF/services/org.apache.tika.parser.Parser deleted file mode 100644 index 69bfdeb..0000000 --- a/tika-test-resources/src/test/resources/META-INF/services/org.apache.tika.parser.Parser +++ /dev/null @@ -1 +0,0 @@ -org.apache.tika.parser.mock.MockParser \ No newline at end of file
