From 7a53e9a152657aa553dc674f6468a0c0b4396213 Mon Sep 17 00:00:00 2001
From: Kevin Risden <krisden@apache.org>
Date: Fri, 6 Jan 2017 15:32:18 -0600
Subject: [PATCH] Upgrade to Calcite 1.11.0

---
 lucene/default-nested-ivy-settings.xml                | 2 --
 lucene/ivy-versions.properties                        | 7 ++++---
 solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1   | 1 -
 solr/licenses/calcite-core-1.11.0.jar.sha1            | 1 +
 solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1 | 1 -
 solr/licenses/calcite-linq4j-1.11.0.jar.sha1          | 1 +
 6 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1
 create mode 100644 solr/licenses/calcite-core-1.11.0.jar.sha1
 delete mode 100644 solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1
 create mode 100644 solr/licenses/calcite-linq4j-1.11.0.jar.sha1

diff --git a/lucene/default-nested-ivy-settings.xml b/lucene/default-nested-ivy-settings.xml
index 908a3802f29..522fd29bf26 100644
--- a/lucene/default-nested-ivy-settings.xml
+++ b/lucene/default-nested-ivy-settings.xml
@@ -32,7 +32,6 @@
   <caches lockStrategy="${ivy.lock-strategy}" resolutionCacheDir="${ivy.resolution-cache.dir}" />
 
   <resolvers>
-    <ibiblio name="apache-snapshot" root="https://repository.apache.org/content/repositories/snapshots" m2compatible="true" />
     <ibiblio name="sonatype-releases" root="https://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
     <ibiblio name="maven.restlet.org" root="http://maven.restlet.org" m2compatible="true" />
     <ibiblio name="releases.cloudera.com" root="http://repository.cloudera.com/content/repositories/releases" m2compatible="true" />
@@ -51,7 +50,6 @@
       <resolver ref="local"/>
       <!-- <resolver ref="local-maven-2" /> -->
       <resolver ref="main"/>
-      <resolver ref="apache-snapshot" />
       <resolver ref="maven.restlet.org" />
       <resolver ref="sonatype-releases" />
       <resolver ref="releases.cloudera.com"/>
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a0ab1f456ad..2b53454f066 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -105,12 +105,13 @@ io.netty.netty-all.version = 4.0.36.Final
 /org.apache.ant/ant = 1.8.2
 /org.apache.avro/avro = 1.7.5
 
-org.apache.calcite.version = 1.11.0-SNAPSHOT
-org.apache.calcite.avatica.version = 1.9.0
-/org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
+org.apache.calcite.version = 1.11.0
 /org.apache.calcite/calcite-core = ${org.apache.calcite.version}
 /org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
 
+org.apache.calcite.avatica.version = 1.9.0
+/org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
+
 /org.apache.commons/commons-compress = 1.11
 /org.apache.commons/commons-exec = 1.3
 /org.apache.commons/commons-math3 = 3.4.1
diff --git a/solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1 b/solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1
deleted file mode 100644
index f00eb05e105..00000000000
--- a/solr/licenses/calcite-core-1.11.0-SNAPSHOT.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e4602dbaac8a35f922e63a7f207ca1272479159
diff --git a/solr/licenses/calcite-core-1.11.0.jar.sha1 b/solr/licenses/calcite-core-1.11.0.jar.sha1
new file mode 100644
index 00000000000..980c772c62d
--- /dev/null
+++ b/solr/licenses/calcite-core-1.11.0.jar.sha1
@@ -0,0 +1 @@
+d0f90841119f1ec02a64ef029ff525171a320cff
diff --git a/solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1 b/solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1
deleted file mode 100644
index 9c06c415b63..00000000000
--- a/solr/licenses/calcite-linq4j-1.11.0-SNAPSHOT.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ceeb60b30b113dc2e64d393724b56b06e5db332
diff --git a/solr/licenses/calcite-linq4j-1.11.0.jar.sha1 b/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
new file mode 100644
index 00000000000..98396328447
--- /dev/null
+++ b/solr/licenses/calcite-linq4j-1.11.0.jar.sha1
@@ -0,0 +1 @@
+b09e988f64c69c21cc61aa734e9955736a07e016