From aa7b0cff8f00df52aa46f8b86e2ba9e71943e739 Mon Sep 17 00:00:00 2001 From: asdf2014 Date: Thu, 1 Aug 2019 08:58:34 +0800 Subject: [PATCH] Fix ByteBuffer's compatibility issues --- curator-examples/pom.xml | 12 ---------- curator-test-zk34/pom.xml | 8 ------- pom.xml | 50 +++++++++++++++++++++++++++++++-------- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index c8e8430cf7..7d6ffb952b 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -64,16 +64,4 @@ slf4j-log4j12 - - - - - maven-compiler-plugin - - 1.8 - 1.8 - - - - diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml index 1b6b102029..3d06cb0b35 100644 --- a/curator-test-zk34/pom.xml +++ b/curator-test-zk34/pom.xml @@ -136,14 +136,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - false - - - org.apache.maven.plugins maven-deploy-plugin diff --git a/pom.xml b/pom.xml index 8c74e7ad1f..b0fa567557 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,8 @@ UTF-8 UTF-8 - 1.8 + 8 + 1.${short-jdk-version} 3.5.4-beta @@ -664,15 +665,6 @@ maven-install-plugin - - org.apache.maven.plugins - maven-compiler-plugin - - ${jdk-version} - ${jdk-version} - - - org.apache.felix maven-bundle-plugin @@ -919,4 +911,42 @@ + + + + jdk-8-minus + + (,1.8] + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${jdk-version} + ${jdk-version} + + + + + + + jdk-9-plus + + [1.9,) + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${short-jdk-version} + + + + + +