Merge branch 'master' into 5.x
Conflicts:
CHANGES.md
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/16a5e715
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/16a5e715
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/16a5e715
Branch: refs/heads/5.x
Commit: 16a5e715764e85143099b848e1dc943d196e1894
Parents: 78d85d6 bf32dfe
Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com>
Authored: Mon Jun 12 19:05:50 2017 -0700
Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com>
Committed: Mon Jun 12 19:05:50 2017 -0700
----------------------------------------------------------------------
CHANGES.md | 2 +
csv/pom.xml | 4 +-
.../apache/metamodel/csv/CsvDataContext.java | 31 +++++---
.../org/apache/metamodel/csv/CsvDataSet.java | 2 +-
.../java/org/apache/metamodel/csv/CsvTable.java | 2 +-
.../metamodel/csv/SingleLineCsvDataSet.java | 8 +--
.../apache/metamodel/csv/SingleLineCsvRow.java | 9 +--
.../metamodel/csv/DoubleQuoteEscapeTest.java | 75 ++++++++++++++++++++
.../metamodel/csv/SingleLineCsvDataSetTest.java | 6 +-
.../metamodel/csv/SingleLineCsvRowTest.java | 2 +-
.../test/resources/csv_doublequoteescape.csv | 10 +++
csv/src/test/resources/csv_weirdquotes.csv | 10 +++
csv/src/test/resources/tickets.csv | 2 +-
.../salesforce/SalesforceDataContext.java | 12 +++-
14 files changed, 143 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/16a5e715/CHANGES.md
----------------------------------------------------------------------
diff --cc CHANGES.md
index b2cb95b,d5943fd..a468ab1
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -1,10 -1,5 +1,12 @@@
+### Apache MetaModel 5.0
+
+ * [METAMODEL-6] - Added update summary containing information about changes
on returning UpdateableDataContext.executeUpdate(..)
+ * [METAMODEL-63] - Added UnionDataSet, a general purpose utility for doing
client-side unions from other queries or data sets.
+ * [METAMODEL-222] - Added support for Java 8 lambdas, removed support for
Java 7.
+ * [METAMODEL-1087] - Removed deprecated APIs from MetaModel's codebase.
+ * [METAMODEL-1139] - Employed Java 8 functional types (java.util.function)
in favor of (now deprecated) Ref, Action, Func.
+ * [METAMODEL-1140] - Allowed SalesforceDataContext without a security token.
+ * [METAMODEL-1141] - Added RFC 4180 compliant CSV parsing.
### Apache MetaModel 4.6.0
http://git-wip-us.apache.org/repos/asf/metamodel/blob/16a5e715/csv/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/16a5e715/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/16a5e715/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
----------------------------------------------------------------------
