Merge branch 'master' into 5.x
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Mon, 11 Jul 2016 04:27:21 +0000 (21:27 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Mon, 11 Jul 2016 04:27:21 +0000 (21:27 -0700)
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

1  2 
CHANGES.md
cassandra/pom.xml
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
fixedwidth/pom.xml
jdbc/pom.xml
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUpdateCallback.java
mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java
mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java
pom.xml

diff --cc CHANGES.md
@@@ -1,10 -1,12 +1,18 @@@
- ### Apache MetaModel 4.5.3 (work in progress)
 +### Apache MetaModel 5.0
 +
 + * [METAMODEL-6] - Added update summary containing information about changes on returning UpdateableDataContext.executeUpdate(..)
 + * [METAMODEL-222] - Added support for Java 8 lambdas, removed support for Java 7.
 + * [METAMODEL-1087] - Removed deprecated APIs from MetaModel's codebase.
 +
+ ### Apache MetaModel 4.5.4 (work in progress)
+  * [METAMODEL-1099] - Created a new DataContextFactory SPI and a extensible registry of implementations based on ServiceLoader.
+  * [METAMODEL-1088] - Add support for aliases in MongoDB.
+  * [METAMODEL-1086] - Fixed encoding issue when CsvDataContext is instantiated with InputStream.
+  * [METAMODEL-1094] - Added support for Apache Cassandra version 3.x.
+  * [METAMODEL-1093] - Close compiled ResultSets.
+ ### Apache MetaModel 4.5.3
  
   * [METAMODEL-235] - Fixed a bug related to handling of null or missing values in ElasticSearch using REST client.
   * [METAMODEL-225] - Fixed support for nested objects and arrays in ElasticSearch using REST client.
Simple merge
@@@ -1,52 -1,52 +1,52 @@@
 -<?xml version="1.0" encoding="UTF-8" ?>\r
 -<!--\r
 -Licensed to the Apache Software Foundation (ASF) under one\r
 -or more contributor license agreements.  See the NOTICE file\r
 -distributed with this work for additional information\r
 -regarding copyright ownership.  The ASF licenses this file\r
 -to you under the Apache License, Version 2.0 (the\r
 -"License"); you may not use this file except in compliance\r
 -with the License.  You may obtain a copy of the License at\r
 -\r
 -  http://www.apache.org/licenses/LICENSE-2.0\r
 -\r
 -Unless required by applicable law or agreed to in writing,\r
 -software distributed under the License is distributed on an\r
 -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\r
 -KIND, either express or implied.  See the License for the\r
 -specific language governing permissions and limitations\r
 -under the License.\r
 --->\r
 -<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">\r
 -      <parent>\r
 -              <artifactId>MetaModel</artifactId>\r
 -              <groupId>org.apache.metamodel</groupId>\r
 -              <version>4.5.4-SNAPSHOT</version>\r
 -      </parent>\r
 -      <modelVersion>4.0.0</modelVersion>\r
 -      <artifactId>MetaModel-fixedwidth</artifactId>\r
 -      <name>MetaModel module for fixed width value files</name>\r
 -      <dependencies>\r
 +<?xml version="1.0" encoding="UTF-8" ?>
 +<!--
 +Licensed to the Apache Software Foundation (ASF) under one
 +or more contributor license agreements.  See the NOTICE file
 +distributed with this work for additional information
 +regarding copyright ownership.  The ASF licenses this file
 +to you under the Apache License, Version 2.0 (the
 +"License"); you may not use this file except in compliance
 +with the License.  You may obtain a copy of the License at
 +
 +  http://www.apache.org/licenses/LICENSE-2.0
 +
 +Unless required by applicable law or agreed to in writing,
 +software distributed under the 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">
 +      <parent>
 +              <artifactId>MetaModel</artifactId>
 +              <groupId>org.apache.metamodel</groupId>
 +              <version>5.0-SNAPSHOT</version>
 +      </parent>
 +      <modelVersion>4.0.0</modelVersion>
 +      <artifactId>MetaModel-fixedwidth</artifactId>
 +      <name>MetaModel module for fixed width value files</name>
 +      <dependencies>
-               <dependency>
-                       <groupId>org.apache.metamodel</groupId>
-                       <artifactId>MetaModel-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-         <dependency>
-       <groupId>org.apache.metamodel</groupId>
-       <artifactId>MetaModel-csv</artifactId>
-       <version>${project.version}</version>
-       <optional>true</optional>
-     </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-nop</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
- </project>
+               <dependency>\r
+                       <groupId>org.apache.metamodel</groupId>\r
+                       <artifactId>MetaModel-core</artifactId>\r
+                       <version>${project.version}</version>\r
+               </dependency>\r
+               <dependency>\r
+                       <groupId>org.apache.metamodel</groupId>\r
+                       <artifactId>MetaModel-csv</artifactId>\r
+                       <version>${project.version}</version>\r
+                       <optional>true</optional>\r
+               </dependency>\r
+               <dependency>\r
+                       <groupId>org.slf4j</groupId>\r
+                       <artifactId>slf4j-nop</artifactId>\r
+                       <scope>test</scope>\r
+               </dependency>\r
+               <dependency>\r
+                       <groupId>junit</groupId>\r
+                       <artifactId>junit</artifactId>\r
+                       <scope>test</scope>\r
+               </dependency>\r
+       </dependencies>\r
+ </project>\r
diff --cc jdbc/pom.xml
Simple merge
diff --cc pom.xml
Simple merge