You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by mm...@apache.org on 2018/01/17 22:37:49 UTC

calcite git commit: [CALCITE-2027] Fix dropping support for Java 7

Repository: calcite
Updated Branches:
  refs/heads/master c3a403c77 -> 27bcc135a


[CALCITE-2027] Fix dropping support for Java 7


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/27bcc135
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/27bcc135
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/27bcc135

Branch: refs/heads/master
Commit: 27bcc135a47418ae57eea764ee80e20ecd184a28
Parents: c3a403c
Author: Michael Mior <mm...@uwaterloo.ca>
Authored: Wed Jan 10 14:36:26 2018 -0500
Committer: Michael Mior <mm...@uwaterloo.ca>
Committed: Wed Jan 17 17:37:23 2018 -0500

----------------------------------------------------------------------
 .travis.yml                                                      | 2 +-
 .../java/org/apache/calcite/adapter/mongodb/MongoEnumerator.java | 2 +-
 pom.xml                                                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/27bcc135/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f8cd9b2..3df535a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,6 @@ cache:
 matrix:
   fast_finish: true
   include:
-    - jdk: openjdk7
     - jdk: oraclejdk8
+    - jdk: oraclejdk9
 # End .travis.yml

http://git-wip-us.apache.org/repos/asf/calcite/blob/27bcc135/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoEnumerator.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoEnumerator.java b/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoEnumerator.java
index bdc080c..054006b 100644
--- a/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoEnumerator.java
+++ b/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoEnumerator.java
@@ -120,7 +120,7 @@ class MongoEnumerator implements Enumerator<Object> {
         ? (Function1) mapGetter()
         : fields.size() == 1
             ? singletonGetter(fields.get(0).getKey(), fields.get(0).getValue())
-            : listGetter(fields);
+            : (Function1) listGetter(fields);
   }
 
   private static Object convert(Object o, Class clazz) {

http://git-wip-us.apache.org/repos/asf/calcite/blob/27bcc135/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d4269b0..9655174 100644
--- a/pom.xml
+++ b/pom.xml
@@ -599,8 +599,8 @@ limitations under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <compilerArgument>-Xlint:deprecation</compilerArgument>
         </configuration>
       </plugin>