You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/08 23:10:37 UTC
[2/3] calcite git commit: [CALCITE-1132] Update artifactId,
groupId and name for Avatica
[CALCITE-1132] Update artifactId, groupId and name for Avatica
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/6b912978
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/6b912978
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/6b912978
Branch: refs/heads/master
Commit: 6b91297893f3cd2bf16431bcc51130f3741c579a
Parents: 7901eda
Author: Josh Elser <el...@apache.org>
Authored: Tue Mar 8 13:49:39 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Mar 8 17:00:13 2016 -0500
----------------------------------------------------------------------
avatica/core/pom.xml | 10 +++++-----
avatica/metrics-dropwizardmetrics3/pom.xml | 10 +++++-----
avatica/metrics/pom.xml | 6 +++---
avatica/noop-driver/pom.xml | 6 +++---
avatica/pom.xml | 24 ++++++++++++------------
avatica/server/pom.xml | 14 +++++++-------
core/pom.xml | 4 ++--
example/csv/pom.xml | 2 +-
mongodb/pom.xml | 4 ++--
piglet/pom.xml | 2 +-
pom.xml | 20 +++++---------------
splunk/pom.xml | 2 +-
12 files changed, 47 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/avatica/core/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/core/pom.xml b/avatica/core/pom.xml
index cdf394f..1b40cd7 100644
--- a/avatica/core/pom.xml
+++ b/avatica/core/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-parent</artifactId>
+ <artifactId>avatica-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <artifactId>calcite-avatica</artifactId>
+ <artifactId>avatica</artifactId>
<packaging>jar</packaging>
- <name>Calcite Avatica</name>
+ <name>Apache Calcite Avatica</name>
<description>JDBC driver framework.</description>
<properties>
@@ -36,8 +36,8 @@ limitations under the License.
<!-- Make sure that there are no dependencies on other calcite modules,
or on libraries other than Jackson. -->
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica-metrics</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-metrics</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/avatica/metrics-dropwizardmetrics3/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/metrics-dropwizardmetrics3/pom.xml b/avatica/metrics-dropwizardmetrics3/pom.xml
index e9e1c3b..f3edc53 100644
--- a/avatica/metrics-dropwizardmetrics3/pom.xml
+++ b/avatica/metrics-dropwizardmetrics3/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-parent</artifactId>
+ <artifactId>avatica-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <artifactId>calcite-avatica-metrics-dropwizardmetrics3</artifactId>
+ <artifactId>avatica-metrics-dropwizardmetrics3</artifactId>
<packaging>jar</packaging>
- <name>Calcite Avatica Dropwizard Metrics 3</name>
+ <name>Apache Calcite Avatica Dropwizard Metrics 3</name>
<description>An implementation of Avatica Metrics using Dropwizard Metrics.</description>
<properties>
@@ -34,8 +34,8 @@ limitations under the License.
<dependencies>
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica-metrics</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-metrics</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/avatica/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/metrics/pom.xml b/avatica/metrics/pom.xml
index b346147..7ec92e2 100644
--- a/avatica/metrics/pom.xml
+++ b/avatica/metrics/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-parent</artifactId>
+ <artifactId>avatica-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <artifactId>calcite-avatica-metrics</artifactId>
+ <artifactId>avatica-metrics</artifactId>
<packaging>jar</packaging>
- <name>Calcite Avatica Metrics</name>
+ <name>Apache Calcite Avatica Metrics</name>
<description>A library designed to abstract away any required dependency on a metrics library</description>
<properties>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/avatica/noop-driver/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/noop-driver/pom.xml b/avatica/noop-driver/pom.xml
index d50ba37..e00790c 100644
--- a/avatica/noop-driver/pom.xml
+++ b/avatica/noop-driver/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-parent</artifactId>
+ <artifactId>avatica-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <artifactId>calcite-avatica-noop</artifactId>
+ <artifactId>avatica-noop-driver</artifactId>
<packaging>jar</packaging>
- <name>Calcite Avatica Noop</name>
+ <name>Apache Calcite Avatica Noop Driver</name>
<description>A Noop JDBC driver.</description>
<properties>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index fc689e1..698c2c4 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -27,12 +27,12 @@ limitations under the License.
<!-- The basics. -->
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-parent</artifactId>
+ <artifactId>avatica-parent</artifactId>
<packaging>pom</packaging>
<version>1.7.0-SNAPSHOT</version>
<!-- More project information. -->
- <name>Avatica Project</name>
+ <name>Apache Calcite Avatica Project</name>
<description>Avatica is a JDBC driver framework which is a part of Apache Calcite</description>
<url>http://calcite.apache.org/avatica</url>
<inceptionYear>2012</inceptionYear>
@@ -121,28 +121,28 @@ limitations under the License.
<dependencies>
<!-- Sorted by groupId, artifactId; calcite dependencies first. -->
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica-metrics</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica-noop</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-noop</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica-server</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/avatica/server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/server/pom.xml b/avatica/server/pom.xml
index 44b8a3a..24200e6 100644
--- a/avatica/server/pom.xml
+++ b/avatica/server/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-parent</artifactId>
+ <artifactId>avatica-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <artifactId>calcite-avatica-server</artifactId>
+ <artifactId>avatica-server</artifactId>
<packaging>jar</packaging>
- <name>Calcite Avatica Server</name>
+ <name>Apache Calcite Avatica Server</name>
<description>JDBC server.</description>
<properties>
@@ -36,8 +36,8 @@ 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>
- <artifactId>calcite-avatica</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -62,8 +62,8 @@ limitations under the License.
<!-- test dependencies -->
<dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9b50ba3..00be69a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -39,7 +39,7 @@ limitations under the License.
in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <artifactId>avatica</artifactId>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
@@ -47,7 +47,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-server</artifactId>
+ <artifactId>avatica-server</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index cee4b53..444367c 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -37,7 +37,7 @@ limitations under the License.
<dependencies>
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <artifactId>avatica</artifactId>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 0efaa4f..5680476 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <artifactId>avatica</artifactId>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
@@ -101,7 +101,7 @@ limitations under the License.
<failOnWarning>true</failOnWarning>
<!-- ignore "unused but declared" warnings -->
<ignoredUnusedDeclaredDependencies>
- <ignoredUnusedDeclaredDependency>org.apache.calcite.avatica:calcite-avatica</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>org.apache.calcite.avatica: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/6b912978/piglet/pom.xml
----------------------------------------------------------------------
diff --git a/piglet/pom.xml b/piglet/pom.xml
index 37e07cd..ae31b48 100644
--- a/piglet/pom.xml
+++ b/piglet/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <artifactId>avatica</artifactId>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0642df4..d8e9364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,28 +152,18 @@ limitations under the License.
<!-- Sorted by groupId, artifactId; calcite (and avatica) dependencies first. -->
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-metrics</artifactId>
+ <artifactId>avatica</artifactId>
<version>${avatica.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-noop</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <artifactId>avatica</artifactId>
<version>${avatica.version}</version>
<type>test-jar</type>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica-server</artifactId>
+ <artifactId>avatica-server</artifactId>
<version>${avatica.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/6b912978/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 7c3fa20..a253d98 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -38,7 +38,7 @@ limitations under the License.
in dependencyManagement in the root POM, not here. -->
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
- <artifactId>calcite-avatica</artifactId>
+ <artifactId>avatica</artifactId>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>