Repository: tika Updated Branches: refs/heads/2.x 125902c47 -> 4ed7c9f7e
TIKA-1860 - Enable osgi integration tests. Added explicit version to tika core. Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/4ed7c9f7 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/4ed7c9f7 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/4ed7c9f7 Branch: refs/heads/2.x Commit: 4ed7c9f7e63f57d4c99569533d7cc08a7c324392 Parents: 125902c Author: Bob Paulin <[email protected]> Authored: Sat Feb 27 22:48:22 2016 -0600 Committer: Bob Paulin <[email protected]> Committed: Sat Feb 27 22:48:22 2016 -0600 ---------------------------------------------------------------------- tika-parser-modules/pom.xml | 8 ++++++-- .../src/test/java/org/apache/tika/module/BundleIT.java | 6 +++++- .../src/test/java/org/apache/tika/module/BundleIT.java | 6 +++++- .../src/test/java/org/apache/tika/module/BundleIT.java | 5 ++++- .../src/test/java/org/apache/tika/module/BundleIT.java | 5 ++++- .../src/test/java/org/apache/tika/module/BundleIT.java | 6 +++++- 6 files changed, 29 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/4ed7c9f7/tika-parser-modules/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-modules/pom.xml b/tika-parser-modules/pom.xml index 536b1d2..43f2cd4 100644 --- a/tika-parser-modules/pom.xml +++ b/tika-parser-modules/pom.xml @@ -192,7 +192,7 @@ </execution> </executions> </plugin> - <!-- <plugin> + <plugin> <artifactId>maven-failsafe-plugin</artifactId> <executions> <execution> @@ -213,9 +213,13 @@ <name>project.bundle.file</name> <value>target/${project.build.finalName}-bundle.jar</value> </property> + <property> + <name>tika.core.version</name> + <value>${project.version}</value> + </property> </systemProperties> </configuration> - </plugin> --> + </plugin> </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/tika/blob/4ed7c9f7/tika-parser-modules/tika-parser-advanced-module/src/test/java/org/apache/tika/module/BundleIT.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-advanced-module/src/test/java/org/apache/tika/module/BundleIT.java b/tika-parser-modules/tika-parser-advanced-module/src/test/java/org/apache/tika/module/BundleIT.java index 8b39d38..cdfac0a 100644 --- a/tika-parser-modules/tika-parser-advanced-module/src/test/java/org/apache/tika/module/BundleIT.java +++ b/tika-parser-modules/tika-parser-advanced-module/src/test/java/org/apache/tika/module/BundleIT.java @@ -57,13 +57,17 @@ import org.xml.sax.ContentHandler; public class BundleIT { private static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file"; + + private static final String TIKA_CORE_VERSION = "tika.core.version"; + @Inject private BundleContext bc; @Configuration public Option[] configuration() throws IOException, URISyntaxException { String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP); - return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core"), + String tikaCoreVersion = System.getProperty(TIKA_CORE_VERSION); + return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core", tikaCoreVersion), bundle(new File(bundleFileName).toURI().toString())); } http://git-wip-us.apache.org/repos/asf/tika/blob/4ed7c9f7/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/module/BundleIT.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/module/BundleIT.java b/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/module/BundleIT.java index 778526e..394df11 100644 --- a/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/module/BundleIT.java +++ b/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/module/BundleIT.java @@ -57,13 +57,17 @@ import org.xml.sax.ContentHandler; public class BundleIT { private static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file"; + + private static final String TIKA_CORE_VERSION = "tika.core.version"; + @Inject private BundleContext bc; @Configuration public Option[] configuration() throws IOException, URISyntaxException { String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP); - return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core"), + String tikaCoreVersion = System.getProperty(TIKA_CORE_VERSION); + return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core", tikaCoreVersion), bundle(new File(bundleFileName).toURI().toString())); } http://git-wip-us.apache.org/repos/asf/tika/blob/4ed7c9f7/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/module/BundleIT.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/module/BundleIT.java b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/module/BundleIT.java index c9f821f..af1fa22 100644 --- a/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/module/BundleIT.java +++ b/tika-parser-modules/tika-parser-code-module/src/test/java/org/apache/tika/module/BundleIT.java @@ -57,13 +57,16 @@ import org.xml.sax.ContentHandler; public class BundleIT { private static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file"; + + private static final String TIKA_CORE_VERSION = "tika.core.version"; @Inject private BundleContext bc; @Configuration public Option[] configuration() throws IOException, URISyntaxException { String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP); - return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core"), + String tikaCoreVersion = System.getProperty(TIKA_CORE_VERSION); + return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core", tikaCoreVersion), bundle(new File(bundleFileName).toURI().toString())); } http://git-wip-us.apache.org/repos/asf/tika/blob/4ed7c9f7/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/module/BundleIT.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/module/BundleIT.java b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/module/BundleIT.java index 7e3c297..441baa5 100644 --- a/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/module/BundleIT.java +++ b/tika-parser-modules/tika-parser-crypto-module/src/test/java/org/apache/tika/module/BundleIT.java @@ -57,13 +57,16 @@ import org.xml.sax.ContentHandler; public class BundleIT { private static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file"; + + private static final String TIKA_CORE_VERSION = "tika.core.version"; @Inject private BundleContext bc; @Configuration public Option[] configuration() throws IOException, URISyntaxException { String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP); - return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core"), + String tikaCoreVersion = System.getProperty(TIKA_CORE_VERSION); + return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core", tikaCoreVersion), bundle(new File(bundleFileName).toURI().toString())); } http://git-wip-us.apache.org/repos/asf/tika/blob/4ed7c9f7/tika-parser-modules/tika-parser-multimedia-module/src/test/java/org/apache/tika/module/BundleIT.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-multimedia-module/src/test/java/org/apache/tika/module/BundleIT.java b/tika-parser-modules/tika-parser-multimedia-module/src/test/java/org/apache/tika/module/BundleIT.java index 5817691..3b903da 100644 --- a/tika-parser-modules/tika-parser-multimedia-module/src/test/java/org/apache/tika/module/BundleIT.java +++ b/tika-parser-modules/tika-parser-multimedia-module/src/test/java/org/apache/tika/module/BundleIT.java @@ -57,13 +57,17 @@ import org.xml.sax.ContentHandler; public class BundleIT { private static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file"; + + private static final String TIKA_CORE_VERSION = "tika.core.version"; + @Inject private BundleContext bc; @Configuration public Option[] configuration() throws IOException, URISyntaxException { String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP); - return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core"), + String tikaCoreVersion = System.getProperty(TIKA_CORE_VERSION); + return options(junitBundles(), mavenBundle("org.apache.tika", "tika-core", tikaCoreVersion), bundle(new File(bundleFileName).toURI().toString())); }
