From 8a055f18e61572b9eb24e2e944d21eec13f208aa Mon Sep 17 00:00:00 2001 From: "yin.shunlin" Date: Thu, 9 Mar 2017 15:50:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?springboot=E9=A1=B9=E7=9B=AE=E9=9B=86?= =?UTF-8?q?=E6=88=90=EF=BC=9A=20com.paypal.springboot.resteasy-spring-boot?= =?UTF-8?q?-starter=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=20=E4=B8=8Edisconf?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=8C=85=E5=86=B2=E7=AA=81=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E6=AD=A4=E5=B0=86=E5=8C=85=20org.reflections.reflections?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E4=BB=8E0.9.9-RC1=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=88=B00.9.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- disconf-client/README.md | 5 +++++ disconf-client/pom.xml | 2 +- .../inner/statically/strategy/impl/ReflectionScanStatic.java | 2 +- .../baidu/disconf/client/support/utils/ScanPrinterUtils.java | 5 ++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/disconf-client/README.md b/disconf-client/README.md index edc3ffed2..a61cd693a 100644 --- a/disconf-client/README.md +++ b/disconf-client/README.md @@ -3,4 +3,9 @@ disconf-client 分布式配置管理客户端模块 +springboot项目集成： +com.paypal.springboot.resteasy-spring-boot-starter的时候， +与disconf发生包冲突，因此将包 +org.reflections.reflections的版本从0.9.9-RC1升级到0.9.10 + diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml index 524931042..4e240dea2 100644 --- a/disconf-client/pom.xml +++ b/disconf-client/pom.xml @@ -77,7 +77,7 @@ org.reflections reflections - 0.9.9-RC1 + 0.9.10 diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/scan/inner/statically/strategy/impl/ReflectionScanStatic.java b/disconf-client/src/main/java/com/baidu/disconf/client/scan/inner/statically/strategy/impl/ReflectionScanStatic.java index 8e0b124f4..584883847 100644 --- a/disconf-client/src/main/java/com/baidu/disconf/client/scan/inner/statically/strategy/impl/ReflectionScanStatic.java +++ b/disconf-client/src/main/java/com/baidu/disconf/client/scan/inner/statically/strategy/impl/ReflectionScanStatic.java @@ -81,7 +81,7 @@ private Reflections getReflection(List packNameList) { // Collection urlTotals = new ArrayList(); for (String packName : packNameList) { - Set urls = ClasspathHelper.forPackage(packName); + Collection urls = ClasspathHelper.forPackage(packName); urlTotals.addAll(urls); } diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/support/utils/ScanPrinterUtils.java b/disconf-client/src/main/java/com/baidu/disconf/client/support/utils/ScanPrinterUtils.java index 051e60b2f..59e359950 100644 --- a/disconf-client/src/main/java/com/baidu/disconf/client/support/utils/ScanPrinterUtils.java +++ b/disconf-client/src/main/java/com/baidu/disconf/client/support/utils/ScanPrinterUtils.java @@ -33,13 +33,12 @@ public static void printStoreMap(Reflections reflections) { LOGGER.info("Now we will print store map......"); Store store = reflections.getStore(); - Map> storeMap = store.getStoreMap(); - for (String indexName : storeMap.keySet()) { + for (String indexName : store.keySet()) { LOGGER.info("===================================="); LOGGER.info("indexName:" + indexName); - Multimap multimap = storeMap.get(indexName); + Multimap multimap = store.get(indexName); for (String firstName : multimap.keySet()) { Collection lastNames = multimap.get(firstName); From 01a0322ef2b749f8713b97c991e14fde2558bb77 Mon Sep 17 00:00:00 2001 From: "yin.shunlin" Date: Fri, 10 Mar 2017 12:51:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A7=81=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- disconf-client/pom.xml | 512 ++++++++++++++--------------------------- disconf-core/pom.xml | 169 +------------- pom.xml | 281 +--------------------- 3 files changed, 194 insertions(+), 768 deletions(-) diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml index 4e240dea2..2662f7ebc 100644 --- a/disconf-client/pom.xml +++ b/disconf-client/pom.xml @@ -1,337 +1,177 @@ - - - - 4.0.0 - disconf-client - jar - ${disconf-client.version} - - - com.baidu.disconf - disconf-base - 2.6.36 - - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - - - - com.baidu.disconf - disconf-core - ${disconf-core.version} - - - - com.baidu.disconf - disconf-core - ${disconf-core.version} - test-jar - test - - - - - - org.apache.zookeeper - zookeeper - - - com.sun.jmx - jmxri - - - com.sun.jdmk - jmxtools - - - javax.jms - jms - - - - - - commons-io - commons-io - - - - com.google.code.gson - gson - - - - org.apache.commons - commons-lang3 - - - - org.reflections - reflections - 0.9.10 - - - - com.google.guava - guava - - - - org.aspectj - aspectjtools - - - - - - ch.qos.logback - logback-core - provided - - - - ch.qos.logback - logback-classic - provided - - - - org.slf4j - slf4j-api - provided - - - - - - com.googlecode.jmockit - jmockit - test - - - - com.googlecode.jmockit - jmockit-coverage - test - - - - com.github.tomakehurst - wiremock - test - - standalone - - - - junit - junit - test - - - - org.springframework - spring-test - test - - - - - - org.springframework - spring-context - provided - - - - org.springframework - spring-beans - provided - - - - org.springframework - spring-core - provided - - - - org.springframework - spring-aop - provided - - - - - - - package - ${project.artifactId} - target/classes - - - - ${project.basedir}/src/main/java - - **/*.java - - - - ${project.basedir}/src/main/resources - - *.* - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${source.version} - ${target.version} - ${encoding} - true - true - true - - - ${java.home}/lib/rt.jar - - - - - - org.codehaus.plexus - plexus-compiler-javac - 1.8.1 - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - *.properties - **/*.properties - conf/** - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - - make-jar - package - - single - - - false - - deploy/package-jar.xml - - - - - - - - - disconf-client - https://github.com/knightliao/disconf/tree/master/disconf-client - https://github.com/knightliao/disconf/tree/master/disconf-client - - - Baidu - http://www.example.com - - - - scm:git:git@github.com:knightliao/disconf - scm:git:git@github.com:knightliao/disconf - disconf-client - - - - - release - - - nexus-release - https://oss.sonatype.org/content/repositories/snapshots/ - - - nexus-release - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - package - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - - + + + + 4.0.0 + disconf-client + jar + ${disconf-client.version} + + disconf-client + + + com.baidu.disconf + disconf-base + 2.6.36 + + + + + + com.baidu.disconf + disconf-core + ${disconf-core.version} + + + + com.baidu.disconf + disconf-core + ${disconf-core.version} + test-jar + test + + + + + + org.apache.zookeeper + zookeeper + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + + commons-io + commons-io + + + + com.google.code.gson + gson + + + + org.apache.commons + commons-lang3 + + + + org.reflections + reflections + 0.9.10 + + + + com.google.guava + guava + + + + org.aspectj + aspectjtools + + + + + + ch.qos.logback + logback-core + provided + + + + ch.qos.logback + logback-classic + provided + + + + org.slf4j + slf4j-api + provided + + + + + + com.googlecode.jmockit + jmockit + test + + + + com.googlecode.jmockit + jmockit-coverage + test + + + + com.github.tomakehurst + wiremock + test + + standalone + + + + junit + junit + test + + + + org.springframework + spring-test + test + + + + + + org.springframework + spring-context + provided + + + + org.springframework + spring-beans + provided + + + + org.springframework + spring-core + provided + + + + org.springframework + spring-aop + provided + + + + + + + + 9now + http://nexus.mwbyd.cn/nexus/content/repositories/jichu-snapshots/ + + + \ No newline at end of file diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml index 39145c935..d367e354b 100644 --- a/disconf-core/pom.xml +++ b/disconf-core/pom.xml @@ -16,15 +16,6 @@ 2.6.36 - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - @@ -131,160 +122,12 @@ - - - package - ${project.artifactId} - target/classes - - - - ${project.basedir}/src/main/java - - **/*.java - - - - ${project.basedir}/src/main/resources - - *.* - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${source.version} - ${target.version} - ${encoding} - true - true - true - - - ${java.home}/lib/rt.jar - - - - - - org.codehaus.plexus - plexus-compiler-javac - 1.8.1 - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - *.conf - **/*.*.conf - logback.xml - - - - - - - *.conf - **/*.*.conf - *.properties - logback.xml - - - - - - - - https://github.com/knightliao/disconf/tree/master/disconf-core - https://github.com/knightliao/disconf/tree/master/disconf-core - - - Baidu - http://www.example.com - - - - scm:git:git@github.com:knightliao/disconf - scm:git:git@github.com:knightliao/disconf - disconf-core - + + + 9now + http://nexus.mwbyd.cn/nexus/content/repositories/jichu-snapshots/ + + - - - release - - - nexus-release - https://oss.sonatype.org/content/repositories/snapshots/ - - - nexus-release - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - package - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - diff --git a/pom.xml b/pom.xml index fc62fef0f..57eafde0c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,22 +7,14 @@ disconf-base 2.6.36 pom + + disconf disconf-client disconf-core - 2015 - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - 2.6.36 @@ -524,264 +516,15 @@ - - - - - - - ${project.basedir}/src/main/java - - **/*.java - - - - ${project.basedir}/src/main/resources - - **/*.* - - - - - disconf-base - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - - xml - html - - true - - - **/*Proto.class - **/*Proto$*.class - **/*Test.class - **/*Controller.class - **/*Vo.class - **/*Form.class - - - - - - package - - cobertura - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.1 - - ${source.version} - ${target.version} - ${encoding} - true - true - true - - - ${java.home}/lib/rt.jar - - - - - - org.codehaus.plexus - plexus-compiler-javac - 1.8.1 - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - ${project.basedir}/src/main/webapp/WEB-INF/web.xml - - - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.10 - - - - org.apache.tomcat.maven - tomcat6-maven-plugin - 2.0 - - - - - org.codehaus.cargo - cargo-maven2-plugin - 1.2.0 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - -Dfile.encoding=UTF-8 - - **/*TestCase.java - - - **/*ServiceTest.java - **/TempDaoTest.java - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 3.1.0 - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - - - Liao Qiqi - knightliao - knightliao@gmail.com - - Developer - - +8 - - - - - KNIGHT - http://www.liaoqiqi.com - - - - scm:git:git@github.com:knightliao/disconf - scm:git:git@github.com:knightliao/disconf - disconf-base - - - https://github.com/knightliao/disconf - disconf - Distributed Configuration Management Platform. - - - - release - - - nexus-release - https://oss.sonatype.org/content/repositories/snapshots/ - - - nexus-release - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - package - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - + + disconf-base + + + + + 9now + http://nexus.mwbyd.cn/nexus/content/repositories/jichu-snapshots/ + + \ No newline at end of file From 473c4444112e019522732d6a73db6446843abedc Mon Sep 17 00:00:00 2001 From: "yin.shunlin" Date: Fri, 10 Mar 2017 12:54:32 +0800 Subject: [PATCH 3/4] jdk1.8 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 57eafde0c..1ec72b931 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,9 @@ UTF-8 - 1.6 - 1.6 - 1.6 + 1.8 + 1.8 + 1.8 4.1.7.RELEASE 1.4.5.RELEASE 4.10 From 5f5c7de96ac667b1a0467910ae22044201ad710c Mon Sep 17 00:00:00 2001 From: "yin.shunlin" Date: Fri, 10 Mar 2017 15:13:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=81=A2=E5=A4=8Dpom=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- disconf-client/pom.xml | 178 +++++++++++++++++++++++-- disconf-core/pom.xml | 171 +++++++++++++++++++++++- pom.xml | 287 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 605 insertions(+), 31 deletions(-) diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml index 2662f7ebc..cc41810b3 100644 --- a/disconf-client/pom.xml +++ b/disconf-client/pom.xml @@ -6,8 +6,6 @@ disconf-client jar ${disconf-client.version} - - disconf-client com.baidu.disconf @@ -15,6 +13,15 @@ 2.6.36 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + @@ -121,7 +128,7 @@ com.github.tomakehurst wiremock test - standalone @@ -166,12 +173,165 @@ + + + package + ${project.artifactId} + target/classes + + + + ${project.basedir}/src/main/java + + **/*.java + + + + ${project.basedir}/src/main/resources + + *.* + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${source.version} + ${target.version} + ${encoding} + true + true + true + + + ${java.home}/lib/rt.jar + + + + + + org.codehaus.plexus + plexus-compiler-javac + 1.8.1 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + *.properties + **/*.properties + conf/** + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + + + + make-jar + package + + single + + + false + + deploy/package-jar.xml + + + + + + + - - - 9now - http://nexus.mwbyd.cn/nexus/content/repositories/jichu-snapshots/ - - + disconf-client + https://github.com/knightliao/disconf/tree/master/disconf-client + https://github.com/knightliao/disconf/tree/master/disconf-client + + + Baidu + http://www.example.com + + + + scm:git:git@github.com:knightliao/disconf + scm:git:git@github.com:knightliao/disconf + disconf-client + + + + + release + + + nexus-release + https://oss.sonatype.org/content/repositories/snapshots/ + + + nexus-release + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + package + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + \ No newline at end of file diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml index d367e354b..155222a6e 100644 --- a/disconf-core/pom.xml +++ b/disconf-core/pom.xml @@ -16,6 +16,15 @@ 2.6.36 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + @@ -115,19 +124,167 @@ com.github.tomakehurst wiremock test - standalone - - - 9now - http://nexus.mwbyd.cn/nexus/content/repositories/jichu-snapshots/ - - + + + package + ${project.artifactId} + target/classes + + + + ${project.basedir}/src/main/java + + **/*.java + + + + ${project.basedir}/src/main/resources + + *.* + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${source.version} + ${target.version} + ${encoding} + true + true + true + + + ${java.home}/lib/rt.jar + + + + + + org.codehaus.plexus + plexus-compiler-javac + 1.8.1 + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + *.conf + **/*.*.conf + logback.xml + + + + + + + *.conf + **/*.*.conf + *.properties + logback.xml + + + + + + + + https://github.com/knightliao/disconf/tree/master/disconf-core + https://github.com/knightliao/disconf/tree/master/disconf-core + + + Baidu + http://www.example.com + + + + scm:git:git@github.com:knightliao/disconf + scm:git:git@github.com:knightliao/disconf + disconf-core + + + + release + + + nexus-release + https://oss.sonatype.org/content/repositories/snapshots/ + + + nexus-release + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + package + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + diff --git a/pom.xml b/pom.xml index 1ec72b931..fc62fef0f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,14 +7,22 @@ disconf-base 2.6.36 pom - - disconf disconf-client disconf-core + 2015 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + 2.6.36 @@ -27,9 +35,9 @@ UTF-8 - 1.8 - 1.8 - 1.8 + 1.6 + 1.6 + 1.6 4.1.7.RELEASE 1.4.5.RELEASE 4.10 @@ -516,15 +524,264 @@ - - disconf-base - - - - - 9now - http://nexus.mwbyd.cn/nexus/content/repositories/jichu-snapshots/ - - + + + + + + + ${project.basedir}/src/main/java + + **/*.java + + + + ${project.basedir}/src/main/resources + + **/*.* + + + + + disconf-base + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + + xml + html + + true + + + **/*Proto.class + **/*Proto$*.class + **/*Test.class + **/*Controller.class + **/*Vo.class + **/*Form.class + + + + + + package + + cobertura + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.1 + + ${source.version} + ${target.version} + ${encoding} + true + true + true + + + ${java.home}/lib/rt.jar + + + + + + org.codehaus.plexus + plexus-compiler-javac + 1.8.1 + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + ${project.basedir}/src/main/webapp/WEB-INF/web.xml + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.10 + + + + org.apache.tomcat.maven + tomcat6-maven-plugin + 2.0 + + + + + org.codehaus.cargo + cargo-maven2-plugin + 1.2.0 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + -Dfile.encoding=UTF-8 + + **/*TestCase.java + + + **/*ServiceTest.java + **/TempDaoTest.java + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + + org.eluder.coveralls + coveralls-maven-plugin + 3.1.0 + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + + + Liao Qiqi + knightliao + knightliao@gmail.com + + Developer + + +8 + + + + + KNIGHT + http://www.liaoqiqi.com + + + + scm:git:git@github.com:knightliao/disconf + scm:git:git@github.com:knightliao/disconf + disconf-base + + + https://github.com/knightliao/disconf + disconf + Distributed Configuration Management Platform. + + + + release + + + nexus-release + https://oss.sonatype.org/content/repositories/snapshots/ + + + nexus-release + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + package + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + \ No newline at end of file