This is an automated email from the ASF dual-hosted git repository.
shayshim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/curator.git
The following commit(s) were added to refs/heads/master by this push:
new aa7b0cf Fix ByteBuffer's compatibility issues
new db399d4 Merge pull request #321 from asdf2014/fix_bytebuffer
aa7b0cf is described below
commit aa7b0cff8f00df52aa46f8b86e2ba9e71943e739
Author: asdf2014 <[email protected]>
AuthorDate: Thu Aug 1 08:58:34 2019 +0800
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 c8e8430..7d6ffb9 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -64,16 +64,4 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index 1b6b102..3d06cb0 100644
--- a/curator-test-zk34/pom.xml
+++ b/curator-test-zk34/pom.xml
@@ -138,14 +138,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
-
<useIncrementalCompilation>false</useIncrementalCompilation>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 8c74e7a..b0fa567 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,8 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <jdk-version>1.8</jdk-version>
+ <short-jdk-version>8</short-jdk-version>
+ <jdk-version>1.${short-jdk-version}</jdk-version>
<!-- versions -->
<zookeeper-version>3.5.4-beta</zookeeper-version>
@@ -665,15 +666,6 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${jdk-version}</source>
- <target>${jdk-version}</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -919,4 +911,42 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk-8-minus</id>
+ <activation>
+ <jdk>(,1.8]</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${jdk-version}</source>
+ <target>${jdk-version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jdk-9-plus</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <release>${short-jdk-version}</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
