diff --git a/.travis.yml b/.travis.yml index 08d9750..760cdba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ language: java jdk: - oraclejdk8 + - oraclejdk9 branches: only: - master +before_install: + - pwd && ls + - cp ./toolchains.xml ~/.m2/ script: "mvn clean package -P travis" after_success: - mvn clean test jacoco:report coveralls:report \ No newline at end of file diff --git a/README.md b/README.md index 3ab5989..c5193b6 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ A lite fast object pool written by Java. ## 1.2. Requirements jdk 1.8+ -maven-3.2.3+ +maven-3.3.1+(support [toolchains](https://maven.apache.org/guides/mini/guide-using-toolchains.html)) ## 1.3. Maven dependency @@ -36,14 +36,14 @@ maven-3.2.3+ cn.nextop lite-pool - 1.0.0-RC2 + 1.0.0-RC3 ``` ## 1.4. Install from source code ``` - $mvn clean install -Dmaven.test.skip=true + $mvn clean install -Dmaven.test.skip=true --global-toolchains ./toolchains.xml ``` # 2. Usage diff --git a/README.zh_CN.md b/README.zh_CN.md index 3d29111..49bba2d 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -28,7 +28,7 @@ Lite-pool : 轻量快速的对象池 ## 1.2. 安装前置条件 jdk 1.8+ -maven-3.2.3+ +maven-3.3.1+(支持 [toolchains](https://maven.apache.org/guides/mini/guide-using-toolchains.html)) ## 1.3. Maven依赖 @@ -36,14 +36,14 @@ maven-3.2.3+ cn.nextop lite-pool - 1.0.0-RC2 + 1.0.0-RC3 ``` ## 1.4. 安装源码到本地Maven仓库 ``` - $mvn clean install -Dmaven.test.skip=true + $mvn clean install -Dmaven.test.skip=true --global-toolchains ./toolchains.xml ``` # 2. 用法 diff --git a/pom.xml b/pom.xml index 4e59fd2..c1f33a6 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ cn.nextop lite-pool - 1.0.0-RC2 + 1.0.0-RC3 lite-pool A lite fast object pool written by java @@ -53,7 +53,7 @@ scm:git:git@github.com:nextopcn/lite-pool.git scm:git:git@github.com:nextopcn/lite-pool.git scm:git:git@github.com:nextopcn/lite-pool.git - 1.0.0-RC2 + 1.0.0-RC3 @@ -65,7 +65,7 @@ UTF-8 1.8 1.8 - 1.7.25 + 1.8.0-beta2 @@ -84,13 +84,13 @@ org.apache.logging.log4j log4j-core - 2.6.1 + 2.11.0 test org.apache.logging.log4j log4j-slf4j-impl - 2.6.1 + 2.11.0 test @@ -130,11 +130,59 @@ + + org.apache.maven.plugins + maven-toolchains-plugin + 1.1 + + + toolchain + + toolchain + + + + + + + 9 + + + 1.8 + + + + org.apache.maven.plugins maven-compiler-plugin 3.7.0 + + + base-compile + + compile + + + + module-info.java + + + + + default-compile + + + [9, ) + + 9 + + + + + [1.8, ) + ${maven.compiler.source} ${maven.compiler.target} ${project.build.sourceEncoding} @@ -154,6 +202,12 @@ 3.0.0 ${project.build.sourceEncoding} + + **/module-info.java + + + [9, ) + @@ -223,11 +277,59 @@ + + org.apache.maven.plugins + maven-toolchains-plugin + 1.1 + + + toolchain + + toolchain + + + + + + + 9 + + + 1.8 + + + + org.apache.maven.plugins maven-compiler-plugin 3.7.0 + + + base-compile + + compile + + + + module-info.java + + + + + default-compile + + + [9, ) + + 9 + + + + + [1.8, ) + ${maven.compiler.source} ${maven.compiler.target} ${project.build.sourceEncoding} @@ -247,6 +349,12 @@ 3.0.0 ${project.build.sourceEncoding} + + **/module-info.java + + + [9, ) + @@ -289,6 +397,64 @@ + + org.apache.maven.plugins + maven-toolchains-plugin + 1.1 + + + toolchain + + toolchain + + + + + + + 9 + + + 1.8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + + base-compile + + compile + + + + module-info.java + + + + + default-compile + + + [9, ) + + 9 + + + + + + [1.8, ) + + ${maven.compiler.source} + ${maven.compiler.target} + ${project.build.sourceEncoding} + + org.eluder.coveralls coveralls-maven-plugin diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..825ae36 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,24 @@ +/** + * @author Baoyi Chen + * @since 1.0.0 + */ +module cn.nextop.lite.pool { + exports cn.nextop.lite.pool; + exports cn.nextop.lite.pool.glossary; + exports cn.nextop.lite.pool.impl; + exports cn.nextop.lite.pool.support; + exports cn.nextop.lite.pool.support.allocator; + exports cn.nextop.lite.pool.support.allocator.allocation; + exports cn.nextop.lite.pool.util; + exports cn.nextop.lite.pool.util.builder; + exports cn.nextop.lite.pool.util.concurrent; + exports cn.nextop.lite.pool.util.concurrent.executor; + exports cn.nextop.lite.pool.util.concurrent.future; + exports cn.nextop.lite.pool.util.concurrent.future.impl; + exports cn.nextop.lite.pool.util.concurrent.thread; + exports cn.nextop.lite.pool.util.scheduler; + exports cn.nextop.lite.pool.util.scheduler.impl; + exports cn.nextop.lite.pool.util.scheduler.impl.executor; + requires org.slf4j; + requires java.management; +} \ No newline at end of file diff --git a/toolchains.xml b/toolchains.xml new file mode 100644 index 0000000..281fe90 --- /dev/null +++ b/toolchains.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + jdk + + 1.8 + oracle + + + + /usr/lib/jvm/java-8-oracle + + + + jdk + + 9 + oracle + + + + /usr/lib/jvm/java-9-oracle + + + + \ No newline at end of file