diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 89f136eb0de..ee21d99f4c2 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -24,7 +24,7 @@ com.fasterxml.jackson.core.version = 2.9.6
 /com.github.ben-manes.caffeine/caffeine = 2.4.0
 /com.github.virtuald/curvesapi = 1.04
 
-/com.google.guava/guava = 14.0.1
+/com.google.guava/guava = 25.1-jre
 /com.google.protobuf/protobuf-java = 3.6.1
 /com.google.re2j/re2j = 1.2
 /com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
@@ -32,6 +32,7 @@ com.fasterxml.jackson.core.version = 2.9.6
 /com.healthmarketscience.jackcess/jackcess = 2.1.12
 /com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
 /com.ibm.icu/icu4j = 62.1
+/com.jayway.jsonpath/json-path = 2.4.0
 /com.lmax/disruptor = 3.4.0
 /com.pff/java-libpst = 0.8.1
 
@@ -101,10 +102,10 @@ net.thisptr.version = 0.0.8
 
 /org.apache.ant/ant = 1.8.2
 
-org.apache.calcite.avatica.version = 1.10.0
+org.apache.calcite.avatica.version = 1.13.0
 /org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
 
-org.apache.calcite.version = 1.13.0
+org.apache.calcite.version = 1.18.0
 /org.apache.calcite/calcite-core = ${org.apache.calcite.version}
 /org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
 
@@ -116,7 +117,7 @@ org.apache.calcite.version = 1.13.0
 /org.apache.commons/commons-math3 = 3.6.1
 /org.apache.commons/commons-text = 1.4
 
-org.apache.curator.version = 2.8.0
+org.apache.curator.version = 2.13.0
 /org.apache.curator/curator-client = ${org.apache.curator.version}
 /org.apache.curator/curator-framework = ${org.apache.curator.version}
 /org.apache.curator/curator-recipes = ${org.apache.curator.version}
@@ -221,7 +222,7 @@ org.carrot2.morfologik.version = 2.1.5
 
 /org.ccil.cowan.tagsoup/tagsoup = 1.2.1
 
-org.codehaus.janino.version = 2.7.6
+org.codehaus.janino.version = 3.0.9
 /org.codehaus.janino/commons-compiler = ${org.codehaus.janino.version}
 /org.codehaus.janino/janino = ${org.codehaus.janino.version}
 
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9147ca1a310..651722128a5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -54,6 +54,8 @@ Improvements
 
 * SOLR-12121: JWT Token authentication plugin with OpenID Connect implicit flow login through Admin UI (janhoy)
 
+* SOLR-11763: Upgrade Guava to 25.1-jre (Markus Jelsma, Kevin Risden)
+
 ==================  8.0.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index cf65920e8c3..8f5f73bbd9b 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -132,6 +132,7 @@
     <dependency org="org.codehaus.janino" name="janino" rev="${/org.codehaus.janino/janino}" conf="compile"/>
     <dependency org="org.codehaus.janino" name="commons-compiler" rev="${/org.codehaus.janino/commons-compiler}" conf="compile"/>
     <dependency org="com.google.protobuf" name="protobuf-java" rev="${/com.google.protobuf/protobuf-java}" conf="compile"/>
+    <dependency org="com.jayway.jsonpath" name="json-path" rev="${/com.jayway.jsonpath/json-path}" conf="compile"/>
 
     <dependency org="org.rrd4j" name="rrd4j" rev="${/org.rrd4j/rrd4j}" conf="compile"/>
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java
index 1fb3d9ecff4..2da81da24e5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java
@@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.Aliases;
 import org.apache.solr.common.params.CommonParams;
