You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/17 14:11:42 UTC

[lucene-solr] 02/03: SOLR-14104: clean up asm license.

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 98965b6c9865d66c0a610eaa863eadd6858947d1
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Tue Dec 17 15:07:38 2019 +0100

    SOLR-14104: clean up asm license.
---
 solr/licenses/asm-LICENSE-BSD.txt      |  2 +-
 solr/licenses/asm-LICENSE-BSD_LIKE.txt | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/solr/licenses/asm-LICENSE-BSD.txt b/solr/licenses/asm-LICENSE-BSD.txt
index dda31be..6acb534 100644
--- a/solr/licenses/asm-LICENSE-BSD.txt
+++ b/solr/licenses/asm-LICENSE-BSD.txt
@@ -1,6 +1,6 @@
 /***
  * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2007 INRIA, France Telecom
+ * Copyright (c) 2000-2011 INRIA, France Telecom
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/solr/licenses/asm-LICENSE-BSD_LIKE.txt b/solr/licenses/asm-LICENSE-BSD_LIKE.txt
deleted file mode 100644
index afb064f..0000000
--- a/solr/licenses/asm-LICENSE-BSD_LIKE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2012 France Télécom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. 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.
-3. Neither the name of the copyright holders 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 OWNER 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.