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 2015/03/10 02:45:59 UTC
incubator-calcite git commit: [CALCITE-605] Reduce dependency on
third-party maven repositories
Repository: incubator-calcite
Updated Branches:
refs/heads/master 03e944983 -> 3eb6515d6
[CALCITE-605] Reduce dependency on third-party maven repositories
Upgrade sqlline, eigenbase-properties, quidem, foodmart-data-hsqldb, foodmart-data-mysql, foodmart-queries, tpcds, hydromatic-resource-maven-plugin to new versions in Maven Central.
Remove conjars plugin repo. (Still need conjars as package repo, for pentaho-aggdesigner-algorithm.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/3eb6515d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/3eb6515d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/3eb6515d
Branch: refs/heads/master
Commit: 3eb6515d651de14f8baa20cf9987331ab31200fb
Parents: 03e9449
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Mar 5 18:24:53 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Mar 9 18:30:09 2015 -0700
----------------------------------------------------------------------
.../org/apache/calcite/test/CalciteAssert.java | 4 +-
.../org/apache/calcite/test/FoodmartTest.java | 5 +--
pom.xml | 47 +++++++++-----------
3 files changed, 26 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/3eb6515d/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/CalciteAssert.java b/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
index dd6b62c..97eb68a 100644
--- a/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
+++ b/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
@@ -49,6 +49,8 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultiset;
import com.google.common.collect.Lists;
+import net.hydromatic.foodmart.data.hsqldb.FoodmartHsqldb;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.InvocationTargetException;
@@ -1437,7 +1439,7 @@ public class CalciteAssert {
/** Information necessary to create a JDBC connection. Specify one to run
* tests against a different database. (hsqldb is the default.) */
public enum ConnectionSpec {
- HSQLDB("jdbc:hsqldb:res:foodmart", "FOODMART", "FOODMART",
+ HSQLDB(FoodmartHsqldb.URI, "FOODMART", "FOODMART",
"org.hsqldb.jdbcDriver"),
MYSQL("jdbc:mysql://localhost/foodmart", "foodmart", "foodmart",
"com.mysql.jdbc.Driver");
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/3eb6515d/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/FoodmartTest.java b/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
index 3b22572..4a4a6a5 100644
--- a/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
+++ b/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
@@ -23,8 +23,6 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
-import mondrian.test.data.FoodMartQuery;
-
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -199,7 +197,8 @@ public class FoodmartTest {
mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
- final InputStream inputStream = new FoodMartQuery().getQueries();
+ final InputStream inputStream =
+ new net.hydromatic.foodmart.queries.FoodmartQuerySet().getQueries();
FoodmartRoot root = mapper.readValue(inputStream, FoodmartRoot.class);
for (FoodmartQuery query : root.queries) {
queries.put(query.id, query);
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/3eb6515d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cfa97b4..7b9119b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,9 +98,9 @@ limitations under the License.
<version>11.0.2</version>
</dependency>
<dependency>
- <groupId>eigenbase</groupId>
+ <groupId>net.hydromatic</groupId>
<artifactId>eigenbase-properties</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -117,7 +117,7 @@ limitations under the License.
<dependency>
<groupId>net.hydromatic</groupId>
<artifactId>quidem</artifactId>
- <version>0.2</version>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -143,21 +143,21 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>pentaho</groupId>
- <artifactId>mondrian-data-foodmart-hsqldb</artifactId>
- <version>0.2</version>
+ <groupId>net.hydromatic</groupId>
+ <artifactId>foodmart-data-hsqldb</artifactId>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>pentaho</groupId>
- <artifactId>mondrian-data-foodmart-queries</artifactId>
- <version>0.3</version>
+ <groupId>net.hydromatic</groupId>
+ <artifactId>foodmart-queries</artifactId>
+ <version>0.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
- <version>1.1.7</version>
+ <version>1.1.9</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -206,7 +206,7 @@ limitations under the License.
<dependency>
<groupId>net.hydromatic</groupId>
<artifactId>tpcds</artifactId>
- <version>0.2</version>
+ <version>0.3</version>
<type>jar</type>
</dependency>
<dependency>
@@ -366,7 +366,7 @@ limitations under the License.
<plugin>
<groupId>net.hydromatic</groupId>
<artifactId>hydromatic-resource-maven-plugin</artifactId>
- <version>0.3</version>
+ <version>0.4</version>
</plugin>
<plugin>
<groupId>net.ju-n.maven.plugins</groupId>
@@ -454,20 +454,15 @@ limitations under the License.
<repositories>
<repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <id>conjars</id>
- <name>Conjars</name>
- <url>http://conjars.org/repo</url>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>http://repo.maven.apache.org/maven2</url>
<layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
+ <repository>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
@@ -477,8 +472,8 @@ limitations under the License.
<name>Conjars</name>
<url>http://conjars.org/repo</url>
<layout>default</layout>
- </pluginRepository>
- </pluginRepositories>
+ </repository>
+ </repositories>
<profiles>
<profile>