You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/05/22 19:55:24 UTC
lucene-solr:branch_6x: SOLR-10725: add license links to NOTICE.txt
and remove solr-ref-guide license directory
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 3253be6ed -> 6eb47eb0a
SOLR-10725: add license links to NOTICE.txt and remove solr-ref-guide license directory
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6eb47eb0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6eb47eb0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6eb47eb0
Branch: refs/heads/branch_6x
Commit: 6eb47eb0a194cc867ed5fb9e1f5a2d3ac478783f
Parents: 3253be6
Author: Cassandra Targett <ct...@apache.org>
Authored: Mon May 22 14:53:49 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Mon May 22 14:55:11 2017 -0500
----------------------------------------------------------------------
solr/NOTICE.txt | 18 +++++++++----
solr/solr-ref-guide/src/licenses/LICENSE | 21 ---------------
.../src/licenses/LICENSE-BSD-NAVGOCO.txt | 27 --------------------
3 files changed, 13 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6eb47eb0/solr/NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt
index 54babbb..55e7052 100644
--- a/solr/NOTICE.txt
+++ b/solr/NOTICE.txt
@@ -82,6 +82,14 @@ the Apache Blur incubating project and are Apache License 2.0.
ASM (Java bytecode manipulation and analysis framework): http://asm.ow2.org/
Copyright (c) 2000-2005 INRIA, France Telecom
+This project includes portions of the Jekyll Documentation Theme
+Copyright (c) 2016 Tom Johnson
+License: MIT https://github.com/tomjohnson1492/documentation-theme-jekyll/blob/gh-pages/licenses/LICENSE
+
+This project includes the Navgoco JQuery plugin
+Copyright (c) 2013 Christopher Tsoulloftas, http://www.komposta.net
+License: BSD https://github.com/tefra/navgoco/blob/master/LICENSE-BSD
+
=========================================================================
== Antlr2 Notice ==
=========================================================================
@@ -142,13 +150,13 @@ Some data files (under analysis/icu/src/data) are derived from Unicode data such
as the Unicode Character Database. See http://unicode.org/copyright.html for more
details.
-Brics Automaton (under core/src/java/org/apache/lucene/util/automaton) is
+Brics Automaton (under core/src/java/org/apache/lucene/util/automaton) is
BSD-licensed, created by Anders Møller. See http://www.brics.dk/automaton/
The levenshtein automata tables (under core/src/java/org/apache/lucene/util/automaton) were
automatically generated with the moman/finenight FSA library, created by
Jean-Philippe Barrette-LaPierre. This library is available under an MIT license,
-see http://sites.google.com/site/rrettesite/moman and
+see http://sites.google.com/site/rrettesite/moman and
http://bitbucket.org/jpbarrette/moman/overview/
The class org.apache.lucene.util.WeakIdentityMap was derived from
@@ -202,7 +210,7 @@ analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.ja
analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java
analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java
-The Stempel analyzer (stempel) includes BSD-licensed software developed
+The Stempel analyzer (stempel) includes BSD-licensed software developed
by the Egothor project http://egothor.sf.net/, created by Leo Galambos, Martin Kvapil,
and Edmond Nolan.
@@ -214,8 +222,8 @@ See http://project.carrot2.org/license.html.
The SmartChineseAnalyzer source code (smartcn) was
provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
-WordBreakTestUnicode_*.java (under modules/analysis/common/src/test/)
-is derived from Unicode data such as the Unicode Character Database.
+WordBreakTestUnicode_*.java (under modules/analysis/common/src/test/)
+is derived from Unicode data such as the Unicode Character Database.
See http://unicode.org/copyright.html for more details.
The Morfologik analyzer (morfologik) includes BSD-licensed software
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6eb47eb0/solr/solr-ref-guide/src/licenses/LICENSE
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/licenses/LICENSE b/solr/solr-ref-guide/src/licenses/LICENSE
deleted file mode 100755
index e04b3d0..0000000
--- a/solr/solr-ref-guide/src/licenses/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Tom Johnson
-
-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.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6eb47eb0/solr/solr-ref-guide/src/licenses/LICENSE-BSD-NAVGOCO.txt
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/licenses/LICENSE-BSD-NAVGOCO.txt b/solr/solr-ref-guide/src/licenses/LICENSE-BSD-NAVGOCO.txt
deleted file mode 100755
index 7fdefc3..0000000
--- a/solr/solr-ref-guide/src/licenses/LICENSE-BSD-NAVGOCO.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This license pertains to the Navgoco jQuery component used for the sidebar. */
-
-Copyright (c) 2013, Christodoulos Tsoulloftas, http://www.komposta.net
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the <Christodoulos Tsoulloftas> nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file