Merge branch 'master' into 5.x
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Wed, 10 May 2017 03:40:08 +0000 (20:40 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Wed, 10 May 2017 03:53:48 +0000 (20:53 -0700)
commitc4788a27270110ee630e0337402f4f48b6147ac1
tree7c56fe9ec4645694df79b6d53036b384a476e535
parent02397db0a15ef50ae3135143b4f60be75921fbd9
parentb0cfe3aed447769f752743ac1753ebed90adaad2
Merge branch 'master' into 5.x

# Conflicts:
# CHANGES.md
# cassandra/pom.xml
# core/pom.xml
# couchdb/pom.xml
# csv/pom.xml
# elasticsearch/common/pom.xml
# elasticsearch/native/pom.xml
# elasticsearch/pom.xml
# elasticsearch/rest/pom.xml
# elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/ElasticSearchRestDataContext.java
# excel/pom.xml
# fixedwidth/pom.xml
# fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthColumnSpec.java
# fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthConfiguration.java
# fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthConfigurationReader.java
# full/pom.xml
# hadoop/pom.xml
# hbase/pom.xml
# jdbc/pom.xml
# jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/PostgresqlTest.java
# json/pom.xml
# mongodb/common/pom.xml
# mongodb/mongo2/pom.xml
# mongodb/mongo3/pom.xml
# mongodb/pom.xml
# neo4j/pom.xml
# openoffice/pom.xml
# pojo/pom.xml
# pom.xml
# salesforce/pom.xml
# spring/pom.xml
# sugarcrm/pom.xml
# xml/pom.xml
20 files changed:
CHANGES.md
core/src/main/java/org/apache/metamodel/query/FilterItem.java
core/src/main/java/org/apache/metamodel/query/builder/AbstractFilterBuilder.java
core/src/main/java/org/apache/metamodel/query/builder/AbstractQueryFilterBuilder.java
core/src/main/java/org/apache/metamodel/query/builder/FilterBuilder.java
dynamodb/pom.xml
elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/ElasticSearchRestDataContext.java
excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java
fixedwidth/pom.xml
fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContext.java
jdbc/pom.xml
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDeleteBuilder.java
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcInsertBuilder.java
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUpdateBuilder.java
jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/PostgresqlTest.java
pom.xml
salesforce/pom.xml
salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java