You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2016/11/16 04:19:33 UTC

[2/2] nifi git commit: NIFI-2374 This closes #712. updated to latest tika versions where possible, updated doc, commented why cannot update media nar

NIFI-2374 This closes #712. updated to latest tika versions where possible, updated doc, commented why cannot update media nar


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/45a5f529
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/45a5f529
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/45a5f529

Branch: refs/heads/master
Commit: 45a5f5295c611625cac700412630c16de2270b27
Parents: 3e571f9
Author: joewitt <jo...@apache.org>
Authored: Tue Nov 15 22:49:49 2016 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Nov 15 23:18:55 2016 -0500

----------------------------------------------------------------------
 .../nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml       | 2 +-
 nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml  | 3 +++
 .../nifi-standard-bundle/nifi-standard-processors/pom.xml         | 2 +-
 .../additionalDetails.html                                        | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/45a5f529/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index 55dd50f..f054904 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.7</version>
+            <version>1.14</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/45a5f529/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
index 99ae4e6..3e2c059 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
@@ -44,6 +44,9 @@
             <artifactId>metadata-extractor</artifactId>
             <version>2.8.0</version>
         </dependency>
+        <!-- Would like a newer version of tika-core and tika-parsers but newer 
+        tika-parser versions have cat-X json lib and other libraries that need to
+        have their license validated such as geoapis. --> 
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/45a5f529/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index f6786c6..10b8b10 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -155,7 +155,7 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.7</version>
+            <version>1.14</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/45a5f529/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
index e90868a..0f5ac76 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
@@ -56,7 +56,7 @@
             <li>application/x-lzh</li>
         </ul>
         <p>For a complete list, please refer to
-            <a href="https://git-wip-us.apache.org/repos/asf?p=tika.git;a=blob;f=tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml;h=49314cc5351c11cd2bd245501f66e8649d2a2742;hb=386b68b5ae87beafacfb63f33e0a9888dedb9c30">
+            <a href="https://git-wip-us.apache.org/repos/asf?p=tika.git;a=blob;f=tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml;h=fffb9bbca8f49d2265479da798c0c01ceb2060e2;hb=d647a234783bbc3f83d3691a1e1d5788c438d55d">
                 Apache Tika's source code</a>
         </p>