@@ -217,7 +217,7 @@ public class TimeRoutedAlias {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("aliasName", aliasName)
         .add("routeField", routeField)
         .add("intervalMath", intervalMath)
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
index 0ee6855b71e..f81f78974b1 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import org.apache.lucene.search.Query;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.HighlightParams;
@@ -113,7 +113,7 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
     if(rb.doHighlights){
       rb.setNeedDocList(true);
       String hlq = params.get(HighlightParams.Q);
-      String hlparser = Objects.firstNonNull(params.get(HighlightParams.QPARSER),
+      String hlparser = MoreObjects.firstNonNull(params.get(HighlightParams.QPARSER),
                                               params.get(QueryParsing.DEFTYPE, QParserPlugin.DEFAULT_QTYPE));
       if(hlq != null){
         try {
diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
index 04bd5f4e887..2cbdb73bb81 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.component;
 import java.io.IOException;
 import java.util.*;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.ValueSource;
@@ -778,7 +779,7 @@ class StringStatsValues extends AbstractStatsValues<String> {
 
   @Override
   public long hash(String v) {
-    return hasher.hashString(v).asLong();
+    return hasher.hashString(v, StandardCharsets.UTF_8).asLong();
   }
   
   @Override
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
index f2267414e90..6398b58428c 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
@@ -17,6 +17,7 @@
 package org.apache.solr.handler.component;
 
 import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -92,7 +93,7 @@ public class TestDistributedStatsComponentCardinality extends BaseDistributedSea
                     "long_l", ""+longValue, 
                     "long_l_prehashed_l", ""+HASHER.hashLong(longValue).asLong(),
                     "string_s", strValue,
-                    "string_s_prehashed_l", ""+HASHER.hashString(strValue).asLong()));
+                    "string_s_prehashed_l", ""+HASHER.hashString(strValue, StandardCharsets.UTF_8).asLong()));
 
       longValue -= BIG_PRIME;
     }
diff --git a/solr/licenses/avatica-core-1.10.0.jar.sha1 b/solr/licenses/avatica-core-1.10.0.jar.sha1
deleted file mode 100644
index 8126860eb04..00000000000
--- a/solr/licenses/avatica-core-1.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-82280b09d490c7e4981b5af2d79fcf55efbe6144
diff --git a/solr/licenses/avatica-core-1.13.0.jar.sha1 b/solr/licenses/avatica-core-1.13.0.jar.sha1
new file mode 100644
index 00000000000..ca67cb9d0b9
--- /dev/null
+++ b/solr/licenses/avatica-core-1.13.0.jar.sha1
@@ -0,0 +1 @@
+bae68362b6020d6da93ad9abfa6a44edffb2b952
diff --git a/solr/licenses/calcite-core-1.13.0.jar.sha1 b/solr/licenses/calcite-core-1.13.0.jar.sha1
deleted file mode 100644
index 7c40c4d1368..00000000000
--- a/solr/licenses/calcite-core-1.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1e7995aa0afe4c27a12e7b320a2938dcf05d9581
diff --git a/solr/licenses/calcite-core-1.18.0.jar.sha1 b/solr/licenses/calcite-core-1.18.0.jar.sha1
new file mode 100644
index 00000000000..1cc0be0b570
--- /dev/null
+++ b/solr/licenses/calcite-core-1.18.0.jar.sha1
@@ -0,0 +1 @@
+814f5395cb0af71d6d7eb304a94a2c5365e4929c
diff --git a/solr/licenses/calcite-linq4j-1.13.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.13.0.jar.sha1
deleted file mode 100644
index cc9da3cb729..00000000000
--- a/solr/licenses/calcite-linq4j-1.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-96c814d27516cf48d439277300252bfb2b00486f
diff --git a/solr/licenses/calcite-linq4j-1.18.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.18.0.jar.sha1
new file mode 100644
index 00000000000..130f9e55a13
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.18.0.jar.sha1
@@ -0,0 +1 @@
+bc7d7a74b2e5ead39ee3688f107bece3ad13eca6
diff --git a/solr/licenses/commons-compiler-2.7.6.jar.sha1 b/solr/licenses/commons-compiler-2.7.6.jar.sha1
deleted file mode 100644
index 46bbbb7475e..00000000000
--- a/solr/licenses/commons-compiler-2.7.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b71e76d942b33dfa26e4e3047ff2a774d1f917b4
diff --git a/solr/licenses/commons-compiler-3.0.9.jar.sha1 b/solr/licenses/commons-compiler-3.0.9.jar.sha1
new file mode 100644
index 00000000000..d3cd9d224c2
--- /dev/null
+++ b/solr/licenses/commons-compiler-3.0.9.jar.sha1
@@ -0,0 +1 @@
+6aac3c03d02dcab0d59f77ff00b682f5320e54e9
diff --git a/solr/licenses/curator-client-2.13.0.jar.sha1 b/solr/licenses/curator-client-2.13.0.jar.sha1
new file mode 100644
index 00000000000..f44216a57d4
--- /dev/null
+++ b/solr/licenses/curator-client-2.13.0.jar.sha1
@@ -0,0 +1 @@
+a1974d9b3251c055408059b2f408d19d7db07224
diff --git a/solr/licenses/curator-client-2.8.0.jar.sha1 b/solr/licenses/curator-client-2.8.0.jar.sha1
deleted file mode 100644
index ed52c28b853..00000000000
--- a/solr/licenses/curator-client-2.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84feebaa8526f4984566f6a32f55d7689800acf9
diff --git a/solr/licenses/curator-framework-2.13.0.jar.sha1 b/solr/licenses/curator-framework-2.13.0.jar.sha1
new file mode 100644
index 00000000000..930e5462dc0
--- /dev/null
+++ b/solr/licenses/curator-framework-2.13.0.jar.sha1
@@ -0,0 +1 @@
+d45229aee7d3f1f628a34fcac9b66ed5ba52c31f
diff --git a/solr/licenses/curator-framework-2.8.0.jar.sha1 b/solr/licenses/curator-framework-2.8.0.jar.sha1
deleted file mode 100644
index 369cd1d5ca3..00000000000
--- a/solr/licenses/curator-framework-2.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f8edc9156084ad19ae50ae5958bf218a08351834
diff --git a/solr/licenses/curator-recipes-2.13.0.jar.sha1 b/solr/licenses/curator-recipes-2.13.0.jar.sha1
new file mode 100644
index 00000000000..19c936df271
--- /dev/null
+++ b/solr/licenses/curator-recipes-2.13.0.jar.sha1
@@ -0,0 +1 @@
+1e6d5cf7b18a402f5d52785877010711538d68a0
diff --git a/solr/licenses/curator-recipes-2.8.0.jar.sha1 b/solr/licenses/curator-recipes-2.8.0.jar.sha1
deleted file mode 100644
index 82d894643cf..00000000000
--- a/solr/licenses/curator-recipes-2.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c563e25fb37f85a6b029bc9746e75573640474fb
diff --git a/solr/licenses/guava-14.0.1.jar.sha1 b/solr/licenses/guava-14.0.1.jar.sha1
deleted file mode 100644
index fdbdb9e2e6c..00000000000
--- a/solr/licenses/guava-14.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69e12f4c6aeac392555f1ea86fab82b5e5e31ad4
diff --git a/solr/licenses/guava-25.1-jre.jar.sha1 b/solr/licenses/guava-25.1-jre.jar.sha1
new file mode 100644
index 00000000000..8ee9ae964a8
--- /dev/null
+++ b/solr/licenses/guava-25.1-jre.jar.sha1
@@ -0,0 +1 @@
+6c57e4b22b44e89e548b5c9f70f0c45fe10fb0b4
diff --git a/solr/licenses/janino-2.7.6.jar.sha1 b/solr/licenses/janino-2.7.6.jar.sha1
deleted file mode 100644
index e64ea0d2fdc..00000000000
--- a/solr/licenses/janino-2.7.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-37fde5de7edd5d7ebe075f03f4c083df2ac73dd8
diff --git a/solr/licenses/janino-3.0.9.jar.sha1 b/solr/licenses/janino-3.0.9.jar.sha1
new file mode 100644
index 00000000000..c5b66b0bf17
--- /dev/null
+++ b/solr/licenses/janino-3.0.9.jar.sha1
@@ -0,0 +1 @@
+0ddfd261063f2e6300e4c884aeef5f145dd0b38d
diff --git a/solr/licenses/json-path-2.4.0.jar.sha1 b/solr/licenses/json-path-2.4.0.jar.sha1
new file mode 100644
index 00000000000..2edbec9053d
--- /dev/null
+++ b/solr/licenses/json-path-2.4.0.jar.sha1
@@ -0,0 +1 @@
+765a4401ceb2dc8d40553c2075eb80a8fa35c2ae
diff --git a/solr/licenses/json-path-LICENSE-ASL.txt b/solr/licenses/json-path-LICENSE-ASL.txt
new file mode 100644
index 00000000000..9972f34b76e
--- /dev/null
+++ b/solr/licenses/json-path-LICENSE-ASL.txt
@@ -0,0 +1,202 @@
+
+                                 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 2017 Jayway
+
+   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.
diff --git a/solr/licenses/json-path-NOTICE.txt b/solr/licenses/json-path-NOTICE.txt
new file mode 100644
index 00000000000..e69de29bb2d