Repository: cayenne Updated Branches: refs/heads/master eb250373a -> 5aff25c97
CAY-2431 Cayenne JDK 11 compatibility update Gradle version enable test run on Java 11-ea Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5aff25c9 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5aff25c9 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5aff25c9 Branch: refs/heads/master Commit: 5aff25c9782c8fbabeb7b0b61d7eb73dbc9f3fd8 Parents: eb25037 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Jun 8 12:48:36 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Jun 8 12:48:36 2018 +0300 ---------------------------------------------------------------------- .travis.yml | 16 ++++++++++++++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../org/apache/cayenne/tools/GradlePluginIT.java | 7 +++++-- 3 files changed, 20 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5aff25c9/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 028bf79..551c63f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,12 +35,24 @@ env: jdk: - oraclejdk8 - oraclejdk9 + - oraclejdk10 + +matrix: + include: + - jdk: oraclejdk-ea + env: DB_PROFILE=mysql-docker EXCLUDE_MODULES="-pl !docs/doc,!assembly" + - jdk: oraclejdk-ea + env: DB_PROFILE=postgres-docker EXCLUDE_MODULES="-pl !docs/doc,!assembly" + - jdk: oraclejdk-ea + env: DB_PROFILE=sqlserver-docker EXCLUDE_MODULES="-pl !docs/doc,!assembly" + allow_failures: + - jdk: oraclejdk-ea script: - - travis_wait mvn verify -q -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR + - travis_wait mvn verify -q $EXCLUDE_MODULES -DcayenneTestConnection=$DB_PROFILE -DcayenneLogLevel=ERROR # prevent Travis from unneeded "mvn install" run -install: /bin/true +install: true #cache: # directories: http://git-wip-us.apache.org/repos/asf/cayenne/blob/5aff25c9/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index e5e04e4..605e655 100644 --- a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists http://git-wip-us.apache.org/repos/asf/cayenne/blob/5aff25c9/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java index 6b9cbd7..199c0a6 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java @@ -54,8 +54,11 @@ public class GradlePluginIT extends BaseTaskIT { String[] versions; - // Old gradle versions will fail on Java 9 - if (getJavaMajorVersion(System.getProperty("java.version")) < 9) { + // Old gradle versions will fail on new JDK + int javaMajorVersion = getJavaMajorVersion(System.getProperty("java.version")); + if(javaMajorVersion >= 11) { + versions = new String[]{"4.8"}; + } else if (javaMajorVersion < 9) { versions = new String[]{"4.3", "4.0", "3.5", "3.3", "3.0", "2.12", "2.8"}; } else { versions = new String[]{"4.3.1", "4.3"};
