You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by ah...@apache.org on 2017/04/08 04:27:23 UTC
zeppelin git commit: [ZEPPELIN-2326] - Updating Geode dependencies
and imports due to package rename
Repository: zeppelin
Updated Branches:
refs/heads/master 32e86d02d -> 2e6f14702
[ZEPPELIN-2326] - Updating Geode dependencies and imports due to package rename
### What is this PR for?
Updating Geode dependencies and imports due to package rename - ZEPPELIN-2326
### What type of PR is it?
Refactoring
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2326
### How should this be tested?
Same tests. One test (`oqlPdxInstanceResponse`) was failing before this change and it's still failing... Looks like a problem with the mock response, but I've not looked further. All remaining tests are passing.
### Questions:
* Does the licenses files need update? N/A
* Is there breaking changes for older versions? N/A
* Does this needs documentation? N/A
Author: William Markito Oliveira <ma...@apache.org>
Closes #2199 from markito/master and squashes the following commits:
e2c5650 [William Markito Oliveira] Merge branch 'master' of https://github.com/markito/zeppelin
54952a2 [William Markito Oliveira] Updating Geode dependencies and imports due to package rename
ededffb [William Markito Oliveira] Updating Geode dependencies and imports due to package rename
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2e6f1470
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2e6f1470
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2e6f1470
Branch: refs/heads/master
Commit: 2e6f14702f6fb1b7fe76fd2e07c11f512741968e
Parents: 32e86d0
Author: William Markito Oliveira <ma...@apache.org>
Authored: Wed Mar 29 21:19:25 2017 -0500
Committer: ahyoungryu <ah...@apache.org>
Committed: Sat Apr 8 13:27:16 2017 +0900
----------------------------------------------------------------------
geode/pom.xml | 4 ++--
.../apache/zeppelin/geode/GeodeOqlInterpreter.java | 12 ++++++------
.../zeppelin/geode/GeodeOqlInterpreterTest.java | 16 ++++++++--------
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2e6f1470/geode/pom.xml
----------------------------------------------------------------------
diff --git a/geode/pom.xml b/geode/pom.xml
index 0024729..e8eb9fc 100644
--- a/geode/pom.xml
+++ b/geode/pom.xml
@@ -34,7 +34,7 @@
<properties>
<!--library versions-->
- <geode.version>1.0.0-incubating-SNAPSHOT</geode.version>
+ <geode.version>1.1.0</geode.version>
<commons.exec.version>1.3</commons.exec.version>
</properties>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
- <artifactId>gemfire-core</artifactId>
+ <artifactId>geode-core</artifactId>
<version>${geode.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2e6f1470/geode/src/main/java/org/apache/zeppelin/geode/GeodeOqlInterpreter.java
----------------------------------------------------------------------
diff --git a/geode/src/main/java/org/apache/zeppelin/geode/GeodeOqlInterpreter.java b/geode/src/main/java/org/apache/zeppelin/geode/GeodeOqlInterpreter.java
index c677e45..b6c3faa 100644
--- a/geode/src/main/java/org/apache/zeppelin/geode/GeodeOqlInterpreter.java
+++ b/geode/src/main/java/org/apache/zeppelin/geode/GeodeOqlInterpreter.java
@@ -29,12 +29,12 @@ import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.Struct;
-import com.gemstone.gemfire.pdx.PdxInstance;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.pdx.PdxInstance;
/**
* Apache Geode OQL Interpreter (http://geode.apache.org)
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2e6f1470/geode/src/test/java/org/apache/zeppelin/geode/GeodeOqlInterpreterTest.java
----------------------------------------------------------------------
diff --git a/geode/src/test/java/org/apache/zeppelin/geode/GeodeOqlInterpreterTest.java b/geode/src/test/java/org/apache/zeppelin/geode/GeodeOqlInterpreterTest.java
index e3ac5fa..2a529fc 100644
--- a/geode/src/test/java/org/apache/zeppelin/geode/GeodeOqlInterpreterTest.java
+++ b/geode/src/test/java/org/apache/zeppelin/geode/GeodeOqlInterpreterTest.java
@@ -37,14 +37,14 @@ import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.junit.Test;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.Struct;
-import com.gemstone.gemfire.cache.query.internal.StructImpl;
-import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.internal.PdxInstanceImpl;
-import com.gemstone.gemfire.pdx.internal.PdxType;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.internal.StructImpl;
+import org.apache.geode.cache.query.internal.types.StructTypeImpl;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.internal.PdxInstanceImpl;
+import org.apache.geode.pdx.internal.PdxType;
public class GeodeOqlInterpreterTest {