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 2015/01/18 16:47:27 UTC
svn commit: r1652784 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/licenses/
Author: uschindler
Date: Sun Jan 18 15:47:27 2015
New Revision: 1652784
URL: http://svn.apache.org/r1652784
Log:
Merged revision(s) 1652783 from lucene/dev/trunk:
SOLR-6991: Add missing license and notice. Remove outdated stuff from notice files.
Added:
lucene/dev/branches/branch_5x/solr/licenses/tika-java7-LICENSE-ASL.txt
- copied unchanged from r1652783, lucene/dev/trunk/solr/licenses/tika-java7-LICENSE-ASL.txt
lucene/dev/branches/branch_5x/solr/licenses/tika-java7-NOTICE.txt
- copied unchanged from r1652783, lucene/dev/trunk/solr/licenses/tika-java7-NOTICE.txt
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/licenses/ (props changed)
lucene/dev/branches/branch_5x/solr/licenses/tika-core-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/tika-parsers-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/tika-xmp-NOTICE.txt
Modified: lucene/dev/branches/branch_5x/solr/licenses/tika-core-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/licenses/tika-core-NOTICE.txt?rev=1652784&r1=1652783&r2=1652784&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/licenses/tika-core-NOTICE.txt (original)
+++ lucene/dev/branches/branch_5x/solr/licenses/tika-core-NOTICE.txt Sun Jan 18 15:47:27 2015
@@ -1,12 +1,9 @@
Apache Tika
-Copyright 2011 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
-This software contains code derived from UCAR/Unidata's NetCDF library.
-
Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and
Grizzly (http://grizzly.java.net/)
Modified: lucene/dev/branches/branch_5x/solr/licenses/tika-parsers-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/licenses/tika-parsers-NOTICE.txt?rev=1652784&r1=1652783&r2=1652784&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/licenses/tika-parsers-NOTICE.txt (original)
+++ lucene/dev/branches/branch_5x/solr/licenses/tika-parsers-NOTICE.txt Sun Jan 18 15:47:27 2015
@@ -1,12 +1,9 @@
Apache Tika parsers
-Copyright 2011 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
-This software contains code derived from UCAR/Unidata's NetCDF library.
-
Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and
Grizzly (http://grizzly.java.net/)
Modified: lucene/dev/branches/branch_5x/solr/licenses/tika-xmp-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/licenses/tika-xmp-NOTICE.txt?rev=1652784&r1=1652783&r2=1652784&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/licenses/tika-xmp-NOTICE.txt (original)
+++ lucene/dev/branches/branch_5x/solr/licenses/tika-xmp-NOTICE.txt Sun Jan 18 15:47:27 2015
@@ -1,12 +1,9 @@
Apache Tika xmp
-Copyright 2011 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
-This software contains code derived from UCAR/Unidata's NetCDF library.
-
Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and
Grizzly (http://grizzly.java.net/)