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 2014/07/18 21:07:24 UTC
[1/2] git commit: METAMODEL-67: Upgraded Jackson dependencies
Repository: incubator-metamodel
Updated Branches:
refs/heads/master 3e4af6ddc -> b3bfd99a2
METAMODEL-67: Upgraded Jackson dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/0339ab12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/0339ab12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/0339ab12
Branch: refs/heads/master
Commit: 0339ab121d7d42eb0aa986c607c9dd236f42aa9a
Parents: 3e4af6d
Author: Kasper Sørensen <i....@gmail.com>
Authored: Fri Jul 18 20:44:42 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Fri Jul 18 20:44:42 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
couchdb/pom.xml | 20 ++++------------
.../metamodel/couchdb/CouchDbDataContext.java | 3 ++-
.../metamodel/couchdb/CouchDbDataSet.java | 3 ++-
.../couchdb/CouchDbDatabaseDocumentSource.java | 3 ++-
.../apache/metamodel/couchdb/CouchDbUtils.java | 5 ++--
json/pom.xml | 8 +++----
.../apache/metamodel/json/JsonDataContext.java | 7 +++---
.../metamodel/json/JsonDocumentSource.java | 5 ++--
pom.xml | 24 +++++++++++++-------
10 files changed, 42 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ecd6066..3fc6a79 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ Apache MetaModel 4.2.0-incubating
* [METAMODEL-45] - Improved and standardized way of handling integration test connection information towards external databases.
* [METAMODEL-62] - Fixed a bug related to fault-tolerant handling of malformed CSV lines when reading CSVs in single-line mode
* [METAMODEL-68] - Made it possible to create a CSV table without a header line in the file, if the user configures it.
+ * [METAMODEL-67] - Upgraded Jackson (JSON library) dependency from org.codehaus namespace to the newer com.fasterxml namespace.
Apache MetaModel 4.1.0-incubating
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/couchdb/pom.xml b/couchdb/pom.xml
index 0c4065b..2d0236d 100644
--- a/couchdb/pom.xml
+++ b/couchdb/pom.xml
@@ -35,25 +35,15 @@ under the License.
<dependency>
<groupId>org.ektorp</groupId>
<artifactId>org.ektorp</artifactId>
- <version>1.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.4.2</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
----------------------------------------------------------------------
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
index 3439c36..33cab20 100644
--- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContext.java
@@ -36,7 +36,6 @@ import org.apache.metamodel.schema.Table;
import org.apache.metamodel.schema.builder.DocumentSourceProvider;
import org.apache.metamodel.schema.builder.SchemaBuilder;
import org.apache.metamodel.util.SimpleTableDef;
-import org.codehaus.jackson.JsonNode;
import org.ektorp.CouchDbConnector;
import org.ektorp.CouchDbInstance;
import org.ektorp.StreamingViewResult;
@@ -45,6 +44,8 @@ import org.ektorp.http.HttpClient;
import org.ektorp.http.StdHttpClient;
import org.ektorp.impl.StdCouchDbInstance;
+import com.fasterxml.jackson.databind.JsonNode;
+
/**
* DataContext implementation for CouchDB
*/
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataSet.java
----------------------------------------------------------------------
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataSet.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataSet.java
index 5d2a538..fac3906 100644
--- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataSet.java
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataSet.java
@@ -25,9 +25,10 @@ import org.apache.metamodel.data.DataSetHeader;
import org.apache.metamodel.data.DefaultRow;
import org.apache.metamodel.data.Row;
import org.apache.metamodel.query.SelectItem;
-import org.codehaus.jackson.JsonNode;
import org.ektorp.StreamingViewResult;
+import com.fasterxml.jackson.databind.JsonNode;
+
/**
* DataSet implementation for couch db.
*/
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDatabaseDocumentSource.java
----------------------------------------------------------------------
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDatabaseDocumentSource.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDatabaseDocumentSource.java
index 6a11c1e..d1f113d 100644
--- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDatabaseDocumentSource.java
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDatabaseDocumentSource.java
@@ -24,13 +24,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.metamodel.data.Document;
import org.apache.metamodel.data.DocumentSource;
-import org.codehaus.jackson.JsonNode;
import org.ektorp.CouchDbConnector;
import org.ektorp.CouchDbInstance;
import org.ektorp.StreamingViewResult;
import org.ektorp.ViewQuery;
import org.ektorp.ViewResult.Row;
+import com.fasterxml.jackson.databind.JsonNode;
+
/**
* {@link DocumentSource} implementation that goes with the
* {@link CouchDbDataContext}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java
----------------------------------------------------------------------
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java
index c278e16..9f5fb7d 100644
--- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbUtils.java
@@ -25,10 +25,11 @@ import java.util.Map;
import org.apache.metamodel.data.DataSetHeader;
import org.apache.metamodel.data.DefaultRow;
import org.apache.metamodel.data.Row;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
import org.ektorp.DbAccessException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
/**
* Convenience and utility methods for MetaModel's CouchDB adaptor
*/
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/json/pom.xml
----------------------------------------------------------------------
diff --git a/json/pom.xml b/json/pom.xml
index 1e41b29..39da647 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -26,12 +26,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<!-- Test dependencies -->
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java
----------------------------------------------------------------------
diff --git a/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java b/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java
index 1700f93..90f726d 100644
--- a/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java
+++ b/json/src/main/java/org/apache/metamodel/json/JsonDataContext.java
@@ -43,11 +43,12 @@ import org.apache.metamodel.schema.builder.SingleTableInferentialSchemaBuilder;
import org.apache.metamodel.util.FileHelper;
import org.apache.metamodel.util.FileResource;
import org.apache.metamodel.util.Resource;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.MappingJsonFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
+
/**
* {@link DataContext} implementation that works on JSON files or
* {@link Resource}s.
@@ -103,7 +104,7 @@ public class JsonDataContext extends QueryPostprocessDataContext implements Docu
final InputStream inputStream = _resource.read();
try {
final MappingJsonFactory jsonFactory = new MappingJsonFactory();
- final JsonParser parser = jsonFactory.createJsonParser(inputStream);
+ final JsonParser parser = jsonFactory.createParser(inputStream);
logger.debug("Created JSON parser for resource: {}", _resource);
return new JsonDocumentSource(parser, _resource.getName());
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/json/src/main/java/org/apache/metamodel/json/JsonDocumentSource.java
----------------------------------------------------------------------
diff --git a/json/src/main/java/org/apache/metamodel/json/JsonDocumentSource.java b/json/src/main/java/org/apache/metamodel/json/JsonDocumentSource.java
index fe2b9a9..0a3896a 100644
--- a/json/src/main/java/org/apache/metamodel/json/JsonDocumentSource.java
+++ b/json/src/main/java/org/apache/metamodel/json/JsonDocumentSource.java
@@ -24,11 +24,12 @@ import java.util.Map;
import org.apache.metamodel.MetaModelException;
import org.apache.metamodel.data.Document;
import org.apache.metamodel.data.DocumentSource;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+
/**
* Utility class that provides an easy way of iterating documents in a JSON file
*/
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/0339ab12/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 61b1a5e..cfd862a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,8 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -247,6 +248,7 @@
<bannedDependencies>
<excludes>
<exclude>commons-logging:commons-logging</exclude>
+ <exclude>org.codehaus.jackson</exclude>
</excludes>
</bannedDependencies>
</rules>
@@ -318,7 +320,8 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<licenses>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <license
+ implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<licenseFamilyCategory>ASL20</licenseFamilyCategory>
<licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
<notes>Single licensed ASL v2.0</notes>
@@ -442,14 +445,19 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.12</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.4.1.1</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.12</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.4.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.4.1</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
[2/2] git commit: METAMODEL-67: Also excluded org.codehaus Jackson
from Hadoop dependency.
Posted by ka...@apache.org.
METAMODEL-67: Also excluded org.codehaus Jackson from Hadoop dependency.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/b3bfd99a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/b3bfd99a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/b3bfd99a
Branch: refs/heads/master
Commit: b3bfd99a291e4df79dd2ff658193c632674e1c9e
Parents: 0339ab1
Author: Kasper Sørensen <i....@gmail.com>
Authored: Fri Jul 18 21:06:23 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Fri Jul 18 21:06:23 2014 +0200
----------------------------------------------------------------------
hbase/pom.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/b3bfd99a/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/hbase/pom.xml b/hbase/pom.xml
index 2aa7694..966035f 100644
--- a/hbase/pom.xml
+++ b/hbase/pom.xml
@@ -9,7 +9,8 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>MetaModel</artifactId>
<groupId>org.apache.metamodel</groupId>
@@ -106,6 +107,14 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>