You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ar...@apache.org on 2019/12/13 10:40:20 UTC
[metamodel] 01/02: Merge branch 'master' into
dependabot/maven/jackson.version-2.10.1
This is an automated email from the ASF dual-hosted git repository.
arjansh pushed a commit to branch dependabot/maven/jackson.version-2.10.1
in repository https://gitbox.apache.org/repos/asf/metamodel.git
commit 38b6224855b6ba758f9ae6554b8e5e8d28e6f99c
Merge: 3f7b0e5 1913598
Author: Arjan Seijkens <a....@quadient.com>
AuthorDate: Thu Dec 12 14:43:27 2019 +0100
Merge branch 'master' into dependabot/maven/jackson.version-2.10.1
CHANGES.md | 1 +
excel/pom.xml | 2 +-
.../excel/DefaultSpreadsheetReaderDelegate.java | 222 +++++++++++++++++++--
.../apache/metamodel/excel/ExcelConfiguration.java | 56 +++++-
.../apache/metamodel/excel/ExcelDataContext.java | 2 +-
.../org/apache/metamodel/excel/ExcelUtils.java | 212 ++++++++++++++------
.../metamodel/excel/ExcelConfigurationTest.java | 15 +-
.../metamodel/excel/ExcelDataContextTest.java | 160 +++++++++++++++
excel/src/test/resources/different_datatypes.xls | Bin 0 -> 35840 bytes
excel/src/test/resources/different_datatypes.xlsx | Bin 0 -> 9870 bytes
pom.xml | 2 +-
11 files changed, 574 insertions(+), 98 deletions(-)
diff --cc pom.xml
index 5524f00,22a9233..ced6266
--- a/pom.xml
+++ b/pom.xml
@@@ -27,9 -27,9 +27,9 @@@ under the License
<junit.version>4.12</junit.version>
<guava.version>27.0.1-jre</guava.version>
<hadoop.version>3.1.1</hadoop.version>
- <jackson.version>2.6.7</jackson.version>
+ <jackson.version>2.10.1</jackson.version>
<easymock.version>3.2</easymock.version>
- <spring.version>4.2.6.RELEASE</spring.version>
+ <spring.version>5.2.2.RELEASE</spring.version>
<httpcomponents.version>4.4.1</httpcomponents.version>
<docker-maven-plugin.version>0.23.0</docker-maven-plugin.version>
<skipTests>false</skipTests>