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:42:37 UTC
calcite git commit: [CALCITE-2027] Drop support for Java 7 [Forced
Update!]
Repository: calcite
Updated Branches:
refs/heads/master 27bcc135a -> 0ecbdab79 (forced update)
[CALCITE-2027] Drop 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/0ecbdab7
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/0ecbdab7
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/0ecbdab7
Branch: refs/heads/master
Commit: 0ecbdab792a80b1f05c6e03e99026f854b7e3af6
Parents: 73e57ad
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:42:22 2018 -0500
----------------------------------------------------------------------
.travis.yml | 2 +-
.../org/apache/calcite/adapter/mongodb/MongoEnumerator.java | 2 +-
pom.xml | 4 ++--
site/_docs/howto.md | 6 +++---
site/develop/index.md | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/0ecbdab7/.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/0ecbdab7/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/0ecbdab7/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>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0ecbdab7/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 437f64d..3b299e6 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -32,7 +32,7 @@ adapters.
## Building from a source distribution
Prerequisites are maven (3.5.2 or later)
-and Java (JDK 7, 8, 9 or 10) on your path.
+and Java (JDK 8, 9 or 10) on your path.
Unpack the source distribution `.tar.gz` or `.zip` file,
`cd` to the root directory of the unpacked source,
@@ -50,7 +50,7 @@ tests.
## Building from git
Prerequisites are git, maven (3.5.2 or later)
-and Java (JDK 7 or later, 9 preferred) on your path.
+and Java (JDK 8 or later, 9 preferred) on your path.
Create a local copy of the github repository,
`cd` to its root directory,
@@ -429,7 +429,7 @@ When the dry-run has succeeded, change `install` to `deploy`.
Before you start:
* Set up signing keys as described above.
-* Make sure you are using JDK 8 (not 7 or 9).
+* Make sure you are using JDK 8 (not 7, 9 or 10).
* Check that `README` and `site/_docs/howto.md` have the correct version number.
* Check that `NOTICE` has the current copyright year.
* Set `version.major` and `version.minor` in `pom.xml`.
http://git-wip-us.apache.org/repos/asf/calcite/blob/0ecbdab7/site/develop/index.md
----------------------------------------------------------------------
diff --git a/site/develop/index.md b/site/develop/index.md
index 4f8582d..f251bd8 100644
--- a/site/develop/index.md
+++ b/site/develop/index.md
@@ -41,7 +41,7 @@ user-friendly.
## Download source, build, and run tests
Prerequisites are git, maven (3.5.2 or later)
-and Java (JDK 7 or later, 9 preferred) on your path.
+and Java (JDK 8 or later, 9 preferred) on your path.
Create a local copy of the git repository, `cd` to its root directory,
then build using maven: