lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject lucene-solr:branch_7_0: Upgrade to Calcite 0.13.0 and Calcite Avatica 0.10.0
Date Sun, 06 Aug 2017 18:14:50 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7_0 65c47674e -> c1a195f16


Upgrade to Calcite 0.13.0 and Calcite Avatica 0.10.0


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c1a195f1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c1a195f1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c1a195f1

Branch: refs/heads/branch_7_0
Commit: c1a195f16a65cdd4b0c7af817c2116af99633555
Parents: 65c4767
Author: Kevin Risden <krisden@apache.org>
Authored: Wed Jun 28 21:26:35 2017 -0500
Committer: Kevin Risden <krisden@apache.org>
Committed: Sun Aug 6 13:14:44 2017 -0500

----------------------------------------------------------------------
 lucene/ivy-versions.properties                  |   5 +-
 solr/core/ivy.xml                               |   2 +
 .../org/apache/solr/handler/TestSQLHandler.java |   4 -
 solr/licenses/avatica-core-1.10.0.jar.sha1      |   1 +
 solr/licenses/avatica-core-1.9.0.jar.sha1       |   1 -
 solr/licenses/calcite-core-1.11.0.jar.sha1      |   1 -
 solr/licenses/calcite-core-1.13.0.jar.sha1      |   1 +
 solr/licenses/calcite-linq4j-1.11.0.jar.sha1    |   1 -
 solr/licenses/calcite-linq4j-1.13.0.jar.sha1    |   1 +
 solr/licenses/commons-lang3-3.6.jar.sha1        |   1 +
 solr/licenses/commons-lang3-LICENSE-ASL.txt     | 202 +++++++++++++++++++
 solr/licenses/commons-lang3-NOTICE.txt          |   8 +
 12 files changed, 219 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index b5e5f11..e1a432b 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -84,15 +84,16 @@ io.netty.netty-all.version = 4.0.36.Final
 
 /org.apache.ant/ant = 1.8.2
 
-org.apache.calcite.avatica.version = 1.9.0
+org.apache.calcite.avatica.version = 1.10.0
 /org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
 
-org.apache.calcite.version = 1.11.0
+org.apache.calcite.version = 1.13.0
 /org.apache.calcite/calcite-core = ${org.apache.calcite.version}
 /org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
 
 /org.apache.commons/commons-compress = 1.11
 /org.apache.commons/commons-exec = 1.3
+/org.apache.commons/commons-lang3 = 3.6
 /org.apache.commons/commons-math3 = 3.4.1
 
 org.apache.curator.version = 2.8.0

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/core/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index a91d73a..5f4f84f 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -85,6 +85,7 @@
       <artifact name="hadoop-hdfs" type="test" ext="jar" maven:classifier="tests" />
     </dependency>
     <dependency org="org.mortbay.jetty" name="jetty" rev="${/org.mortbay.jetty/jetty}"
conf="test.DfsMiniCluster"/>
+    <dependency org="org.codehaus.janino" name="commons-compiler" rev="${/org.codehaus.janino/commons-compiler}"
conf="compile"/>
     <dependency org="org.mortbay.jetty" name="jetty-util" rev="${/org.mortbay.jetty/jetty-util}"
conf="test.DfsMiniCluster"/>
     <dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}"
conf="test.DfsMiniCluster"/>
     <dependency org="com.sun.jersey" name="jersey-server" rev="${/com.sun.jersey/jersey-server}"
conf="test.DfsMiniCluster"/>
@@ -143,6 +144,7 @@
     <dependency org="org.apache.calcite" name="calcite-core" rev="${/org.apache.calcite/calcite-core}"
conf="compile"/>
     <dependency org="org.apache.calcite" name="calcite-linq4j" rev="${/org.apache.calcite/calcite-linq4j}"
conf="compile"/>
     <dependency org="org.apache.calcite.avatica" name="avatica-core" rev="${/org.apache.calcite.avatica/avatica-core}"
conf="compile"/>
+    <dependency org="org.apache.commons" name="commons-lang3" rev="${/org.apache.commons/commons-lang3}"
conf="compile"/>
     <dependency org="net.hydromatic" name="eigenbase-properties" rev="${/net.hydromatic/eigenbase-properties}"
conf="compile"/>
     <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"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
index 545a41a..1999965 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -79,9 +78,6 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
 
   @Test
   public void doTest() throws Exception {
-
-    assumeFalse("This test fails on UNIX with Turkish default locale", new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
-
     waitForRecoveriesToFinish(false);
 
     testBasicSelect();

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/avatica-core-1.10.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/avatica-core-1.10.0.jar.sha1 b/solr/licenses/avatica-core-1.10.0.jar.sha1
new file mode 100644
index 0000000..8126860
--- /dev/null
+++ b/solr/licenses/avatica-core-1.10.0.jar.sha1
@@ -0,0 +1 @@
+82280b09d490c7e4981b5af2d79fcf55efbe6144

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/avatica-core-1.9.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/avatica-core-1.9.0.jar.sha1 b/solr/licenses/avatica-core-1.9.0.jar.sha1
deleted file mode 100644
index b44a615..0000000
--- a/solr/licenses/avatica-core-1.9.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c16b346eef02495f2f4b429fe04c33e526ec0229

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/calcite-core-1.11.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-core-1.11.0.jar.sha1 b/solr/licenses/calcite-core-1.11.0.jar.sha1
deleted file mode 100644
index 980c772..0000000
--- a/solr/licenses/calcite-core-1.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0f90841119f1ec02a64ef029ff525171a320cff

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/calcite-core-1.13.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-core-1.13.0.jar.sha1 b/solr/licenses/calcite-core-1.13.0.jar.sha1
new file mode 100644
index 0000000..7c40c4d
--- /dev/null
+++ b/solr/licenses/calcite-core-1.13.0.jar.sha1
@@ -0,0 +1 @@
+1e7995aa0afe4c27a12e7b320a2938dcf05d9581

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-linq4j-1.11.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
deleted file mode 100644
index 9839632..0000000
--- a/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b09e988f64c69c21cc61aa734e9955736a07e016

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/calcite-linq4j-1.13.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/calcite-linq4j-1.13.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.13.0.jar.sha1
new file mode 100644
index 0000000..cc9da3c
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.13.0.jar.sha1
@@ -0,0 +1 @@
+96c814d27516cf48d439277300252bfb2b00486f

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/commons-lang3-3.6.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-lang3-3.6.jar.sha1 b/solr/licenses/commons-lang3-3.6.jar.sha1
new file mode 100644
index 0000000..da64717
--- /dev/null
+++ b/solr/licenses/commons-lang3-3.6.jar.sha1
@@ -0,0 +1 @@
+9d28a6b23650e8a7e9063c04588ace6cf7012c17

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/commons-lang3-LICENSE-ASL.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-lang3-LICENSE-ASL.txt b/solr/licenses/commons-lang3-LICENSE-ASL.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/solr/licenses/commons-lang3-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 [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1a195f1/solr/licenses/commons-lang3-NOTICE.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/commons-lang3-NOTICE.txt b/solr/licenses/commons-lang3-NOTICE.txt
new file mode 100644
index 0000000..6a77d86
--- /dev/null
+++ b/solr/licenses/commons-lang3-NOTICE.txt
@@ -0,0 +1,8 @@
+Apache Commons Lang
+Copyright 2001-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software from the Spring Framework,
+under the Apache License 2.0 (see: StringUtils.containsWhitespace())


Mime
View raw message