calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject [09/12] calcite git commit: Dependency management
Date Sun, 05 Jun 2016 22:22:50 GMT
Dependency management


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/8f8790cb
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/8f8790cb
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/8f8790cb

Branch: refs/heads/master
Commit: 8f8790cb0e5cc981025d6c52e41edc684b81ad2b
Parents: 9794565
Author: Julian Hyde <jhyde@apache.org>
Authored: Sat Jun 4 17:23:17 2016 -0700
Committer: Julian Hyde <jhyde@apache.org>
Committed: Sat Jun 4 21:35:29 2016 -0700

----------------------------------------------------------------------
 core/pom.xml          |  9 ++++-----
 elasticsearch/pom.xml |  2 +-
 pom.xml               | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/8f8790cb/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4d46afd..e1724b5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -383,17 +383,16 @@ limitations under the License.
       </build>
       <dependencies>
         <dependency>
-          <!-- Oracle's driver is not open source. Install the jar in your
-               local maven repository as follows:
+          <!-- Oracle's driver is not open source. If you wish to test against
+               Oracle, install the jar in your local maven repository as follows:
 
                $ cd $ORACLE_HOME/jdbc/lib
                $ mvn install:install-file -DgroupId=com.oracle
-                 -DartifactId=ojdbc6 -Dversion=11.2.0.2.0 -Dpackaging=jar
-                 -Dfile=ojdbc6.jar -DgeneratePom=true
+                 -DartifactId=ojdbc6 -Dversion=${oracle-jdbc6-driver.version}
+                 -Dpackaging=jar -Dfile=ojdbc6.jar -DgeneratePom=true
           -->
           <groupId>com.oracle</groupId>
           <artifactId>ojdbc6</artifactId>
-          <version>11.2.0.2.0</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/calcite/blob/8f8790cb/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 0677e67..fe3bf1c 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -71,7 +71,7 @@ limitations under the License.
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
-      <version>0.7.1</version>
+      <version>${hppc.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>

http://git-wip-us.apache.org/repos/asf/calcite/blob/8f8790cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc3e5fc..02497e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@ limitations under the License.
     <h2.version>1.4.185</h2.version>
     <hadoop.version>2.6.0</hadoop.version>
     <hamcrest.version>1.3</hamcrest.version>
+    <hppc.version>0.7.1</hppc.version>
     <hsqldb.version>2.3.1</hsqldb.version>
     <httpclient.version>4.5.2</httpclient.version>
     <httpcore.version>4.4.4</httpcore.version>
@@ -102,6 +103,7 @@ limitations under the License.
     <mongo-java-driver.version>2.12.3</mongo-java-driver.version>
     <mysql-driver.version>5.1.20</mysql-driver.version>
     <opencsv.version>2.3</opencsv.version>
+    <oracle-jdbc6-driver.version>11.2.0.2.0</oracle-jdbc6-driver.version>
     <pentaho-aggdesigner.version>5.1.5-jhyde</pentaho-aggdesigner.version>
     <postgresql.version>9.3-1102-jdbc3</postgresql.version>
     <protobuf.version>3.0.0-beta-1</protobuf.version>
@@ -185,6 +187,11 @@ limitations under the License.
         <version>${commons-dbcp.version}</version>
       </dependency>
       <dependency>
+        <groupId>com.carrotsearch</groupId>
+        <artifactId>hppc</artifactId>
+        <version>${hppc.version}</version>
+      </dependency>
+      <dependency>
         <groupId>com.datastax.cassandra</groupId>
         <artifactId>cassandra-driver-core</artifactId>
         <version>${cassandra-driver-core.version}</version>
@@ -220,6 +227,11 @@ limitations under the License.
         <version>${protobuf.version}</version>
       </dependency>
       <dependency>
+        <groupId>com.oracle</groupId>
+        <artifactId>ojdbc6</artifactId>
+        <version>${oracle-jdbc6-driver.version}</version>
+      </dependency>
+      <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
         <version>${h2.version}</version>
@@ -360,6 +372,11 @@ limitations under the License.
         <version>${jetty.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.elasticsearch</groupId>
+        <artifactId>elasticsearch</artifactId>
+        <version>${elasticsearch-java-driver.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.mongodb</groupId>
         <artifactId>mongo-java-driver</artifactId>
         <version>${mongo-java-driver.version}</version>


Mime
View raw message