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 2018/08/30 17:06:41 UTC
calcite git commit: [CALCITE-2486] Upgrade Apache parent POM to
version 21
Repository: calcite
Updated Branches:
refs/heads/master fbb0b8286 -> d0e3089c3
[CALCITE-2486] Upgrade Apache parent POM to version 21
Also upgrade
commons-dbcp2 to 2.5.0,
commons-lang3 to 3.8,
commons-pool to 2.6.0,
esri-geometry-api to 2.2.0,
h2 to 1.4.197,
hsqldb to 2.4.1,
httpclient to 2.5.6,
httpcore to 4.4.10,
java-diff to 1.1.2,
jsoup to 1.11.3,
maven-dependency-plugin to 3.1.1,
maven-enforcer-plugin to 3.0.0-M2,
mockito to 2.21.0.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d0e3089c
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d0e3089c
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d0e3089c
Branch: refs/heads/master
Commit: d0e3089c39744843ce25cdca2b646b094adb22cb
Parents: fbb0b82
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Aug 29 19:25:46 2018 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Aug 30 10:06:02 2018 -0700
----------------------------------------------------------------------
elasticsearch/pom.xml | 5 +++++
example/csv/pom.xml | 5 +++++
geode/pom.xml | 6 ++++++
mongodb/pom.xml | 5 +++++
pom.xml | 40 +++++++++++++++-------------------------
5 files changed, 36 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/d0e3089c/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 8649682..e3a044d 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -51,6 +51,11 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/d0e3089c/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 0a800fe..847d53f 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -66,6 +66,11 @@ limitations under the License.
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/d0e3089c/geode/pom.xml
----------------------------------------------------------------------
diff --git a/geode/pom.xml b/geode/pom.xml
index 9fe2625..698ca72 100644
--- a/geode/pom.xml
+++ b/geode/pom.xml
@@ -55,6 +55,12 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.2</version>
http://git-wip-us.apache.org/repos/asf/calcite/blob/d0e3089c/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 9ad782f..c7437dc 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -52,6 +52,11 @@ limitations under the License.
<artifactId>calcite-linq4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/d0e3089c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ddd0222..d7dfdc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>19</version>
+ <version>21</version>
</parent>
<!-- The basics. -->
@@ -65,12 +65,11 @@ limitations under the License.
<cassandra.version>3.11.2</cassandra.version>
<checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
<chinook-data-hsqldb.version>0.1</chinook-data-hsqldb.version>
- <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
- <commons-lang3.version>3.2</commons-lang3.version>
- <commons-logging.version>1.1.3</commons-logging.version>
- <commons-pool2.version>2.5.0</commons-pool2.version>
+ <commons-dbcp2.version>2.5.0</commons-dbcp2.version>
+ <commons-lang3.version>3.8</commons-lang3.version>
+ <commons-pool2.version>2.6.0</commons-pool2.version>
<elasticsearch.version>6.2.4</elasticsearch.version>
- <esri-geometry-api.version>2.0.0</esri-geometry-api.version>
+ <esri-geometry-api.version>2.2.0</esri-geometry-api.version>
<findbugs.version>3.0.1</findbugs.version>
<fmpp-maven-plugin.version>1.0</fmpp-maven-plugin.version>
<foodmart-data-hsqldb.version>0.3</foodmart-data-hsqldb.version>
@@ -86,35 +85,30 @@ limitations under the License.
19.0 and 23.0. Default is 19.0 due to Cassandra adapter. -->
<guava.version>19.0</guava.version>
<joda.version>2.8.1</joda.version>
- <h2.version>1.4.185</h2.version>
+ <h2.version>1.4.197</h2.version>
<!-- Require Hadoop 2.7.4+ due to HADOOP-14586 -->
<hadoop.version>2.7.5</hadoop.version>
<hamcrest.version>1.3</hamcrest.version>
- <hsqldb.version>2.4.0</hsqldb.version>
- <httpclient.version>4.5.2</httpclient.version>
- <httpcore.version>4.4.4</httpcore.version>
+ <hsqldb.version>2.4.1</hsqldb.version>
+ <httpclient.version>4.5.6</httpclient.version>
+ <httpcore.version>4.4.10</httpcore.version>
<hydromatic-resource.version>0.6</hydromatic-resource.version>
<hydromatic-toolbox.version>0.3</hydromatic-toolbox.version>
<hydromatic-tpcds.version>0.4</hydromatic-tpcds.version>
<jackson.version>2.9.6</jackson.version>
<janino.version>3.0.9</janino.version>
- <java-diff.version>1.1.1</java-diff.version>
+ <java-diff.version>1.1.2</java-diff.version>
<javacc-maven-plugin.version>2.4</javacc-maven-plugin.version>
<jcip-annotations.version>1.0-1</jcip-annotations.version>
<jetty.version>9.2.19.v20160908</jetty.version>
<jmh.version>1.12</jmh.version>
- <jsoup.version>1.10.2</jsoup.version>
+ <jsoup.version>1.11.3</jsoup.version>
<junit.version>4.12</junit.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
- <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
- <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
- <!-- Apache 19 has 2.10.4, but need 3.0.1 for [LANG-1365] and [MJAVADOC-517]. -->
- <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
- <maven-scm-provider.version>1.9.4</maven-scm-provider.version>
- <maven-shade-plugin.version>2.1</maven-shade-plugin.version>
- <!-- Apache 19 has 2.20.1, but need 2.21.0+ for [MPOM-184] -->
- <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
- <mockito.version>2.5.5</mockito.version>
+ <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
+ <maven-scm-provider.version>1.9.5</maven-scm-provider.version>
+ <mockito.version>2.21.0</mockito.version>
<mongo-java-driver.version>3.5.0</mongo-java-driver.version>
<mysql-driver.version>5.1.20</mysql-driver.version>
<natty.version>0.13</natty.version>
@@ -910,7 +904,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -927,12 +920,10 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>${maven-shade-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
<configuration>
<threadCount>1</threadCount>
<perCoreThreadCount>true</perCoreThreadCount>
@@ -981,7 +972,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
<configuration>
<links>
<link>${maven-javadoc-plugin.link}</link>