From 1be194b1562c4a7843f180d971ab88b7a2166755 Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Sat, 15 Aug 2015 18:48:25 +0800 Subject: [PATCH 1/4] update pom version to 1.6.0-SNAPSHOT --- library/README.md | 2 +- library/pom.xml | 2 +- pom.xml | 2 +- tool/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/README.md b/library/README.md index 5ce601a3..98248e0a 100644 --- a/library/README.md +++ b/library/README.md @@ -200,7 +200,7 @@ PS： com.alibaba dns-cache-manipulator - 1.4.1 + 1.5.0 ``` diff --git a/library/pom.xml b/library/pom.xml index 4bd0bd3f..9dd1ac20 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ com.alibaba dns-cache-manipulator - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT jar Java Dns Cache Manipulator(DCM) Lib A simple 0-dependency thread-safe lib for setting dns programmatically without touching host file, make unit/integration test portable. diff --git a/pom.xml b/pom.xml index cee780fb..14583caf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.alibaba dns-cache-manipulator-parent - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT pom ${project.artifactId} 2015 diff --git a/tool/pom.xml b/tool/pom.xml index 3eb4098f..76223c69 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -4,7 +4,7 @@ com.alibaba dns-cache-manipulator-tool - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT jar Java Dns Cache Manipulator(DCM) Tool 2015 From d021da939bbdf24287769f26b5836d2cf43fa0f2 Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Sun, 16 Aug 2015 14:16:50 +0800 Subject: [PATCH 2/4] update assembly configuration --- tool/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tool/pom.xml b/tool/pom.xml index 76223c69..87af95af 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -81,6 +81,10 @@ maven-assembly-plugin 2.5.4 + + dcm-${project.version} + false + tgz-assembly From 2f262272ba9171b538a4858de5f8e96de4113a99 Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Sun, 16 Aug 2015 14:17:12 +0800 Subject: [PATCH 3/4] fix typo --- library/README.md | 2 +- .../java/com/alibaba/dcm/internal/IpParserUtilTest.java | 6 +++--- tool/README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/README.md b/library/README.md index 98248e0a..6fadd9ff 100644 --- a/library/README.md +++ b/library/README.md @@ -53,7 +53,7 @@ Java Dns Cache Manipulator(DCM) Library ```java DnsCacheManipulator.setDnsCache("www.hello.com", "192.168.1.1"); -DnsCacheManipulator.setDnsCache("www.world.com", "1234:5678:0:0:0:0:0:200e"); // 支持IPv6设备 +DnsCacheManipulator.setDnsCache("www.world.com", "1234:5678:0:0:0:0:0:200e"); // 支持IPv6地址 // 之后Java代码中使用到域名都会解析成上面指定的IP。 // 下面是一个简单获取域名对应的IP，演示一下： diff --git a/library/src/test/java/com/alibaba/dcm/internal/IpParserUtilTest.java b/library/src/test/java/com/alibaba/dcm/internal/IpParserUtilTest.java index d555db35..42efbb09 100644 --- a/library/src/test/java/com/alibaba/dcm/internal/IpParserUtilTest.java +++ b/library/src/test/java/com/alibaba/dcm/internal/IpParserUtilTest.java @@ -63,7 +63,7 @@ public void test_ip2ByteArray_ipv4_exception() throws Exception { @Test public void test_ip2ByteArray_ipv6_exception() throws Exception { - // ipv4 with char + // ipv6 with char try { IpParserUtil.ip2ByteArray("2404:6800:4005:80a:0:0:0:200z"); fail(); @@ -71,7 +71,7 @@ public void test_ip2ByteArray_ipv6_exception() throws Exception { expected.printStackTrace(); } - // ipv4_minus + // ipv6 minus try { IpParserUtil.ip2ByteArray("-2404:6800:4005:80a:0:0:0:200e"); fail(); @@ -79,7 +79,7 @@ public void test_ip2ByteArray_ipv6_exception() throws Exception { expected.printStackTrace(); } - // ipv4 too long + // ipv6 too long try { IpParserUtil.ip2ByteArray("2404:6800:4005:80a:0:0:0:200:123"); fail(); diff --git a/tool/README.md b/tool/README.md index 1870ef98..f2cfb830 100644 --- a/tool/README.md +++ b/tool/README.md @@ -26,7 +26,7 @@ Java Dns Cache Manipulator Tool 下载 ---------- -在[项目Release页面](https://github.com/alibaba/java-dns-cache-manipulator/releases)下载文件`dcm-tool-x.x.x.tar.gz`。 +在[项目Release页面](https://github.com/alibaba/java-dns-cache-manipulator/releases)下载文件`dcm-x.x.x.tar.gz`。 解压后，运行`bin`目录下的`dcm`脚本（`Shell脚本`）。 From 97722c05036a122e05584d89a49748ea7b7f51a8 Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Sun, 6 Sep 2015 00:48:18 +0800 Subject: [PATCH 4/4] update dependency --- README.md | 2 +- library/README.md | 2 +- library/pom.xml | 12 ++++++++++-- library/versioneye.properties | 3 +++ pom.xml | 15 ++++++++++++++- tool/README.md | 2 +- tool/pom.xml | 14 +++++++++++--- tool/versioneye.properties | 3 +++ versioneye.properties | 3 +++ 9 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 library/versioneye.properties create mode 100644 tool/versioneye.properties create mode 100644 versioneye.properties diff --git a/README.md b/README.md index ee83c6dd..9151fe15 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Java Dns Cache Manipulator(DCM) [![Coverage Status](https://coveralls.io/repos/alibaba/java-dns-cache-manipulator/badge.svg?branch=master)](https://coveralls.io/r/alibaba/java-dns-cache-manipulator?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.alibaba/dns-cache-manipulator/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.alibaba/dns-cache-manipulator/) [![GitHub release](https://img.shields.io/github/release/alibaba/java-dns-cache-manipulator.svg)](https://github.com/alibaba/java-dns-cache-manipulator/releases) -[![Dependency Status](https://www.versioneye.com/user/projects/553a2f981d2989f7ee0000a7/badge.svg?style=flat)](https://www.versioneye.com/user/projects/553a2f981d2989f7ee0000a7) +[![Dependency Status](https://www.versioneye.com/user/projects/55eb1377a65c8c000e044a1c/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55eb1377a65c8c000e044a1c) [![GitHub issues](https://img.shields.io/github/issues/alibaba/java-dns-cache-manipulator.svg)](https://github.com/alibaba/java-dns-cache-manipulator/issues) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) diff --git a/library/README.md b/library/README.md index 6fadd9ff..38b75205 100644 --- a/library/README.md +++ b/library/README.md @@ -6,7 +6,7 @@ Java Dns Cache Manipulator(DCM) Library [![Coverage Status](https://coveralls.io/repos/alibaba/java-dns-cache-manipulator/badge.svg?branch=master)](https://coveralls.io/r/alibaba/java-dns-cache-manipulator?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.alibaba/dns-cache-manipulator/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.alibaba/dns-cache-manipulator/) [![GitHub release](https://img.shields.io/github/release/alibaba/java-dns-cache-manipulator.svg)](https://github.com/alibaba/java-dns-cache-manipulator/releases) -[![Dependency Status](https://www.versioneye.com/user/projects/553a2f981d2989f7ee0000a7/badge.svg?style=flat)](https://www.versioneye.com/user/projects/553a2f981d2989f7ee0000a7) +[![Dependency Status](https://www.versioneye.com/user/projects/55eb1371a65c8c000e0449d3/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55eb1371a65c8c000e0449d3) [![GitHub issues](https://img.shields.io/github/issues/alibaba/java-dns-cache-manipulator.svg)](https://github.com/alibaba/java-dns-cache-manipulator/issues) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) diff --git a/library/pom.xml b/library/pom.xml index 9dd1ac20..977d81a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -111,7 +111,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.5 + 1.6.6 true ossrh @@ -119,6 +119,14 @@ true + + com.versioneye + versioneye-maven-plugin + 3.5.1 + + ${basedir}/versioneye.properties + + @@ -145,7 +153,7 @@ org.eluder.coveralls coveralls-maven-plugin - 3.1.0 + 4.0.0 diff --git a/library/versioneye.properties b/library/versioneye.properties new file mode 100644 index 00000000..93cf6263 --- /dev/null +++ b/library/versioneye.properties @@ -0,0 +1,3 @@ +# Properties for http://www.VersionEye.com +#Sun Sep 06 00:08:18 CST 2015 +project_id=55eb1371a65c8c000e0449d3 diff --git a/pom.xml b/pom.xml index 14583caf..b7ec718e 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,19 @@ UTF-8 + + + + com.versioneye + versioneye-maven-plugin + 3.5.1 + + ${basedir}/versioneye.properties + + + + + travis @@ -63,7 +76,7 @@ org.eluder.coveralls coveralls-maven-plugin - 3.1.0 + 4.0.0 diff --git a/tool/README.md b/tool/README.md index f2cfb830..b5bb4dd5 100644 --- a/tool/README.md +++ b/tool/README.md @@ -5,7 +5,7 @@ Java Dns Cache Manipulator Tool [![Windows Build Status](https://img.shields.io/appveyor/ci/oldratlee/java-dns-cache-manipulator/master.svg?label=windows%20build)](https://ci.appveyor.com/project/oldratlee/java-dns-cache-manipulator) [![Coverage Status](https://coveralls.io/repos/alibaba/java-dns-cache-manipulator/badge.svg?branch=master)](https://coveralls.io/r/alibaba/java-dns-cache-manipulator?branch=master) [![GitHub release](https://img.shields.io/github/release/alibaba/java-dns-cache-manipulator.svg)](https://github.com/alibaba/java-dns-cache-manipulator/releases) -[![Dependency Status](https://www.versioneye.com/user/projects/553a2f981d2989f7ee0000a7/badge.svg?style=flat)](https://www.versioneye.com/user/projects/553a2f981d2989f7ee0000a7) +[![Dependency Status](https://www.versioneye.com/user/projects/55eb1374a65c8c000e0449fb/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55eb1374a65c8c000e0449fb) [![GitHub issues](https://img.shields.io/github/issues/alibaba/java-dns-cache-manipulator.svg)](https://github.com/alibaba/java-dns-cache-manipulator/issues) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) diff --git a/tool/pom.xml b/tool/pom.xml index 87af95af..f080bde4 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -26,7 +26,7 @@ commons-cli commons-cli - 1.3 + 1.3.1 commons-io @@ -80,7 +80,7 @@ maven-assembly-plugin - 2.5.4 + 2.5.5 dcm-${project.version} false @@ -100,6 +100,14 @@ + + com.versioneye + versioneye-maven-plugin + 3.5.1 + + ${basedir}/versioneye.properties + + @@ -127,7 +135,7 @@ org.eluder.coveralls coveralls-maven-plugin - 3.1.0 + 4.0.0 diff --git a/tool/versioneye.properties b/tool/versioneye.properties new file mode 100644 index 00000000..a76c552e --- /dev/null +++ b/tool/versioneye.properties @@ -0,0 +1,3 @@ +# Properties for http://www.VersionEye.com +#Sun Sep 06 00:08:18 CST 2015 +project_id=55eb1374a65c8c000e0449fb diff --git a/versioneye.properties b/versioneye.properties new file mode 100644 index 00000000..cd0deede --- /dev/null +++ b/versioneye.properties @@ -0,0 +1,3 @@ +# Properties for http://www.VersionEye.com +#Sun Sep 06 00:08:18 CST 2015 +project_id=55eb1377a65c8c000e044a1c