You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2016/03/08 07:13:22 UTC
[2/5] calcite git commit: Update groupId when Calcite POMs reference
Avatica modules
Update groupId when Calcite POMs reference Avatica modules
Remove Conjars from Avatica's repository list
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/eead3d21
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/eead3d21
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/eead3d21
Branch: refs/heads/master
Commit: eead3d21b0ef18f05029cefbb6b4fb888e75c548
Parents: 9c62ada
Author: Julian Hyde <jh...@apache.org>
Authored: Mon Mar 7 15:45:01 2016 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Mar 7 21:21:11 2016 -0800
----------------------------------------------------------------------
avatica/pom.xml | 11 -----------
core/pom.xml | 4 ++--
example/csv/pom.xml | 2 +-
mongodb/pom.xml | 4 ++--
piglet/pom.xml | 2 +-
pom.xml | 23 ++++++++++++-----------
splunk/pom.xml | 2 +-
7 files changed, 19 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/eead3d21/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index 7a747fe..42a72ee 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -583,17 +583,6 @@ limitations under the License.
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <id>conjars</id>
- <name>Conjars</name>
- <url>http://conjars.org/repo</url>
- <layout>default</layout>
- </repository>
</repositories>
<profiles>
http://git-wip-us.apache.org/repos/asf/calcite/blob/eead3d21/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8a548dd..9b50ba3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
<!-- Sorted by groupId, artifactId; calcite dependencies first. Put versions
in dependencyManagement in the root POM, not here. -->
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica</artifactId>
</dependency>
<dependency>
@@ -46,7 +46,7 @@ limitations under the License.
<artifactId>calcite-linq4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica-server</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/eead3d21/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 8b0f8de..cee4b53 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -36,7 +36,7 @@ limitations under the License.
<dependencies>
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/eead3d21/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 3e65fd3..0efaa4f 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -37,7 +37,7 @@ limitations under the License.
<!-- Sorted by groupId, artifactId; calcite dependencies first. Put versions
in dependencyManagement in the root POM, not here. -->
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica</artifactId>
</dependency>
<dependency>
@@ -101,7 +101,7 @@ limitations under the License.
<failOnWarning>true</failOnWarning>
<!-- ignore "unused but declared" warnings -->
<ignoredUnusedDeclaredDependencies>
- <ignoredUnusedDeclaredDependency>org.apache.calcite:calcite-avatica</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>org.apache.calcite.avatica:calcite-avatica</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-api</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-log4j12</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
http://git-wip-us.apache.org/repos/asf/calcite/blob/eead3d21/piglet/pom.xml
----------------------------------------------------------------------
diff --git a/piglet/pom.xml b/piglet/pom.xml
index 790910e..37e07cd 100644
--- a/piglet/pom.xml
+++ b/piglet/pom.xml
@@ -37,7 +37,7 @@ limitations under the License.
<!-- Sorted by groupId, artifactId; calcite dependencies first. Put versions
in dependencyManagement in the root POM, not here. -->
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/eead3d21/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a94707e..0642df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@ limitations under the License.
<!-- This list is in alphabetical order. -->
<airlift-tpch.version>0.1</airlift-tpch.version>
+ <avatica.version>1.7.0-SNAPSHOT</avatica.version>
<build-helper-maven-plugin.version>1.9</build-helper-maven-plugin.version>
<cassandra-driver-core.version>2.1.9</cassandra-driver-core.version>
<checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
@@ -148,32 +149,32 @@ limitations under the License.
<dependencyManagement>
<dependencies>
- <!-- Sorted by groupId, artifactId; calcite dependencies first. -->
+ <!-- Sorted by groupId, artifactId; calcite (and avatica) dependencies first. -->
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica-metrics</artifactId>
- <version>${project.version}</version>
+ <version>${avatica.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica</artifactId>
- <version>${project.version}</version>
+ <version>${avatica.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica-noop</artifactId>
- <version>${project.version}</version>
+ <version>${avatica.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica</artifactId>
- <version>${project.version}</version>
+ <version>${avatica.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica-server</artifactId>
- <version>${project.version}</version>
+ <version>${avatica.version}</version>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/eead3d21/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 5b955b5..7c3fa20 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -37,7 +37,7 @@ limitations under the License.
<!-- Sorted by groupId, artifactId; calcite dependencies first. Put versions
in dependencyManagement in the root POM, not here. -->
<dependency>
- <groupId>org.apache.calcite</groupId>
+ <groupId>org.apache.calcite.avatica</groupId>
<artifactId>calcite-avatica</artifactId>
</dependency>
<dependency>