GitHub user kaspersorensen opened a pull request:
https://github.com/apache/metamodel/pull/147
Merge `5.x` into master branch
I've just raised a VOTE for releasing version `5.0-RC2`. With that
milestone I think that we're getting close to a final release of 5.x and as
preparation for that we should re-integrate the branch back into the master
branch.
This PR does just that :-)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/metamodel 5.x
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metamodel/pull/147.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #147
----
commit a15ca724b5c4556ebb65700b4d50db878b6b159c
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-09T12:14:07Z
First attempts at making the API change for METAMODEL-6
commit 774cb596e70ab939b262218f7d908cd5164161ba
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-11T10:28:33Z
Added javadoc for METAMODEL-6
commit c5cc9febd3529219694057f6c6a67bc5c92b3aad
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-14T20:46:54Z
Updated module versions to 5.0-SNAPSHOT
commit 1bc6b6b3aae6d3318b2344314685d03ef0b9749b
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-14T20:48:44Z
METAMODEL-222: Removed Java 7 compatibility and build options
commit d6ab0bed337fcfc3dd673ed0f9ef4d6e447217af
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-14T20:54:11Z
Merge branch '5.x' into METAMODEL-6/execute-update-return-value
commit 58f8c2a297911cc591469d24ca14140185a04e13
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-14T20:54:36Z
Merge branch 'METAMODEL-222/java8-only' into
METAMODEL-6/execute-update-return-value
commit 5f478328f697437d6883b8adc95a12122bdf3cc4
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-14T20:58:34Z
METAMODEL-6: Changed API to use the Java 8 Optional interface
commit c51994c1f1484722e74ea9ffd8821ce9d7002a52
Author: Kasper Sørensen <[email protected]>
Date: 2015-12-16T20:15:58Z
METAMODEL-6: Added API for UpdateSummary. Fixes #81
commit d888907b3b27d821e0b8fd9291987e9b56e44c68
Author: Kasper Sørensen <[email protected]>
Date: 2016-01-02T20:59:14Z
METAMODEL-6: Added UpdateSummary building for JDBC module
commit d19a7aa66d89b9acea5a56e021efd09e2e98dc58
Author: Kasper Sørensen <[email protected]>
Date: 2016-01-08T12:51:03Z
METAMODEL-6: Added unittest assertions on update count and delete count
commit aa55e6a7098f77bc6b9e73b82a1bf0b17fb905f7
Author: Kasper Sørensen <[email protected]>
Date: 2016-01-08T13:24:43Z
Updated CHANGES.md
commit 95226631fbff65dd2f97cf99da77477a421ac03e
Author: Kasper Sørensen <[email protected]>
Date: 2016-01-08T13:25:02Z
Fixes #84
commit 6d50f0e310f58a7278ef0f4c3b3e090f22707fb6
Author: kaspersorensen <[email protected]>
Date: 2016-05-16T03:40:06Z
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/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataContext.java
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
full/pom.xml
hadoop/pom.xml
hbase/pom.xml
jdbc/pom.xml
json/pom.xml
mongodb/pom.xml
mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbDataContext.java
neo4j/pom.xml
openoffice/pom.xml
pojo/pom.xml
pom.xml
salesforce/pom.xml
spring/pom.xml
sugarcrm/pom.xml
xml/pom.xml
commit 28ba2df15630d2909ea627602065715ea95a919f
Author: kaspersorensen <[email protected]>
Date: 2016-05-16T04:19:11Z
Removed all deprecated API from MetaModel (aaaaah)
commit dd0cff7856f8d000dd1f8655b3134f4b3754bc09
Author: Kasper Sørensen <[email protected]>
Date: 2016-05-24T04:18:02Z
Updated CHANGES.md with METAMODEL-1087 information.
Fixes #101
commit 02397db0a15ef50ae3135143b4f60be75921fbd9
Author: Kasper Sørensen <[email protected]>
Date: 2016-07-11T04:27:21Z
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
excel/pom.xml
fixedwidth/pom.xml
full/pom.xml
hadoop/pom.xml
hbase/pom.xml
jdbc/pom.xml
json/pom.xml
mongodb/common/pom.xml
mongodb/mongo2/pom.xml
mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java
mongodb/mongo3/pom.xml
mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java
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
commit f015665d88ae5066e8657575bb01baa7af0a0f13
Author: Kasper Sørensen <[email protected]>
Date: 2017-04-29T23:05:07Z
Deprecated Ref, Func and Predicate in favor of java.util.function
"Ref" to be replaced by Supplier.
"Func" to be replaced by Function.
"Predicate" to be replaced by Predicate.
"Action" to extend Consumer (allowing for throwing checked exceptions).
"UncheckedFunc to extend Function.
Also added `@SuppressWarning` on method that the Java 8 compiler is
emitting warnings for while the code being alright.
commit bf943d5bcfe916573c43d8323713e5e864c24c92
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-02T13:03:53Z
Removed strange comment-line as pointed out by Tomasz G.
commit 400fc73165e87a9930a736c229e366232935e8ad
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-02T23:02:05Z
Removed Java 7 build from Travis CI config
commit c4788a27270110ee630e0337402f4f48b6147ac1
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-10T03:40:08Z
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
commit e5381fd47763968bce63057627e31de4e1f7b01e
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-10T03:56:44Z
Merge branch '5.x' into java-8-functions
# Conflicts:
# core/src/main/java/org/apache/metamodel/MetaModelHelper.java
commit 94e72019b2e710ea927748c67aa5083928cc5c77
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-10T04:03:13Z
METAMODEL-1139: Added UpdateSummary to dynamo DB data context
commit 599acc31deb5a96f9ab254cb26df8ee063f508e0
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-18T03:47:31Z
Preparing POM for release from 5.x branch
commit 8dc70763eaa4e4991838eefdf730d10c30f5afb9
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-18T03:58:05Z
Disabled Java 8 javadoc linter
commit db452eaeebadd13d7a6482f2ff76f3270ed2677a
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-18T04:03:46Z
[maven-release-plugin] prepare release MetaModel-5.0-RC1
commit b7816ff62612950def27959f46a147e9ab251f5f
Author: Kasper Sørensen <[email protected]>
Date: 2017-05-18T04:04:03Z
[maven-release-plugin] prepare for next development iteration
commit fe80412708e0bcd5e244e9e8f8b0d17ef05fcab4
Author: Kasper Sørensen <[email protected]>
Date: 2017-06-08T04:12:27Z
METAMODEL-63: Added UnionDataSet
commit 78d85d6d322590adf66b37c75c28f43703f73933
Author: Kasper Sørensen <[email protected]>
Date: 2017-06-08T04:39:27Z
METAMODEL-63: Slight redesign to introduce building block InvokableQuery
commit 16a5e715764e85143099b848e1dc943d196e1894
Author: Kasper Sørensen <[email protected]>
Date: 2017-06-13T02:05:50Z
Merge branch 'master' into 5.x
Conflicts:
CHANGES.md
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
commit f2b90ca94fe92081958977f6403d4567380cb27b
Author: Kasper Sørensen <[email protected]>
Date: 2017-06-13T02:13:35Z
[maven-release-plugin] prepare release MetaModel-5.0-RC2
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
