Upgrade tika to 1.4 (Closes #4 and #5)

KevM · Jul 12, 2013 · a060902 · a060902
1 parent d63df0e
commit a060902
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 13 deletions.
diff --git a/TikaOnDotnet/TikaOnDotnet.csproj b/TikaOnDotnet/TikaOnDotnet.csproj
@@ -35,49 +35,49 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="IKVM.OpenJDK.Core, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.Core, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.Core.dll</HintPath>
     </Reference>
     <Reference Include="IKVM.OpenJDK.Jdbc">
       <HintPath>..\lib\IKVM.OpenJDK.Jdbc.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.Media, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.Media, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.Media.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.Security, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.Security, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.Security.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.SwingAWT, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.SwingAWT, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.SwingAWT.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.Text, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.Text, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.Text.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.Util, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.Util, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.Util.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.XML.API, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.XML.API, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.XML.API.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.XML.Parse, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.XML.Parse, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.XML.Parse.dll</HintPath>
     </Reference>
     <Reference Include="IKVM.OpenJDK.XML.Transform">
       <HintPath>..\lib\IKVM.OpenJDK.XML.Transform.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.OpenJDK.XML.XPath, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.OpenJDK.XML.XPath, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.OpenJDK.XML.XPath.dll</HintPath>
     </Reference>
-    <Reference Include="IKVM.Runtime, Version=0.42.0.6, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+    <Reference Include="IKVM.Runtime, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\IKVM.Runtime.dll</HintPath>
     </Reference>
@@ -89,8 +89,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="tika-app-0.9">
-      <HintPath>..\lib\tika-app-0.9.dll</HintPath>
+    <Reference Include="tika-app-1.4">
+      <HintPath>..\lib\tika-app-1.4.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/TikaOnDotnet/tikadriver_examples.cs b/TikaOnDotnet/tikadriver_examples.cs
@@ -31,7 +31,7 @@ public void should_extract_from_jpg()
 		{
 			var textExtractionResult = _cut.Extract("apache.jpg");
 
-			textExtractionResult.Text.ShouldBeEmpty();
+			textExtractionResult.Text.Trim().ShouldBeEmpty();
 
 			textExtractionResult.Metadata["Software"].ShouldContain("Paint.NET");
 

diff --git a/lib/IKVM.OpenJDK.Core.dll b/lib/IKVM.OpenJDK.Core.dll
diff --git a/lib/IKVM.OpenJDK.Jdbc.dll b/lib/IKVM.OpenJDK.Jdbc.dll
diff --git a/lib/IKVM.OpenJDK.Media.dll b/lib/IKVM.OpenJDK.Media.dll
diff --git a/lib/IKVM.OpenJDK.Security.dll b/lib/IKVM.OpenJDK.Security.dll
diff --git a/lib/IKVM.OpenJDK.SwingAWT.dll b/lib/IKVM.OpenJDK.SwingAWT.dll
diff --git a/lib/IKVM.OpenJDK.Text.dll b/lib/IKVM.OpenJDK.Text.dll
diff --git a/lib/IKVM.OpenJDK.Util.dll b/lib/IKVM.OpenJDK.Util.dll
diff --git a/lib/IKVM.OpenJDK.XML.API.dll b/lib/IKVM.OpenJDK.XML.API.dll
diff --git a/lib/IKVM.OpenJDK.XML.Parse.dll b/lib/IKVM.OpenJDK.XML.Parse.dll
diff --git a/lib/IKVM.OpenJDK.XML.Transform.dll b/lib/IKVM.OpenJDK.XML.Transform.dll
diff --git a/lib/IKVM.OpenJDK.XML.XPath.dll b/lib/IKVM.OpenJDK.XML.XPath.dll
diff --git a/lib/IKVM.Runtime.dll b/lib/IKVM.Runtime.dll
diff --git a/lib/tika-app-0.9.dll → lib/tika-app-1.4.dll b/lib/tika-app-0.9.dll → lib/tika-app-1.4.dll