This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 8bfa1e2d720 SOLR-15601: RAT: add ASF license headers to more files
(#4623)
8bfa1e2d720 is described below
commit 8bfa1e2d72060f231d8cc63991b3c3bb1d8e40c4
Author: David Smiley <[email protected]>
AuthorDate: Fri Jul 10 18:02:59 2026 -0400
SOLR-15601: RAT: add ASF license headers to more files (#4623)
---
gradle/template.gradle.properties | 2 +
gradle/testing/defaults-tests/logging.properties | 1 +
gradle/validation/rat-sources.gradle | 44 +++++-------------
solr/core/src/test-files/exampledocs/example.html | 16 +++++++
.../test-files/solr/collection1/conf/example.html | 16 +++++++
.../apache/solr/analysis/htmlStripReaderTest.html | 52 ++++++++++++++--------
solr/example/exampledocs/sample.html | 16 +++++++
.../src/test-files/extraction/example.html | 16 +++++++
.../src/test-files/extraction/simple.html | 16 +++++++
.../solr/collection1/conf/passwordRegex.properties | 6 ++-
solr/modules/ltr/example/libsvm_formatter.py | 19 +++++++-
.../ltr/example/train_and_upload_demo_model.py | 15 +++++++
.../collection1/conf/addfields.updateprocessor.js | 27 ++++++++---
.../conf/conditional.updateprocessor.js | 21 +++++++--
.../solr/collection1/conf/cross-compatible.js | 15 +++++++
.../scripting/solr/collection1/conf/evil.js | 15 +++++++
.../conf/missing.functions.updateprocessor.js | 15 +++++++
.../conf/throw.error.on.add.updateprocessor.js | 21 +++++++--
.../collection1/conf/trivial.updateprocessor0.js | 21 +++++++--
.../collection1/conf/trivial.updateprocessor1.js | 17 ++++++-
solr/modules/sql/src/resources/saffron.properties | 2 +
solr/server/resources/jetty-logging.properties | 4 +-
.../conf/update-script.js | 15 +++++++
solr/server/solr/zoo.cfg | 2 +
.../DeprecatedSystemPropertyMappings.properties | 4 +-
.../src/resources/EnvToSyspropMappings.properties | 2 +
.../src/test-files/solrj/solr/multicore/zoo.cfg | 2 +
solr/webapp/web/error404.html | 16 +++++++
28 files changed, 346 insertions(+), 72 deletions(-)
diff --git a/gradle/template.gradle.properties
b/gradle/template.gradle.properties
index b6ae69b85e8..946c47b2fce 100644
--- a/gradle/template.gradle.properties
+++ b/gradle/template.gradle.properties
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+
#############################
# Local developer settings #
#############################
diff --git a/gradle/testing/defaults-tests/logging.properties
b/gradle/testing/defaults-tests/logging.properties
index f54ee74f6e0..fcada294332 100644
--- a/gradle/testing/defaults-tests/logging.properties
+++ b/gradle/testing/defaults-tests/logging.properties
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
# root handler
handlers=java.util.logging.ConsoleHandler
diff --git a/gradle/validation/rat-sources.gradle
b/gradle/validation/rat-sources.gradle
index b47f4399ddd..dce061407ca 100644
--- a/gradle/validation/rat-sources.gradle
+++ b/gradle/validation/rat-sources.gradle
@@ -152,12 +152,10 @@ allprojects {
exclude "**/*gradle.lockfile"
- // TODO: SOLR-15601 ?
- exclude "**/*.properties"
exclude "**/*.txt"
- // TODO: SOLR-15601: HTML should carry the license, perhaps?
- exclude "**/*.html"
+ // Solr core marker file; often empty
+ exclude "**/core.properties"
// Conditionally apply module-specific patterns.
switch (project.path) {
@@ -203,16 +201,6 @@ allprojects {
exclude "src/test-files/META-INF/services/*"
break
- case ":solr:modules:ltr":
- // TODO: SOLR-15601: Some of these should carry the license, perhaps?
- exclude "**/*.py"
- break
-
- case ":solr:modules:scripting":
- // TODO: SOLR-15601: Some of these should carry the license, perhaps?
- exclude "**/*.js"
- break
-
case ":solr:modules:s3-repository":
exclude "src/test-files/s3.conf" // empty file
break
@@ -222,7 +210,6 @@ allprojects {
break
case ":solr:core":
- exclude "src/resources/*.xml"
exclude "src/test-files/**/*.aff"
exclude "src/test-files/**/*.dic"
exclude "src/test-files/**/*.conf"
@@ -232,18 +219,10 @@ allprojects {
break
case ":solr:server":
- exclude "**/*.xml"
- exclude "**/*.sh"
- exclude "**/*.bat"
- exclude "**/*.cmd"
- exclude "**/*.js"
+ // Vendored (or adapted) from the Jetty distribution; not Solr's own
IP.
+ exclude "etc/jetty*.xml"
+ exclude "etc/webdefault.xml"
exclude "modules"
- // zoo.cfg intentionally has no header and serves as the RAT
detection canary.
- ratCanaryPath.set("/solr/zoo.cfg")
- break
-
- case ":solr:webapp":
- exclude "web/img/**"
break
case ":solr:solr-ref-guide":
@@ -251,18 +230,19 @@ allprojects {
break
case ":solr:docker":
- exclude "tests/**/*.xml"
+ // Deliberately malformed XML used to test the docker image's
handling of a broken log4j2 config.
+ exclude "tests/cases/test_log4j/bogus-log4j2.xml"
break
case ":solr:example":
- exclude "**/*.xml"
- exclude "**/*.cfg"
- exclude "**/*.js"
- exclude "films/README.md"
+ // films.xml is third-party (Freebase) data, like films/README.md.
+ exclude "films/films.xml"
+ // films/README.md documents third-party (Freebase) data and
intentionally has no
+ // header, so it serves as the RAT detection canary.
+ ratCanaryPath.set("/films/README.md")
break
case ":solr:solrj":
- exclude "src/test-files/**/*.cfg"
exclude "src/test-files/**/*.xml"
break
}
diff --git a/solr/core/src/test-files/exampledocs/example.html
b/solr/core/src/test-files/exampledocs/example.html
index 5732f6214bc..9c2974eb44c 100644
--- a/solr/core/src/test-files/exampledocs/example.html
+++ b/solr/core/src/test-files/exampledocs/example.html
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<html>
<head>
<title>Welcome to Solr</title>
diff --git a/solr/core/src/test-files/solr/collection1/conf/example.html
b/solr/core/src/test-files/solr/collection1/conf/example.html
index bb8f277568b..0c5f1962525 100644
--- a/solr/core/src/test-files/solr/collection1/conf/example.html
+++ b/solr/core/src/test-files/solr/collection1/conf/example.html
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<html>
<head>
<title>Welcome to Solr</title>
diff --git
a/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html
b/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html
index 6bd19d4db6c..3f41212fd38 100644
--- a/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html
+++ b/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html
@@ -1,4 +1,20 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -49,7 +65,7 @@
+-->
<div class="searchbox">
<form action="http://www.google.com/search"; method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input
onFocus="getBlank (this, 'Search the site with google');" size="25" name="q"
id="query" type="text" value="Search the site with google">
+<input value="lucene.apache.org" name="sitesearch" type="hidden"><input
onFocus="getBlank (this, 'Search the site with google');" size="25" name="q"
id="query" type="text" value="Search the site with google">
<input name="Search" value="Search" type="submit">
</form>
</div>
@@ -211,8 +227,8 @@ document.write("Last Published: " + document.lastModified);
</ul>
</li>
</ul>
-</div>
-
+</div>
+
<a name="N1000D"></a><a name="intro"></a>
<h2 class="boxed">What Is Solr?</h2>
<div class="section">
@@ -227,7 +243,7 @@ document.write("Last Published: " + document.lastModified);
</p>
</div>
-
+
<a name="N1002A"></a><a name="news"></a>
<h2 class="boxed">News</h2>
<div class="section">
@@ -239,36 +255,36 @@ document.write("Last Published: " +
document.lastModified);
</p>
<p>The following talks and trainings are scheduled for the upcoming 2008
OSSummit:</p>
<ul>
-
+
<li>
<a href="http://www.ossummit.com/2007/program/talk/8";>Lucene Boot Camp</a> by
Erik Hatcher (originally by Grant Ingersoll). An all-day training focusing on
getting started with Lucene - the core library under Solr.</li>
-
+
<li>
<a href="http://www.ossummit.com/2007/program/talk/25";>Solr in a Day</a> by
Erik Hatcher. All you need to know to use Solr effectively.</li>
-
+
<li>
<a href="http://www.ossummit.com/2007/program/talk/67";>Lucene Case Studies</a>
by Erik Hatcher. A rapid series of examples of many Lucene and Solr using
applications.</li>
-
+
</ul>
<a name="N10058"></a><a
name="03+September+2007+-+Lucene+at+ApacheCon+Atlanta"></a>
<h3 class="boxed">03 September 2007 - Lucene at ApacheCon Atlanta</h3>
<p>
<a href="http://www.us.apachecon.com";><img alt="ApacheCon US logo"
class="float-right"
src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png";></a>
- Lucene will once again be well represented at ApacheCon USA in
Atlanta this November 12-16, 2007.
+ Lucene will once again be well represented at ApacheCon USA in
Atlanta this November 12-16, 2007.
</p>
<p>The following talks and trainings are scheduled for this year's
conference:</p>
<ul>
-
+
<li>November 12: <a
href="http://us.apachecon.com/us2007/program/talk/1859";>Lucene Boot Camp</a> by
Grant Ingersoll. An all-day training focusing on getting started with
Lucene.</li>
-
+
<li>November 16, 9:00 am: <a
href="http://us.apachecon.com/us2007/program/talk/1992";>Apache Solr out of the
Box</a> by Chris Hostetter. Introduction to Solr.</li>
-
+
<li>November 16, 10:00 am: <a
href="http://us.apachecon.com/us2007/program/talk/1943";>Building a Vertical
Search Site using Apache Software</a> by Ken Krugler. Will cover many
Lucene-based projects.</li>
-
+
<li>November 16, 3:00 pm: <a
href="http://us.apachecon.com/us2007/program/talk/1953";>Apache Lucene
Performance</a> by Grant Ingersoll. Tips and techniques for improving Lucene
performance.</li>
-
+
<li>November 16, 4:00 pm: <a
href="http://us.apachecon.com/us2007/program/talk/2017";> Advanced Indexing
Techniques with Apache Lucene</a> by Michael Busch. Information on payloads and
advanced indexing techniques.</li>
-
+
</ul>
<a name="N10091"></a><a name="06+June+2007%3A+Release+1.2+available"></a>
<h3 class="boxed">06 June 2007: Release 1.2 available</h3>
@@ -295,14 +311,14 @@ document.write("Last Published: " +
document.lastModified);
<a name="N100B6"></a><a name="15+August+2006%3A+Solr+at+ApacheCon+US"></a>
<h3 class="boxed">15 August 2006: Solr at ApacheCon US</h3>
<p>Chris Hostetter will be presenting
- <strong><a
href="http://www.apachecon.com/2006/US/html/sessions.html#FR26";>"Faceted
Searching With Apache Solr"</a></strong>
+ <strong><a
href="http://www.apachecon.com/2006/US/html/sessions.html#FR26";>"Faceted
Searching With Apache Solr"</a></strong>
at ApacheCon US 2006, on October 13th at 4:30pm.
See the <a href="http://www.us.apachecon.com/";>ApacheCon</a> website
for more details.
</p>
<a name="N100C9"></a><a name="21+April+2006%3A+Solr+at+ApacheCon"></a>
<h3 class="boxed">21 April 2006: Solr at ApacheCon</h3>
<p>Yonik Seeley will be presenting
- <strong>"Apache Solr, a Full-Text Search Server based on
Lucene"</strong>
+ <strong>"Apache Solr, a Full-Text Search Server based on
Lucene"</strong>
at ApacheCon Europe 2006, on June 29th at 5:30pm.
See the <a href="http://www.eu.apachecon.com/";>ApacheCon</a> website
for more details.
</p>
@@ -321,7 +337,7 @@ document.write("Last Published: " + document.lastModified);
</p>
</div>
-
+
</div>
<!--+
|end content
diff --git a/solr/example/exampledocs/sample.html
b/solr/example/exampledocs/sample.html
index 656b656b6ab..8b721f8527f 100644
--- a/solr/example/exampledocs/sample.html
+++ b/solr/example/exampledocs/sample.html
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<html>
<head>
<title>Welcome to Solr</title>
diff --git a/solr/modules/extraction/src/test-files/extraction/example.html
b/solr/modules/extraction/src/test-files/extraction/example.html
index 2801c3c97d8..aa912a61090 100644
--- a/solr/modules/extraction/src/test-files/extraction/example.html
+++ b/solr/modules/extraction/src/test-files/extraction/example.html
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<html>
<head>
<title>Welcome to Solr</title>
diff --git a/solr/modules/extraction/src/test-files/extraction/simple.html
b/solr/modules/extraction/src/test-files/extraction/simple.html
index 3ec4d4e0d01..fb33df543ac 100644
--- a/solr/modules/extraction/src/test-files/extraction/simple.html
+++ b/solr/modules/extraction/src/test-files/extraction/simple.html
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<html>
<head>
<title>Welcome to Solr</title>
diff --git
a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties
b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties
index 8a4eff174fd..4cac9e7cea0 100644
---
a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties
+++
b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties
@@ -1,7 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+#
# Filename regex -> password map
# Example any file ending in .doc should use password foobar:
# .*\.doc = fooBar
#
-# Note: Apache Tika 1.1 supports password for .pdf and .docx only, not .doc or
other formats
+# Note: Apache Tika 1.1 supports password for .pdf and .docx only, not .doc or
other formats
.*\.pdf$ = solrRules
-.*\.docx$ = Word2010
\ No newline at end of file
+.*\.docx$ = Word2010
diff --git a/solr/modules/ltr/example/libsvm_formatter.py
b/solr/modules/ltr/example/libsvm_formatter.py
index 4bcb76122b8..91d89d21b1e 100644
--- a/solr/modules/ltr/example/libsvm_formatter.py
+++ b/solr/modules/ltr/example/libsvm_formatter.py
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
from subprocess import call
import os
@@ -6,7 +21,7 @@ FEATURE_DIFF_THRESHOLD = 1.e-6
class LibSvmFormatter:
def processQueryDocFeatureVector(self,docClickInfo,trainingFile):
- '''Expects as input a sorted by queries list or generator that
provides the context
+ '''Expects as input a sorted by queries list or generator that
provides the context
for each query in a tuple composed of: (query , docId , relevance ,
source , featureVector).
The list of documents that are part of the same query will generate
comparisons
against each other for training. '''
@@ -82,7 +97,7 @@ def _writeRankSVMPairs(listOfFeatures,output):
(4, {1:0.9, 2:0.9, 3:0.1})
(3, {1:0.7, 2:0.9, 3:0.2})
(1, {1:0.1, 2:0.9, 6:0.1})
- ]
+ ]
'''
for d1 in range(0,len(listOfFeatures)):
for d2 in range(d1+1,len(listOfFeatures)):
diff --git a/solr/modules/ltr/example/train_and_upload_demo_model.py
b/solr/modules/ltr/example/train_and_upload_demo_model.py
index 31d7532dd94..24b6ada4006 100755
--- a/solr/modules/ltr/example/train_and_upload_demo_model.py
+++ b/solr/modules/ltr/example/train_and_upload_demo_model.py
@@ -1,5 +1,20 @@
#!/usr/bin/env python3
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
import sys
import json
import http.client
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js
index 1b3c9fc2d6e..7a4807750d7 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js
@@ -1,18 +1,33 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
function processAdd(cmd) {
- // Integer.valueOf is needed here to get a tru java object, because
+ // Integer.valueOf is needed here to get a tru java object, because
// all javascript numbers are floating point (ie: java.lang.Double)
- cmd.getSolrInputDocument().addField("script_added_i",
+ cmd.getSolrInputDocument().addField("script_added_i",
java.lang.Integer.valueOf(42));
cmd.getSolrInputDocument().addField("script_added_d", 42.3);
-
+
}
-// // //
+// // //
function processDelete() {
// NOOP
}
-function processCommit() {
+function processCommit() {
// NOOP
}
function processRollback() {
@@ -21,6 +36,6 @@ function processRollback() {
function processMergeIndexes() {
// NOOP
}
-function finish() {
+function finish() {
// NOOP
}
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js
index 5ec9487c150..4bbdd65552a 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
function processAdd(cmd) {
if (req.getParams().getBool("go-for-it",false)) {
cmd.getSolrInputDocument().addField("script_added_s", "i went for it");
@@ -6,12 +21,12 @@ function processAdd(cmd) {
return false;
}
-// // //
+// // //
function processDelete() {
// NOOP
}
-function processCommit() {
+function processCommit() {
// NOOP
}
function processRollback() {
@@ -20,6 +35,6 @@ function processRollback() {
function processMergeIndexes() {
// NOOP
}
-function finish() {
+function finish() {
// NOOP
}
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js
index 2fcd6c3baf6..70710539bdc 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
function get_class(name) {
var clazz;
try {
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js
index d4948148119..6b405c2668d 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
var sys = Packages.java.lang.System;
function processAdd(cmd) {
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js
index 6e8728a0d77..578a9fc24fb 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
function doSomeStuff() {
return "This script doesn't contain any update processor functions";
}
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js
index ca56fe35cfe..b1948a18eb3 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js
@@ -1,13 +1,28 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
function processAdd() {
throw "guess what? no-soup-fo-you !!!";
}
-// // //
+// // //
function processDelete() {
// NOOP
}
-function processCommit() {
+function processCommit() {
// NOOP
}
function processRollback() {
@@ -16,6 +31,6 @@ function processRollback() {
function processMergeIndexes() {
// NOOP
}
-function finish() {
+function finish() {
// NOOP
}
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js
index b1856b15d85..1d9dac2fcb2 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
var Assert = Packages.org.junit.Assert;
function processAdd(cmd) {
@@ -10,12 +25,12 @@ function processAdd(cmd) {
Assert.assertTrue(1 == params.get('intValue').intValue()); // had issues
with assertTrue(1, params.get('intValue').intValue()) casting to wrong variant
Assert.assertTrue(params.get('boolValue').booleanValue());
- // Integer.valueOf is needed here to get a tru java object, because
+ // Integer.valueOf is needed here to get a tru java object, because
// all javascript numbers are floating point (ie: java.lang.Double)
- cmd.getSolrInputDocument().addField("script_added_i",
+ cmd.getSolrInputDocument().addField("script_added_i",
java.lang.Integer.valueOf(42));
cmd.getSolrInputDocument().addField("script_added_d", 42.3);
-
+
}
function processDelete(cmd) {
diff --git
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js
index 98bdf2ab060..f7d33286495 100644
---
a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js
+++
b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js
@@ -1,6 +1,21 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
function processAdd(cmd) {
functionMessages.add("processAdd1");
-
+
}
function processDelete(cmd) {
diff --git a/solr/modules/sql/src/resources/saffron.properties
b/solr/modules/sql/src/resources/saffron.properties
index 4a60b5d34e2..79197405817 100644
--- a/solr/modules/sql/src/resources/saffron.properties
+++ b/solr/modules/sql/src/resources/saffron.properties
@@ -1,2 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+#
# See SOLR-16433 and CALCITE-5298
calcite.test.dataset=.
diff --git a/solr/server/resources/jetty-logging.properties
b/solr/server/resources/jetty-logging.properties
index 55b0c37d348..49d4d5256a4 100644
--- a/solr/server/resources/jetty-logging.properties
+++ b/solr/server/resources/jetty-logging.properties
@@ -1 +1,3 @@
-org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
diff --git
a/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js
b/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js
index b3f9ee56c13..e4a05808ab1 100644
---
a/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js
+++
b/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js
@@ -1,3 +1,18 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You 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.
+
/*
This is a basic skeleton JavaScript update processor.
diff --git a/solr/server/solr/zoo.cfg b/solr/server/solr/zoo.cfg
index 828bb893100..393a2b13956 100644
--- a/solr/server/solr/zoo.cfg
+++ b/solr/server/solr/zoo.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+
# The number of milliseconds of each tick
tickTime=2000
# The number of ticks that the initial
diff --git
a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
index 662ea883e5a..67d443be564 100644
--- a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
+++ b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+#
# Mapping current system property name to legacy system property names
# This file only contains non-standard mappings that do not follow the
standard naming conversion convention
# You do not need a entry for a solrMyProperty to solr.my.property conversion
@@ -54,7 +56,7 @@ solr.security.allow.urls.enabled=!solr.disable.allow.urls
solr.security.allow.urls=solr.allow.urls
solr.security.auth.basicauth.credentials=basicauth
solr.security.auth.plugin=authentication.plugin
-
+
solr.solrj.cloud.max.stale.retries=cloud.solr.client.max.stale.retries
solr.streamingexpressions.facet.tiered.enabled=solr.facet.stream.tiered
diff --git a/solr/solrj/src/resources/EnvToSyspropMappings.properties
b/solr/solrj/src/resources/EnvToSyspropMappings.properties
index ed6e742cebc..176bccf7a13 100644
--- a/solr/solrj/src/resources/EnvToSyspropMappings.properties
+++ b/solr/solrj/src/resources/EnvToSyspropMappings.properties
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+#
# Mapping from Environment variable to system property
# This file only contains non-standard mappings that do not follow the
standard naming convention
# Map to nothing to avoid setting any system property for the env.variable
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
index 5c4dc5c6b5a..7ce8474fbef 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
+
# The number of milliseconds of each tick
tickTime=2000
# The number of ticks that the initial
diff --git a/solr/webapp/web/error404.html b/solr/webapp/web/error404.html
index 779117107dc..3d15bd69760 100644
--- a/solr/webapp/web/error404.html
+++ b/solr/webapp/web/error404.html
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<p>
Searching for Solr?<br/>
You must type the correct path.<br/>
![http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"](http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"){kind=link}