You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/06/18 17:09:01 UTC
[3/6] lucene-solr:master: SOLR-8981 clean up new lines,
upgrade isoparser, add notice in CHANGES.txt
SOLR-8981 clean up new lines, upgrade isoparser, add notice in CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/31c091b4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/31c091b4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/31c091b4
Branch: refs/heads/master
Commit: 31c091b4856081f2d1b302499a436e5953779e5e
Parents: 1706b92
Author: tballison <ta...@mitre.org>
Authored: Fri Jun 17 09:47:53 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Jun 17 09:47:53 2016 -0400
----------------------------------------------------------------------
lucene/ivy-versions.properties | 3 +--
solr/CHANGES.txt | 2 +-
solr/licenses/isoparser-1.0.2.jar.sha1 | 1 -
solr/licenses/isoparser-1.1.18.jar.sha1 | 1 +
solr/licenses/jackcess-NOTICE.txt | 20 --------------------
5 files changed, 3 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31c091b4/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index d15911c..73502fa 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -38,7 +38,7 @@ com.google.inject.guice.version = 3.0
/com.google.protobuf/protobuf-java = 2.5.0
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
-/com.googlecode.mp4parser/isoparser = 1.0.2
+/com.googlecode.mp4parser/isoparser = 1.1.18
/com.healthmarketscience.jackcess/jackcess = 2.1.3
/com.ibm.icu/icu4j = 56.1
/com.pff/java-libpst = 0.8.1
@@ -182,7 +182,6 @@ org.apache.pdfbox.version = 2.0.1
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version}
-
org.apache.poi.version = 3.15-beta1
/org.apache.poi/poi = ${org.apache.poi.version}
/org.apache.poi/poi-ooxml = ${org.apache.poi.version}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31c091b4/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5286ab6..44cc6c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -49,7 +49,7 @@ Optimizations
Versions of Major Components
---------------------
-Apache Tika 1.7
+Apache Tika 1.13
Carrot2 3.12.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31c091b4/solr/licenses/isoparser-1.0.2.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/isoparser-1.0.2.jar.sha1 b/solr/licenses/isoparser-1.0.2.jar.sha1
deleted file mode 100644
index 0b57cdb..0000000
--- a/solr/licenses/isoparser-1.0.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6d9a5c5814ec67178dd1d5a25bae874d4697a5b8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31c091b4/solr/licenses/isoparser-1.1.18.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/isoparser-1.1.18.jar.sha1 b/solr/licenses/isoparser-1.1.18.jar.sha1
new file mode 100644
index 0000000..56ee07f
--- /dev/null
+++ b/solr/licenses/isoparser-1.1.18.jar.sha1
@@ -0,0 +1 @@
+c74bdac64b22f1e245a7657149a43437aae4a9d3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31c091b4/solr/licenses/jackcess-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/jackcess-NOTICE.txt b/solr/licenses/jackcess-NOTICE.txt
index 6d9855f..8b13789 100644
--- a/solr/licenses/jackcess-NOTICE.txt
+++ b/solr/licenses/jackcess-NOTICE.txt
@@ -1,21 +1 @@
-Apache POI
-Copyright 2009 The Apache Software Foundation
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product contains the DOM4J library (http://www.dom4j.org).
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
-This product contains parts that were originally based on software from BEA.
-Copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-This product contains W3C XML Schema documents. Copyright 2001-2003 (c)
-World Wide Web Consortium (Massachusetts Institute of Technology, European
-Research Consortium for Informatics and Mathematics, Keio University)
-
-This product contains the Piccolo XML Parser for Java
-(http://piccolo.sourceforge.net/). Copyright 2002 Yuval Oren.
-
-This product contains the chunks_parse_cmds.tbl file from the vsdump program.
-Copyright (C) 2006-2007 Valek Filippov (frob@df.ru)