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 2016/02/24 09:27:56 UTC
lucene-solr git commit: SOLR-8711: follow-up removal of dependencies
no longer used. (applying again, with changes to the sources).
Repository: lucene-solr
Updated Branches:
refs/heads/master 594fb908f -> 4c9dca8d9
SOLR-8711: follow-up removal of dependencies no longer used. (applying
again, with changes to the sources).
This reverts commit 594fb908f6b922990d15855a2c04437e24fb26f4.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4c9dca8d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4c9dca8d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4c9dca8d
Branch: refs/heads/master
Commit: 4c9dca8d90d938d0458c2e60a8ca1102020e8ea8
Parents: 594fb90
Author: Dawid Weiss <dw...@apache.org>
Authored: Wed Feb 24 09:27:06 2016 +0100
Committer: Dawid Weiss <dw...@apache.org>
Committed: Wed Feb 24 09:27:06 2016 +0100
----------------------------------------------------------------------
lucene/ivy-versions.properties | 4 +-
solr/contrib/clustering/ivy.xml | 3 -
.../SolrStopwordsCarrot2LexicalDataFactory.java | 6 +-
.../carrot2/EchoClusteringAlgorithm.java | 6 +-
.../carrot2/EchoStemsClusteringAlgorithm.java | 8 +-
.../carrot2/EchoTokensClusteringAlgorithm.java | 6 +-
...exicalResourcesCheckClusteringAlgorithm.java | 6 +-
.../carrot2/MockClusteringAlgorithm.java | 12 +-
solr/licenses/attributes-binder-1.2.3.jar.sha1 | 1 -
solr/licenses/attributes-binder-1.3.1.jar.sha1 | 1 +
solr/licenses/mahout-collections-1.0.jar.sha1 | 1 -
.../licenses/mahout-collections-LICENSE-ASL.txt | 202 -------------------
solr/licenses/mahout-collections-NOTICE.txt | 56 -----
solr/licenses/mahout-math-0.6.jar.sha1 | 1 -
solr/licenses/mahout-math-LICENSE-ASL.txt | 202 -------------------
solr/licenses/mahout-math-NOTICE.txt | 56 -----
16 files changed, 24 insertions(+), 547 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 0c2808b..2d630a2 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -171,8 +171,6 @@ org.apache.james.apache.mime4j.version = 0.7.2
/org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j.version}
/org.apache.james/apache-mime4j-dom = ${org.apache.james.apache.mime4j.version}
-/org.apache.mahout/mahout-collections = 1.0
-/org.apache.mahout/mahout-math = 0.6
/org.apache.mina/mina-core = 2.0.0-M5
/org.apache.mrunit/mrunit = 1.0.0
@@ -210,7 +208,7 @@ org.bouncycastle.version = 1.45
/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
/org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
-/org.carrot2.attributes/attributes-binder = 1.2.3
+/org.carrot2.attributes/attributes-binder = 1.3.1
/org.carrot2.shaded/carrot2-guava = 18.0
/org.carrot2/carrot2-mini = 3.12.0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/contrib/clustering/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/ivy.xml b/solr/contrib/clustering/ivy.xml
index 450e9e2..a799c79 100644
--- a/solr/contrib/clustering/ivy.xml
+++ b/solr/contrib/clustering/ivy.xml
@@ -29,9 +29,6 @@
<dependency org="org.simpleframework" name="simple-xml" rev="${/org.simpleframework/simple-xml}" conf="compile"/>
- <dependency org="org.apache.mahout" name="mahout-math" rev="${/org.apache.mahout/mahout-math}" conf="compile"/>
- <dependency org="org.apache.mahout" name="mahout-collections" rev="${/org.apache.mahout/mahout-collections}" conf="compile"/>
-
<dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="compile"/>
<dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="compile"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
index 85402eb..2b21103 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
@@ -57,12 +57,12 @@ public class SolrStopwordsCarrot2LexicalDataFactory implements ILexicalDataFacto
@Init
@Input
@Attribute(key = "solrCore")
- private SolrCore core;
+ public SolrCore core;
@Processing
@Input
@Attribute(key = "solrFieldNames")
- private Set<String> fieldNames;
+ public Set<String> fieldNames;
/**
* A lazily-built cache of stop words per field.
@@ -73,7 +73,7 @@ public class SolrStopwordsCarrot2LexicalDataFactory implements ILexicalDataFacto
* Carrot2's default lexical resources to use in addition to Solr's stop
* words.
*/
- private DefaultLexicalDataFactory carrot2LexicalDataFactory = new DefaultLexicalDataFactory();
+ public DefaultLexicalDataFactory carrot2LexicalDataFactory = new DefaultLexicalDataFactory();
/**
* Obtains stop words for a field from the associated
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java
index acaed34..5fb13f8 100644
--- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java
+++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java
@@ -41,17 +41,17 @@ public class EchoClusteringAlgorithm extends ProcessingComponentBase implements
@Input
@Processing
@Attribute(key = AttributeNames.DOCUMENTS)
- private List<Document> documents;
+ public List<Document> documents;
@Output
@Processing
@Attribute(key = AttributeNames.CLUSTERS)
- private List<Cluster> clusters;
+ public List<Cluster> clusters;
@Input
@Processing
@Attribute(key = "custom-fields")
- private String customFields = "";
+ public String customFields = "";
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java
index d2392a5..dfd762f 100644
--- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java
+++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java
@@ -48,14 +48,14 @@ public class EchoStemsClusteringAlgorithm extends ProcessingComponentBase
@Input
@Processing
@Attribute(key = AttributeNames.DOCUMENTS)
- private List<Document> documents;
+ public List<Document> documents;
@Output
@Processing
@Attribute(key = AttributeNames.CLUSTERS)
- private List<Cluster> clusters;
-
- BasicPreprocessingPipeline preprocessing = new BasicPreprocessingPipeline();
+ public List<Cluster> clusters;
+
+ public BasicPreprocessingPipeline preprocessing = new BasicPreprocessingPipeline();
@Override
public void process() throws ProcessingException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java
index 9ef04fb..0346209 100644
--- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java
+++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java
@@ -45,14 +45,14 @@ public class EchoTokensClusteringAlgorithm extends ProcessingComponentBase
@Input
@Processing
@Attribute(key = AttributeNames.DOCUMENTS)
- private List<Document> documents;
+ public List<Document> documents;
@Output
@Processing
@Attribute(key = AttributeNames.CLUSTERS)
- private List<Cluster> clusters;
+ public List<Cluster> clusters;
- BasicPreprocessingPipeline preprocessing = new BasicPreprocessingPipeline();
+ public BasicPreprocessingPipeline preprocessing = new BasicPreprocessingPipeline();
@Override
public void process() throws ProcessingException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
index 00dd609..e32f5af 100644
--- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
+++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
@@ -49,14 +49,14 @@ public class LexicalResourcesCheckClusteringAlgorithm extends
@Output
@Processing
@Attribute(key = AttributeNames.CLUSTERS)
- private List<Cluster> clusters;
+ public List<Cluster> clusters;
@Input
@Processing
@Attribute
- private String wordsToCheck;
+ public String wordsToCheck;
- private BasicPreprocessingPipeline preprocessing = new BasicPreprocessingPipeline();
+ public BasicPreprocessingPipeline preprocessing = new BasicPreprocessingPipeline();
@Override
public void process() throws ProcessingException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java
index 8b33588..899bcbc 100644
--- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java
+++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java
@@ -30,35 +30,35 @@ public class MockClusteringAlgorithm extends ProcessingComponentBase implements
@Input
@Processing
@Attribute(key = AttributeNames.DOCUMENTS)
- private List<Document> documents;
+ public List<Document> documents;
@Output
@Processing
@Attribute(key = AttributeNames.CLUSTERS)
- private List<Cluster> clusters;
+ public List<Cluster> clusters;
@Input
@Processing
@Attribute
@IntRange(min = 1, max = 5)
- private int depth = 2;
+ public int depth = 2;
@Input
@Processing
@Attribute
@IntRange(min = 1, max = 5)
- private int labels = 1;
+ public int labels = 1;
@Input
@Processing
@Attribute
@IntRange(min = 0)
- private int maxClusters = 0;
+ public int maxClusters = 0;
@Input
@Processing
@Attribute
- private int otherTopicsModulo = 0;
+ public int otherTopicsModulo = 0;
@Override
public void process() throws ProcessingException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/attributes-binder-1.2.3.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/attributes-binder-1.2.3.jar.sha1 b/solr/licenses/attributes-binder-1.2.3.jar.sha1
deleted file mode 100644
index 7433910..0000000
--- a/solr/licenses/attributes-binder-1.2.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4dd69fb0bac1148a408d88a0e0ef5b92edcee70f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/attributes-binder-1.3.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/attributes-binder-1.3.1.jar.sha1 b/solr/licenses/attributes-binder-1.3.1.jar.sha1
new file mode 100644
index 0000000..0467976
--- /dev/null
+++ b/solr/licenses/attributes-binder-1.3.1.jar.sha1
@@ -0,0 +1 @@
+25e015cc2cfa2080aa53cca3449b1272da9065b4
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/mahout-collections-1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/mahout-collections-1.0.jar.sha1 b/solr/licenses/mahout-collections-1.0.jar.sha1
deleted file mode 100644
index bcbc1f8..0000000
--- a/solr/licenses/mahout-collections-1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b900df4d03b7ac108a48424e5d1632aa0a2ebdf
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/mahout-collections-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/mahout-collections-LICENSE-ASL.txt b/solr/licenses/mahout-collections-LICENSE-ASL.txt
deleted file mode 100644
index d645695..0000000
--- a/solr/licenses/mahout-collections-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/mahout-collections-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/mahout-collections-NOTICE.txt b/solr/licenses/mahout-collections-NOTICE.txt
deleted file mode 100644
index cb1207d..0000000
--- a/solr/licenses/mahout-collections-NOTICE.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-
-Mahout Collections
-Copyright 2008-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-==============================================================
- Apache Mahout
- Copyright 2009 The Apache Software Foundation
-==============================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Includes software from other Apache Software Foundation projects,
-including, but not limited to:
- - Apache Lucene Java
- - Apache Hadoop
- - Apache Commons
-
-This product includes software developed by the Indiana University
- Extreme! Lab (http://www.extreme.indiana.edu/).
- Copyright (c) 2002 Extreme! Lab, Indiana University.
-
-This product includes examples code from the Watchmaker project
- https://watchmaker.dev.java.net/
- Copyright (c) 2006-2009 Daniel W. Dyer.
-
-This product includes libraries developed by the Kosmos project (http://kosmosfs.sourceforge.net/)
- Copyright 2008 Quantcast Corp.
- Copyright 2007 Kosmix Corp.
-
-This product includes software developed by the Jets3T project (https://jets3t.dev.java.net/)
-Copyright (c) 2008 James Murty
-
-This product includes libraries developed by the CGLib project (http://cglib.sourceforge.net/)
-Copyright (c) 2008, cglib
-
-This product includes a JUnit jar: http://junit.sourceforge.net/
-License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
-Copyright (c) 2000-2006, www.hamcrest.org
-
-This product includes code from the XStream project (http://xstream.codehaus.org/)
-Copyright (c) 2003-2006, Joe Walnes
-Copyright (c) 2006-2007, XStream Committers
-
-This product includes tests written with EasyMock
-Copyright 2001-2007 Tammo Freese (http://www.easymock.org/)
-
-This product uses the Breast Cancer Wisconsin (Diagnostic) Dataset from the
-UCI Machine Learning Repository [http://www.ics.uci.edu/~mlearn/MLRepository.html, http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)].
-
-This product contains parts of the Bayesian Logic (BLOG) Inference Engine.
-Copyright (c) 2005, Regents of the University of California
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/mahout-math-0.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/mahout-math-0.6.jar.sha1 b/solr/licenses/mahout-math-0.6.jar.sha1
deleted file mode 100644
index be99d93..0000000
--- a/solr/licenses/mahout-math-0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4958aae94b34bf42e9001c6e322f2fa299f53cde
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/mahout-math-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/mahout-math-LICENSE-ASL.txt b/solr/licenses/mahout-math-LICENSE-ASL.txt
deleted file mode 100644
index d645695..0000000
--- a/solr/licenses/mahout-math-LICENSE-ASL.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c9dca8d/solr/licenses/mahout-math-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/mahout-math-NOTICE.txt b/solr/licenses/mahout-math-NOTICE.txt
deleted file mode 100644
index cb1207d..0000000
--- a/solr/licenses/mahout-math-NOTICE.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-
-Mahout Collections
-Copyright 2008-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-==============================================================
- Apache Mahout
- Copyright 2009 The Apache Software Foundation
-==============================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Includes software from other Apache Software Foundation projects,
-including, but not limited to:
- - Apache Lucene Java
- - Apache Hadoop
- - Apache Commons
-
-This product includes software developed by the Indiana University
- Extreme! Lab (http://www.extreme.indiana.edu/).
- Copyright (c) 2002 Extreme! Lab, Indiana University.
-
-This product includes examples code from the Watchmaker project
- https://watchmaker.dev.java.net/
- Copyright (c) 2006-2009 Daniel W. Dyer.
-
-This product includes libraries developed by the Kosmos project (http://kosmosfs.sourceforge.net/)
- Copyright 2008 Quantcast Corp.
- Copyright 2007 Kosmix Corp.
-
-This product includes software developed by the Jets3T project (https://jets3t.dev.java.net/)
-Copyright (c) 2008 James Murty
-
-This product includes libraries developed by the CGLib project (http://cglib.sourceforge.net/)
-Copyright (c) 2008, cglib
-
-This product includes a JUnit jar: http://junit.sourceforge.net/
-License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
-Copyright (c) 2000-2006, www.hamcrest.org
-
-This product includes code from the XStream project (http://xstream.codehaus.org/)
-Copyright (c) 2003-2006, Joe Walnes
-Copyright (c) 2006-2007, XStream Committers
-
-This product includes tests written with EasyMock
-Copyright 2001-2007 Tammo Freese (http://www.easymock.org/)
-
-This product uses the Breast Cancer Wisconsin (Diagnostic) Dataset from the
-UCI Machine Learning Repository [http://www.ics.uci.edu/~mlearn/MLRepository.html, http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)].
-
-This product contains parts of the Bayesian Logic (BLOG) Inference Engine.
-Copyright (c) 2005, Regents of the University of California