You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2016/07/11 04:28:51 UTC
[07/12] metamodel git commit: METAMODEL-1094: Fixed
METAMODEL-1094: Fixed
Fixes #108
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/2486a569
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/2486a569
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/2486a569
Branch: refs/heads/5.x
Commit: 2486a56998550b5a74d265efef7dbebec68a22a0
Parents: f1fc2bf
Author: Kasper S�rensen <i....@gmail.com>
Authored: Wed Jun 8 21:27:05 2016 -0700
Committer: Kasper S�rensen <i....@gmail.com>
Committed: Wed Jun 8 21:27:05 2016 -0700
----------------------------------------------------------------------
CHANGES.md | 1 +
cassandra/pom.xml | 12 ++++++++++--
.../org/apache/metamodel/cassandra/CassandraUtils.java | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/2486a569/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 92e13e4..c10eb35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
* [METAMODEL-1088] - Add support for aliases in MongoDB.
* [METAMODEL-1086] - Fixed encoding issue when CsvDataContext is instantiated with InputStream.
+ * [METAMODEL-1094]�- Added support for Apache Cassandra version 3.x.
### Apache MetaModel 4.5.3
http://git-wip-us.apache.org/repos/asf/metamodel/blob/2486a569/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 8bb99a5..7a84f6e 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -20,7 +20,8 @@
<name>MetaModel module for Apache Cassandra database</name>
<properties>
- <cassandra.driver.latest.version>2.1.1</cassandra.driver.latest.version>
+ <cassandra.driver.latest.version>3.0.2</cassandra.driver.latest.version>
+ <cassandraunit.latest.version>2.2.2.1</cassandraunit.latest.version>
</properties>
<dependencies>
@@ -34,6 +35,13 @@
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${cassandra.driver.latest.version}</version>
+ <!-- Excluded netty dependency -->
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -53,7 +61,7 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>2.1.3.1</version>
+ <version>${cassandraunit.latest.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/metamodel/blob/2486a569/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraUtils.java
----------------------------------------------------------------------
diff --git a/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraUtils.java b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraUtils.java
index 0805dfe..b8f7327 100644
--- a/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraUtils.java
+++ b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraUtils.java
@@ -84,7 +84,7 @@ public class CassandraUtils {
case TEXT:
return row.getString(columnName);
case TIMESTAMP:
- return row.getDate(columnName);
+ return row.getTimestamp(columnName);
case UUID:
return row.getUUID(columnName);
case VARCHAR: