You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2010/02/17 13:32:23 UTC
svn commit: r910949 - in /lucene/tika/trunk: tika-app/src/main/appended-resources/META-INF/LICENSE tika-bundle/src/main/appended-resources/META-INF/LICENSE tika-parsers/pom.xml

Author: jukka
Date: Wed Feb 17 12:32:23 2010
New Revision: 910949

URL: http://svn.apache.org/viewvc?rev=910949&view=rev
Log:
TIKA-370: Tika pom.xml is missing dependencies on bouncycastle jars needed by PDFBox

Upgrade to latest version from Bouncy Castle. Update LICENSE files.

Modified:
    lucene/tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE
    lucene/tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE
    lucene/tika/trunk/tika-parsers/pom.xml

Modified: lucene/tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE?rev=910949&r1=910948&r2=910949&view=diff
==============================================================================
--- lucene/tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE (original)
+++ lucene/tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE Wed Feb 17 12:32:23 2010
@@ -6,7 +6,7 @@
 
 Bouncy Castle libraries (bcmail and bcprov)
 
-    Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
+    Copyright (c) 2000-2009 The Legion Of The Bouncy Castle
     (http://www.bouncycastle.org)
 
     Permission is hereby granted, free of charge, to any person obtaining

Modified: lucene/tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE?rev=910949&r1=910948&r2=910949&view=diff
==============================================================================
--- lucene/tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE (original)
+++ lucene/tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE Wed Feb 17 12:32:23 2010
@@ -4,6 +4,30 @@
 and license terms. Your use of these subcomponents is subject to the terms and
 conditions of the following licenses.
 
+Bouncy Castle libraries (bcmail and bcprov)
+
+    Copyright (c) 2000-2009 The Legion Of The Bouncy Castle
+    (http://www.bouncycastle.org)
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files
+    (the "Software"), to deal in the Software without restriction, 
+    including without limitation the rights to use, copy, modify, merge,
+    publish, distribute, sublicense, and/or sell copies of the Software,
+    and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.
+
 Contributions made to the original PDFBox, JempBox and FontBox projects:
 
     Copyright (c) 2002-2007, www.pdfbox.org

Modified: lucene/tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/pom.xml?rev=910949&r1=910948&r2=910949&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/pom.xml (original)
+++ lucene/tika/trunk/tika-parsers/pom.xml Wed Feb 17 12:32:23 2010
@@ -60,12 +60,12 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcmail-jdk15</artifactId>
-      <version>1.44</version>
+      <version>1.45</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>
-      <version>1.44</version>
+      <version>1.45</version>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>