From 4f9e56b640d23264ca7f046ac5dc731b4d3a2e64 Mon Sep 17 00:00:00 2001 From: zhuyong Date: Wed, 15 Aug 2018 15:34:02 +0800 Subject: [PATCH 1/4] fix ut, #2227 --- .../test/java/com/alibaba/dubbo/config/RegistryConfigTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/RegistryConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/RegistryConfigTest.java index 1d9bbe2038f..086a4fa589f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/RegistryConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/RegistryConfigTest.java @@ -69,6 +69,7 @@ public void testWait() throws Exception { registry.setWait(10); assertThat(registry.getWait(), is(10)); assertThat(System.getProperty(Constants.SHUTDOWN_WAIT_KEY), equalTo("10")); + System.clearProperty(Constants.SHUTDOWN_WAIT_KEY); } @Test From 2333020c8d1600f6ff8588e550a0f2f101e03ecd Mon Sep 17 00:00:00 2001 From: zhuyong Date: Wed, 15 Aug 2018 17:37:17 +0800 Subject: [PATCH 2/4] add cache for travis ci --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 529e7ff0477..f429f9e6341 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,12 @@ jdk: - oraclejdk8 - openjdk7 +cache: + directories: + - '$HOME/.m2/repository' + script: - - travis_wait 30 ./mvnw clean package + - travis_wait 30 ./mvnw test after_success: - bash <(curl -s https://codecov.io/bash) From 754b1c755e8ed90592fa06cb9c8cdec6a15f8ecf Mon Sep 17 00:00:00 2001 From: zhuyong Date: Wed, 15 Aug 2018 18:01:11 +0800 Subject: [PATCH 3/4] fix travis problem --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f429f9e6341..1dc0997a0a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,9 @@ cache: directories: - '$HOME/.m2/repository' +install: + - ./mvnw clean install -DskipTests=true -Dcheckstyle.skip=false -Dmaven.javadoc.skip=false -Drat.skip=false + script: - travis_wait 30 ./mvnw test From eb49e6e45456a3717f0e115db167fb5e91fbc726 Mon Sep 17 00:00:00 2001 From: zhuyong Date: Wed, 15 Aug 2018 18:14:16 +0800 Subject: [PATCH 4/4] skip javadoc --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1dc0997a0a8..d928330aa4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ cache: - '$HOME/.m2/repository' install: - - ./mvnw clean install -DskipTests=true -Dcheckstyle.skip=false -Dmaven.javadoc.skip=false -Drat.skip=false + - ./mvnw clean install -DskipTests=true -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true script: - travis_wait 30 ./mvnw test