calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject calcite git commit: [CALCITE-1474] Upgrade aggdesigner
Date Mon, 31 Oct 2016 15:49:40 GMT
Repository: calcite
Updated Branches:
  refs/heads/master aa8fe0828 -> e062f6d1e


[CALCITE-1474] Upgrade aggdesigner

Switch from org.pentaho:pentaho-aggdesigner to net.hydromatic:aggdesigner.


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

Branch: refs/heads/master
Commit: e062f6d1edb8dea7ee4826d47ce79525b55cd2cf
Parents: aa8fe08
Author: Julian Hyde <jhyde@apache.org>
Authored: Thu Oct 27 15:40:58 2016 -0700
Committer: Julian Hyde <jhyde@apache.org>
Committed: Mon Oct 31 01:06:26 2016 -0700

----------------------------------------------------------------------
 core/pom.xml |  8 ++++----
 pom.xml      | 23 ++++++-----------------
 2 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/e062f6d1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 14d8872..2176ef6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -96,6 +96,10 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>net.hydromatic</groupId>
+      <artifactId>aggdesigner-algorithm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.hydromatic</groupId>
       <artifactId>eigenbase-properties</artifactId>
     </dependency>
     <dependency>
@@ -142,10 +146,6 @@ limitations under the License.
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.pentaho</groupId>
-      <artifactId>pentaho-aggdesigner-algorithm</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/calcite/blob/e062f6d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e5f80e3..2e46dcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@ limitations under the License.
     <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>
+    <aggdesigner.version>6.0</aggdesigner.version>
     <postgresql.version>9.3-1102-jdbc3</postgresql.version>
     <quidem.version>0.7</quidem.version>
     <scala.version>2.10.3</scala.version>
@@ -258,6 +258,11 @@ limitations under the License.
       </dependency>
       <dependency>
         <groupId>net.hydromatic</groupId>
+        <artifactId>aggdesigner-algorithm</artifactId>
+        <version>${aggdesigner.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.hydromatic</groupId>
         <artifactId>eigenbase-properties</artifactId>
         <version>${eigenbase-properties.version}</version>
       </dependency>
@@ -352,11 +357,6 @@ limitations under the License.
         <version>${java-diff.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.pentaho</groupId>
-        <artifactId>pentaho-aggdesigner-algorithm</artifactId>
-        <version>${pentaho-aggdesigner.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-core_2.10</artifactId>
         <version>${spark.version}</version>
@@ -777,17 +777,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>


Mime
View raw message