From 808b09bde4badecab061f1900fab6d5eb2c4d670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= <i.am.kasper.sorensen@gmail.com>
Date: Sat, 15 Aug 2015 19:48:02 +0200
Subject: [PATCH 1/4] METAMODEL-170: Removed Travis Java 6 build

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a9fbebcab..dd0e15fd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: java
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk8
 

From 26a64bdbba1b23d0cafa9b4712dcada92e5a804c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= <i.am.kasper.sorensen@gmail.com>
Date: Sat, 15 Aug 2015 19:52:49 +0200
Subject: [PATCH 2/4] METAMODEL-170: Removed any Java 6 specifics from build
 files

---
 cassandra/pom.xml     | 23 -----------------------
 elasticsearch/pom.xml | 43 +++++++++----------------------------------
 pom.xml               |  4 ++--
 3 files changed, 11 insertions(+), 59 deletions(-)

diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 2f53d6e14..473cf309f 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -57,27 +57,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>jdk6</id>
-            <activation>
-                <jdk>1.6</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.18.1</version>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/CassandraDataContextTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 8c1cb4a87..7114a8dda 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -20,8 +20,7 @@
 	<name>MetaModel module for Elasticsearch analytics engine</name>
 
 	<properties>
-		<elasticsearch.latest.version>1.4.4</elasticsearch.latest.version>
-		<elasticsearch.jdk6.version>0.90.13</elasticsearch.jdk6.version>
+		<elasticsearch.version>1.4.4</elasticsearch.version>
 	</properties>
 
 	<dependencies>
@@ -34,6 +33,14 @@
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 		</dependency>
+		
+		<!-- elasticsearch -->
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>${elasticsearch.version}</version>
+		</dependency>
+		
 		<!-- test -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -47,36 +54,4 @@
 		</dependency>
 	</dependencies>
 
-	<profiles>
-		<profile>
-			<id>latest</id>
-			<activation>
-				<jdk>!1.6</jdk>
-			</activation>
-			<dependencies>
-				<!-- elasticsearch -->
-				<dependency>
-					<groupId>org.elasticsearch</groupId>
-					<artifactId>elasticsearch</artifactId>
-					<version>${elasticsearch.latest.version}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-
-		<profile>
-			<id>jdk6</id>
-			<activation>
-				<jdk>1.6</jdk>
-			</activation>
-			<dependencies>
-				<!-- elasticsearch -->
-				<dependency>
-					<groupId>org.elasticsearch</groupId>
-					<artifactId>elasticsearch</artifactId>
-					<version>${elasticsearch.jdk6.version}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-
-	</profiles>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index acc73f2a8..d45c8b3ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,8 +168,8 @@ under the License.
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 					<encoding>utf-8</encoding>
 				</configuration>
 			</plugin>

From 132901d06134b0e4e62e323c4def22b3b68ac2d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= <i.am.kasper.sorensen@gmail.com>
Date: Sat, 15 Aug 2015 19:54:00 +0200
Subject: [PATCH 3/4] METAMODEL-170: Removed hack to avoid invalid test under
 ES version 0.x

---
 .../elasticsearch/ElasticSearchDataContextTest.java        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java b/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
index 07c618184..d421b9965 100644
--- a/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
+++ b/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
@@ -525,13 +525,6 @@ public void testQueryForAnExistingTableAndNonExistingField() throws Exception {
 
     @Test
     public void testNonDynamicMapingTableNames() throws Exception {
-        if (Version.CURRENT.major == 0) {
-            // this test is omitted on v. 0.x versions of ElasticSearch since
-            // the put mapping API is incompatible with 1.x so we cannot create
-            // the same prerequisites in the test.
-            return;
-        }
-
         createIndex();
 
         ElasticSearchDataContext dataContext2 = new ElasticSearchDataContext(client, indexName2);

From e076035ef7c807e3715c8303dc8c3cec62317f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= <i.am.kasper.sorensen@gmail.com>
Date: Mon, 17 Aug 2015 09:11:35 +0200
Subject: [PATCH 4/4] Updated "Java 6" to "Java 7" in pom comment

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d45c8b3ad..bf40e05a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@ under the License.
 	<build>
 		<plugins>
 			<plugin>
-				<!-- Ensures java 6 compatibility -->
+				<!-- Ensures java 7 compatibility -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>