Apache Solr open-source search software
SOLR-15669: Validate *.txt source patterns. Correct existing tabs.
Dawid Weiss0f56b9caafcf
diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradleindex bcbde4a176c..284fd99751a 100644--- a/gradle/validation/validate-source-patterns.gradle+++ b/gradle/validation/validate-source-patterns.gradle@@ -55,6 +55,7 @@ def extensions = ['py','sh','template',+ 'txt','vm','xml','xsl',@@ -79,6 +80,9 @@ subprojects {// default excludes.exclude 'build/**'exclude '**/.idea/**'++ // ignore txt files in source resources and tests.+ exclude 'src/**/*.txt'}}@@ -93,6 +97,12 @@ configure(project(':solr:core')) {}}+configure(project(':solr:server')) {+ project.tasks.withType(ValidateSourcePatternsTask) {+ sourceFiles.exclude '**/configsets/**'+ }+}+configure(rootProject) {task validateSourcePatterns(type: ValidateSourcePatternsTask) { task ->group = 'Verification'@@ -103,10 +113,6 @@ configure(rootProject) {include "**/*.${it}"}- // We do not scan for *.txt by default (broken files in subprojects),- // but in root we can do this).- include '**/*.txt'-// Don't go into child projects (scanned separately).childProjects.keySet().each{exclude "${it}/**"@@ -114,7 +120,6 @@ configure(rootProject) {// default excludes.exclude '**/build/**'- exclude '**/.idea/**'exclude 'dev-tools/solr-missing-doclet/src/**/*.java' // <-- TODO: remove once we allow "var" on master// ourselves :-)@@ -182,8 +187,8 @@ class ValidateSourcePatternsTask extends DefaultTask {def validSPINameJavadocTag = ~$/(?s)\s*\*\s*@lucene\.spi\s+\{@value #NAME\}/$;def isLicense = { matcher, ratDocument ->- licenseMatcher.reset();- return lineSplitter.split(matcher.group(1)).any{ licenseMatcher.match(ratDocument, it) };+ licenseMatcher.reset()+ return lineSplitter.split(matcher.group(1)).any { licenseMatcher.match(ratDocument, it) }}def checkLicenseHeaderPrecedes = { f, description, contentPattern, commentPattern, text, ratDocument ->@@ -205,7 +210,7 @@ class ValidateSourcePatternsTask extends DefaultTask {def checkMockitoAssume = { f, text ->if (text.contains("mockito") && !text.contains("assumeWorkingMockito()")) {- reportViolation(f, 'File uses Mockito but has no assumeWorkingMockito() call');+ reportViolation(f, 'File uses Mockito but has no assumeWorkingMockito() call')}}@@ -213,7 +218,6 @@ class ValidateSourcePatternsTask extends DefaultTask {progress.start(this.name, this.name)sourceFiles.each{ f ->-progress.progress("Scanning ${f.name}")logger.debug('Scanning source file: {}', f);@@ -261,8 +265,7 @@ class ValidateSourcePatternsTask extends DefaultTask {checkMockitoAssume(f, text);}- if (project.path.startsWith(':solr:')- && f.name.equals("SolrTestCase.java") == false+ if (f.name.equals("SolrTestCase.java") == false&& f.name.equals("TestXmlQParser.java") == false) {if (extendsLuceneTestCasePattern.matcher(text).find()) {reportViolation(f, "Solr test cases should extend SolrTestCase rather than LuceneTestCase");diff --git a/solr/licenses/http2-client-NOTICE.txt b/solr/licenses/http2-client-NOTICE.txtindex e9461a8e86e..ff0a6d8b58f 100644--- a/solr/licenses/http2-client-NOTICE.txt+++ b/solr/licenses/http2-client-NOTICE.txt@@ -31,18 +31,18 @@ repository ("Repository") in CVS modules ("Modules") and made availableas downloadable archives ("Downloads").</p><ul>- <li>Content may be structured and packaged into modules to+ <li>Content may be structured and packaged into modules tofacilitate delivering, extending, and upgrading the Content. Typicalmodules may include plug-ins ("Plug-ins"), plug-in fragments("Fragments"), and features ("Features").</li>- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>- <li>A+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>+ <li>AFeature is a bundle of one or more Plug-ins and/or Fragments andassociated material. Each Feature may be packaged as a sub-directory ina directory named "features". Within a Feature, files named"feature.xml" may contain a list of the names and version numbers ofthe Plug-ins and/or Fragments associated with that Feature.</li>- <li>Features+ <li>Featuresmay also include other Features ("Included Features"). Within aFeature, files named "feature.xml" may contain a list of the names andversion numbers of Included Features.</li>@@ -57,13 +57,13 @@ directory of a Download or Moduleincluding, but not limited to the following locations:</p><ul>- <li>The top-level (root) directory</li>- <li>Plug-in and Fragment directories</li>- <li>Inside Plug-ins and Fragments packaged as JARs</li>- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>- <li>Feature directories</li>+ <li>The top-level (root) directory</li>+ <li>Plug-in and Fragment directories</li>+ <li>Inside Plug-ins and Fragments packaged as JARs</li>+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>+ <li>Feature directories</li></ul>-+<p>Note: if a Feature made available by the Eclipse Foundation isinstalled using the Eclipse Update Manager, you must agree to a license("Feature Update License") during the@@ -84,12 +84,12 @@ CONDITIONS. SOME OF THESEOTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p><ul>- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li></ul><p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS ANDdiff --git a/solr/licenses/http2-common-NOTICE.txt b/solr/licenses/http2-common-NOTICE.txtindex e9461a8e86e..ff0a6d8b58f 100644--- a/solr/licenses/http2-common-NOTICE.txt+++ b/solr/licenses/http2-common-NOTICE.txt@@ -31,18 +31,18 @@ repository ("Repository") in CVS modules ("Modules") and made availableas downloadable archives ("Downloads").</p><ul>- <li>Content may be structured and packaged into modules to+ <li>Content may be structured and packaged into modules tofacilitate delivering, extending, and upgrading the Content. Typicalmodules may include plug-ins ("Plug-ins"), plug-in fragments("Fragments"), and features ("Features").</li>- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>- <li>A+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>+ <li>AFeature is a bundle of one or more Plug-ins and/or Fragments andassociated material. Each Feature may be packaged as a sub-directory ina directory named "features". Within a Feature, files named"feature.xml" may contain a list of the names and version numbers ofthe Plug-ins and/or Fragments associated with that Feature.</li>- <li>Features+ <li>Featuresmay also include other Features ("Included Features"). Within aFeature, files named "feature.xml" may contain a list of the names andversion numbers of Included Features.</li>@@ -57,13 +57,13 @@ directory of a Download or Moduleincluding, but not limited to the following locations:</p><ul>- <li>The top-level (root) directory</li>- <li>Plug-in and Fragment directories</li>- <li>Inside Plug-ins and Fragments packaged as JARs</li>- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>- <li>Feature directories</li>+ <li>The top-level (root) directory</li>+ <li>Plug-in and Fragment directories</li>+ <li>Inside Plug-ins and Fragments packaged as JARs</li>+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>+ <li>Feature directories</li></ul>-+<p>Note: if a Feature made available by the Eclipse Foundation isinstalled using the Eclipse Update Manager, you must agree to a license("Feature Update License") during the@@ -84,12 +84,12 @@ CONDITIONS. SOME OF THESEOTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p><ul>- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li></ul><p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS ANDdiff --git a/solr/licenses/http2-hpack-NOTICE.txt b/solr/licenses/http2-hpack-NOTICE.txtindex e9461a8e86e..ff0a6d8b58f 100644--- a/solr/licenses/http2-hpack-NOTICE.txt+++ b/solr/licenses/http2-hpack-NOTICE.txt@@ -31,18 +31,18 @@ repository ("Repository") in CVS modules ("Modules") and made availableas downloadable archives ("Downloads").</p><ul>- <li>Content may be structured and packaged into modules to+ <li>Content may be structured and packaged into modules tofacilitate delivering, extending, and upgrading the Content. Typicalmodules may include plug-ins ("Plug-ins"), plug-in fragments("Fragments"), and features ("Features").</li>- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>- <li>A+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>+ <li>AFeature is a bundle of one or more Plug-ins and/or Fragments andassociated material. Each Feature may be packaged as a sub-directory ina directory named "features". Within a Feature, files named"feature.xml" may contain a list of the names and version numbers ofthe Plug-ins and/or Fragments associated with that Feature.</li>- <li>Features+ <li>Featuresmay also include other Features ("Included Features"). Within aFeature, files named "feature.xml" may contain a list of the names andversion numbers of Included Features.</li>@@ -57,13 +57,13 @@ directory of a Download or Moduleincluding, but not limited to the following locations:</p><ul>- <li>The top-level (root) directory</li>- <li>Plug-in and Fragment directories</li>- <li>Inside Plug-ins and Fragments packaged as JARs</li>- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>- <li>Feature directories</li>+ <li>The top-level (root) directory</li>+ <li>Plug-in and Fragment directories</li>+ <li>Inside Plug-ins and Fragments packaged as JARs</li>+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>+ <li>Feature directories</li></ul>-+<p>Note: if a Feature made available by the Eclipse Foundation isinstalled using the Eclipse Update Manager, you must agree to a license("Feature Update License") during the@@ -84,12 +84,12 @@ CONDITIONS. SOME OF THESEOTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p><ul>- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li></ul><p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS ANDdiff --git a/solr/licenses/http2-http-client-transport-NOTICE.txt b/solr/licenses/http2-http-client-transport-NOTICE.txtindex e9461a8e86e..ff0a6d8b58f 100644--- a/solr/licenses/http2-http-client-transport-NOTICE.txt+++ b/solr/licenses/http2-http-client-transport-NOTICE.txt@@ -31,18 +31,18 @@ repository ("Repository") in CVS modules ("Modules") and made availableas downloadable archives ("Downloads").</p><ul>- <li>Content may be structured and packaged into modules to+ <li>Content may be structured and packaged into modules tofacilitate delivering, extending, and upgrading the Content. Typicalmodules may include plug-ins ("Plug-ins"), plug-in fragments("Fragments"), and features ("Features").</li>- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>- <li>A+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>+ <li>AFeature is a bundle of one or more Plug-ins and/or Fragments andassociated material. Each Feature may be packaged as a sub-directory ina directory named "features". Within a Feature, files named"feature.xml" may contain a list of the names and version numbers ofthe Plug-ins and/or Fragments associated with that Feature.</li>- <li>Features+ <li>Featuresmay also include other Features ("Included Features"). Within aFeature, files named "feature.xml" may contain a list of the names andversion numbers of Included Features.</li>@@ -57,13 +57,13 @@ directory of a Download or Moduleincluding, but not limited to the following locations:</p><ul>- <li>The top-level (root) directory</li>- <li>Plug-in and Fragment directories</li>- <li>Inside Plug-ins and Fragments packaged as JARs</li>- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>- <li>Feature directories</li>+ <li>The top-level (root) directory</li>+ <li>Plug-in and Fragment directories</li>+ <li>Inside Plug-ins and Fragments packaged as JARs</li>+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>+ <li>Feature directories</li></ul>-+<p>Note: if a Feature made available by the Eclipse Foundation isinstalled using the Eclipse Update Manager, you must agree to a license("Feature Update License") during the@@ -84,12 +84,12 @@ CONDITIONS. SOME OF THESEOTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p><ul>- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li></ul><p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS ANDdiff --git a/solr/licenses/http2-server-NOTICE.txt b/solr/licenses/http2-server-NOTICE.txtindex e9461a8e86e..ff0a6d8b58f 100644--- a/solr/licenses/http2-server-NOTICE.txt+++ b/solr/licenses/http2-server-NOTICE.txt@@ -31,18 +31,18 @@ repository ("Repository") in CVS modules ("Modules") and made availableas downloadable archives ("Downloads").</p><ul>- <li>Content may be structured and packaged into modules to+ <li>Content may be structured and packaged into modules tofacilitate delivering, extending, and upgrading the Content. Typicalmodules may include plug-ins ("Plug-ins"), plug-in fragments("Fragments"), and features ("Features").</li>- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>- <li>A+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>+ <li>AFeature is a bundle of one or more Plug-ins and/or Fragments andassociated material. Each Feature may be packaged as a sub-directory ina directory named "features". Within a Feature, files named"feature.xml" may contain a list of the names and version numbers ofthe Plug-ins and/or Fragments associated with that Feature.</li>- <li>Features+ <li>Featuresmay also include other Features ("Included Features"). Within aFeature, files named "feature.xml" may contain a list of the names andversion numbers of Included Features.</li>@@ -57,13 +57,13 @@ directory of a Download or Moduleincluding, but not limited to the following locations:</p><ul>- <li>The top-level (root) directory</li>- <li>Plug-in and Fragment directories</li>- <li>Inside Plug-ins and Fragments packaged as JARs</li>- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>- <li>Feature directories</li>+ <li>The top-level (root) directory</li>+ <li>Plug-in and Fragment directories</li>+ <li>Inside Plug-ins and Fragments packaged as JARs</li>+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>+ <li>Feature directories</li></ul>-+<p>Note: if a Feature made available by the Eclipse Foundation isinstalled using the Eclipse Update Manager, you must agree to a license("Feature Update License") during the@@ -84,12 +84,12 @@ CONDITIONS. SOME OF THESEOTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p><ul>- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li></ul><p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS ANDdiff --git a/solr/licenses/jetty-NOTICE.txt b/solr/licenses/jetty-NOTICE.txtindex e9461a8e86e..ff0a6d8b58f 100644--- a/solr/licenses/jetty-NOTICE.txt+++ b/solr/licenses/jetty-NOTICE.txt@@ -31,18 +31,18 @@ repository ("Repository") in CVS modules ("Modules") and made availableas downloadable archives ("Downloads").</p><ul>- <li>Content may be structured and packaged into modules to+ <li>Content may be structured and packaged into modules tofacilitate delivering, extending, and upgrading the Content. Typicalmodules may include plug-ins ("Plug-ins"), plug-in fragments("Fragments"), and features ("Features").</li>- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>- <li>A+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>+ <li>AFeature is a bundle of one or more Plug-ins and/or Fragments andassociated material. Each Feature may be packaged as a sub-directory ina directory named "features". Within a Feature, files named"feature.xml" may contain a list of the names and version numbers ofthe Plug-ins and/or Fragments associated with that Feature.</li>- <li>Features+ <li>Featuresmay also include other Features ("Included Features"). Within aFeature, files named "feature.xml" may contain a list of the names andversion numbers of Included Features.</li>@@ -57,13 +57,13 @@ directory of a Download or Moduleincluding, but not limited to the following locations:</p><ul>- <li>The top-level (root) directory</li>- <li>Plug-in and Fragment directories</li>- <li>Inside Plug-ins and Fragments packaged as JARs</li>- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>- <li>Feature directories</li>+ <li>The top-level (root) directory</li>+ <li>Plug-in and Fragment directories</li>+ <li>Inside Plug-ins and Fragments packaged as JARs</li>+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>+ <li>Feature directories</li></ul>-+<p>Note: if a Feature made available by the Eclipse Foundation isinstalled using the Eclipse Update Manager, you must agree to a license("Feature Update License") during the@@ -84,12 +84,12 @@ CONDITIONS. SOME OF THESEOTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p><ul>- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li></ul><p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS ANDdiff --git a/solr/licenses/junit-LICENSE-CPL.txt b/solr/licenses/junit-LICENSE-CPL.txtindex 4efdc7b204b..1fb3b3cad1e 100644--- a/solr/licenses/junit-LICENSE-CPL.txt+++ b/solr/licenses/junit-LICENSE-CPL.txt@@ -10,8 +10,8 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENa) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, andb) in the case of each subsequent Contributor:-i) changes to the Program, and-ii) additions to the Program;+i) changes to the Program, and+ii) additions to the Program;where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program."Contributor" means any person or entity that distributes the Program.@@ -28,24 +28,24 @@ where such changes and/or additions to the Program originate from and are distri2. GRANT OF RIGHTS-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.3. REQUIREMENTSA Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:-a) it complies with the terms and conditions of this Agreement; and-b) its license agreement:-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;+a) it complies with the terms and conditions of this Agreement; and+b) its license agreement:+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.When the Program is made available in source code form:-a) it must be made available under this Agreement; and-b) a copy of this Agreement must be included with each copy of the Program.+a) it must be made available under this Agreement; and+b) a copy of this Agreement must be included with each copy of the Program.Contributors may not remove or alter any copyright notices contained within the Program.diff --git a/solr/licenses/poi-LICENSE-ASL.txt b/solr/licenses/poi-LICENSE-ASL.txtindex 09d38da72d2..ef7317653d0 100644--- a/solr/licenses/poi-LICENSE-ASL.txt+++ b/solr/licenses/poi-LICENSE-ASL.txt@@ -514,24 +514,24 @@ SLF4J library (slf4j-api-*.jar)inbot-utils (https://github.com/Inbot/inbot-utils)- The MIT License (MIT)-- Copyright (c) 2015 Inbot-- 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.+ The MIT License (MIT)++ Copyright (c) 2015 Inbot++ 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.diff --git a/solr/licenses/poi-ooxml-LICENSE-ASL.txt b/solr/licenses/poi-ooxml-LICENSE-ASL.txtindex 09d38da72d2..ef7317653d0 100644--- a/solr/licenses/poi-ooxml-LICENSE-ASL.txt+++ b/solr/licenses/poi-ooxml-LICENSE-ASL.txt@@ -514,24 +514,24 @@ SLF4J library (slf4j-api-*.jar)inbot-utils (https://github.com/Inbot/inbot-utils)- The MIT License (MIT)-- Copyright (c) 2015 Inbot-- 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.+ The MIT License (MIT)++ Copyright (c) 2015 Inbot++ 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.diff --git a/solr/licenses/poi-ooxml-schemas-LICENSE-ASL.txt b/solr/licenses/poi-ooxml-schemas-LICENSE-ASL.txtindex 09d38da72d2..ef7317653d0 100644--- a/solr/licenses/poi-ooxml-schemas-LICENSE-ASL.txt+++ b/solr/licenses/poi-ooxml-schemas-LICENSE-ASL.txt@@ -514,24 +514,24 @@ SLF4J library (slf4j-api-*.jar)inbot-utils (https://github.com/Inbot/inbot-utils)- The MIT License (MIT)-- Copyright (c) 2015 Inbot-- 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.+ The MIT License (MIT)++ Copyright (c) 2015 Inbot++ 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.diff --git a/solr/licenses/poi-scratchpad-LICENSE-ASL.txt b/solr/licenses/poi-scratchpad-LICENSE-ASL.txtindex 09d38da72d2..ef7317653d0 100644--- a/solr/licenses/poi-scratchpad-LICENSE-ASL.txt+++ b/solr/licenses/poi-scratchpad-LICENSE-ASL.txt@@ -514,24 +514,24 @@ SLF4J library (slf4j-api-*.jar)inbot-utils (https://github.com/Inbot/inbot-utils)- The MIT License (MIT)-- Copyright (c) 2015 Inbot-- 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.+ The MIT License (MIT)++ Copyright (c) 2015 Inbot++ 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.