This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a change to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from 4f34540 Manually merge pull request #1486, to make travis ci and
codecov work after apache incubator transition.
add ab8af67 Merge pull request from #1001, merge dubbox branch
add 20fff01 Upgrade serialization integration of kryo and fst
add f4dfc6e Revert modification of core dubbo RPC protocol
add 17aa99e Upgrade rest integration
add 0602317 Add apache license and remove author info
add c805904 Remove useless container integration
add cf3a54e Add test example for rest
add 12e4d1c Add service level `serialization` config
add 75ed5f5 Delete OptimizedSerialization
add e0a9cbf Adjust dependencies in pom.xml relating with rest
add 8ad8757 Upgrade netty4 version
add 739a61e Upgrade version to 2.6.0
add eae1367 Add version for resteasy dependency
add 5f02aa6 Degrade the resteasy and netty version for jdk1.7
compatibility.
add 7e59712 Fix typo
add 22bb9cb Fix typo of resteasy version in dubbo-maven
add 26f39d5 Refactor project structure using maven
add 9893bd6 Change module name
add da3783e Upgrade version to 2.6.1
add e62d3ff Remove classes related with "dubbo-monitor"
add 9871e6a Upgrade version to 2.6.1
add 4413886 Remove maven "provided" config in pom.xml of sub-modules
add ca11537 Remove dubbo-admin, why it appears?
add 926a719 Remove useless readme.md
add 7cfa205 Merge pull request from #1170, fix typo of SUFFIXES.
add 8031ba6 获取Serializer和Deserializer时，高并发情况下线程block (#1196)
add 4a5b189 Merge branch 'master' of https://github.com/alibaba/dubbo
add 5c3c29b recover -Xdoclint:none temperary
add 77f03a5 add javadoc.opts to adapt java7 and java 8
add 267292e Fixed #1186, change the default ZK client from `zkclient` to
`curator`
add 6160d3e Fixed #1226, enhance netty support for rest protocol
add 9cb9426 Add comment
add 09722e3 Remove unnecessary dependencies
add c7cd889 Merge pull request #1236, fix typo in FailbackRegistry.
add 8eb0d6f Remove useless dependencies
add 2108d8f Update README.md
add 74f7074 add dubbo-ops link
add 5b0ab11 remove hot symbol
add a4632da Merge branch '2.5.x'
add d1292c2 Add "source" configuration to JdkCompiler
add 2f7f91c Remove unnecessary transitive dependencies
add 9ca9bb0 Fix typo #1260
add daac568 Remove slf4j-log4j12 dependency
add 98c548a add config for travis ci fail when test case fail (#1264)
add 61d7178 Merge pull request #1333, remove unnecessary maven
wrapper(fixes #1167)
add 456edf1 [Dubbo-1284] Fix UT warning message when running on Java 9
(#1323)
add 720dff8 Merge pull request #1319, add unit test for jetty http binder
and tomcat http binder
add d388735 [Dubbo-1283] Ensure we can build Dubbo on Java 9 (#1345)
add d129f10 Collection.isEmpty() should be used to test for emptiness
(#1315)
add 61ba25b Merge pull request #1291, allow @Reference to support custom
annotations
add c56d192 Merge pull request #1249, channel.close() in netty4 is async,
so reconnect() don't connected
add 9c2e2fa add javadoc for setAttachments in order to clarify issue#1166
add 25dfe1c Merge pull request #912, reducing search times in
selectForKey(hash)
add 8b352ef update README
add 16bac78 Merge pull request #1353, fix oninvoke injection failure
add 2c20d99 fixed travis-ci failed because of test cases. (#1370)
add a582764 Merge pull request #1377, remove redundant arguments for
StatItem.isAllowable()
add 59ca32a Merge branch '2.5.x'
add fddedf6 Merge pull request #1378, replace StringBuider with simple
string concatenation in log.
add ddb677b Merge pull request #1375, remove unnecessary boxing.
add ace2f4f Merge pull request #1331, add optional parameter to support
hessian protocol method overload and request protocol version.
add c7197b0 Merge pull request #1376, do not instantiate load balance if
there is no invokers
add c7170d5 Merge pull request #1384, fix build string bug.
add b52879c Merge pull request #1040, refactor: replace some deprecated
methods related with jedis.
add 4bbc0dd Merge pull request #1242, remove redundant null check.
add d8f3dd3 Change Mailing list address
add 5d7b316 Fixed #1398, revert bugs introduced from #1375
add d7a78c3 Fix time unit problem in UT
add d47d22b Fix time unit problem related with FutureAdapter in UT
add 7faa3f0 Merge pull request #1391, fix typo of method name in qos
module.
add 84124c4 Merge branch '2.5.x' of https://github.com/alibaba/dubbo
add 91f9250 fix number type is lost in yaml config file (#1401)
add 8bd9e9d update readme to add some details (#1403)
add 3be23d9 update README format
add 0423219 #1411: Locale deserialize 'zh-hant_CN'
add 6dff137 Fix "promoteTransitiveDependencies=false" of
maven-shade-plugin
add 3d4f2fc Remove author info and add apache license
add d770d92 [Dubbo-#1362] cache provider always lru cache (#1396)
add b626432 clean up imports for CacheTest
add 4a5c5e2 Merge pull request #1389, refactor dubbo deployment process
add c94198b Fix UT problems after structure change
add 2308427 Add .script route rules back for UT
add 1f22f56 Add unit test for ExtensionLoader
add 6a5281e fix heartbeat spelling error (#1451)
add 5dd8ddc Fix typo (#1424)
add b9b1f15 Upgrade spring xsd version from 2.5 to 4.3
add 562a126 Merge pull request #15 from alibaba/master
add 926baab Merge remote-tracking branch 'upstream/master'
add 562ce4f Merge branch 'master' of https://github.com/mercyblitz/dubbo
add 3364f42 Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11
add bb4651e Merge upstream/2.5.x
add 8a0ce5e Polish alibaba/dubbo #1464
add 8681ad7 Update version to be 2.5.11
add c2ae82a Polish alibaba/dubbo #1277
add 51c29ba Test
add b5f7afe Merge remote-tracking branch 'origin/2.5.11' into 2.5.11
add a95b118 Polish alibaba/dubbo #1317
add 661ca74 Polish alibaba/dubbo #1317
add 6e38481 Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11
No new revisions were added by this update.
Summary of changes:
.mvn/wrapper/maven-wrapper.jar | Bin 47774 -> 0 bytes
.mvn/wrapper/maven-wrapper.properties | 1 -
dubbo-admin/pom.xml | 340 ++++-----
dubbo-admin/src/test/assembly/bin/setup.bat | 166 ++---
dubbo-cluster/pom.xml | 2 +-
dubbo-common/pom.xml | 2 +-
.../dubbo/common/serialize/Serialization.java | 136 ++--
.../support/dubbo/DubboSerialization.java | 90 +--
.../support/hessian/Hessian2Serialization.java | 94 +--
.../support/hessian/Hessian2SerializerFactory.java | 66 +-
.../support/java/CompactedJavaSerialization.java | 90 +--
.../serialize/support/java/JavaSerialization.java | 90 +--
.../support/json/FastJsonObjectInput.java | 270 +++----
.../support/json/FastJsonObjectOutput.java | 198 ++---
.../support/json/FastJsonSerialization.java | 96 +--
.../serialize/support/json/JsonObjectInput.java | 310 ++++----
.../serialize/support/json/JsonObjectOutput.java | 208 +++---
.../serialize/support/json/JsonSerialization.java | 98 +--
...om.alibaba.dubbo.common.serialize.Serialization | 10 +-
.../CompactedJavaSerializationTest.java | 48 +-
.../serialization/JavaSerializationTest.java | 48 +-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
.../AnnotationPropertyValuesAdapter.java | 92 +++
.../DubboConfigBindingBeanPostProcessor.java | 115 ++-
.../ReferenceAnnotationBeanPostProcessor.java | 161 ++++-
.../factory/annotation/ReferenceBeanBuilder.java | 26 +-
.../ServiceAnnotationBeanPostProcessor.java | 49 +-
.../annotation/DubboConfigBindingRegistrar.java | 64 +-
.../properties/AbstractDubboConfigBinder.java | 69 ++
.../properties/DefaultDubboConfigBinder.java | 46 ++
.../context/properties/DubboConfigBinder.java | 58 ++
.../converter/StringArrayToMapConverter.java | 24 +-
.../converter/StringArrayToStringConverter.java | 71 +-
.../dubbo/config/spring/util/AnnotationUtils.java | 89 +++
.../dubbo/config/spring/util/ObjectUtils.java | 22 +-
.../config/spring/util/PropertySourcesUtils.java | 18 +-
.../annotation/provider/AnnotationServiceImpl.java | 2 +-
.../AnnotationPropertyValuesAdapterTest.java | 158 ++++
.../DubboConfigBindingBeanPostProcessorTest.java | 66 ++
.../ReferenceAnnotationBeanPostProcessorTest.java | 95 ++-
.../ServiceAnnotationBeanPostProcessorTest.java | 3 +-
.../properties/DefaultDubboConfigBinderTest.java | 56 ++
.../converter/StringArrayToMapConverterTest.java | 37 +-
.../StringArrayToStringConverterTest.java | 29 +-
dubbo-config/pom.xml | 2 +-
dubbo-container/dubbo-container-api/pom.xml | 2 +-
.../com/alibaba/dubbo/container/page/Menu.java | 76 +-
.../dubbo/container/page/MenuComparator.java | 84 +--
.../com/alibaba/dubbo/container/page/Page.java | 162 ++---
.../alibaba/dubbo/container/page/PageHandler.java | 70 +-
.../alibaba/dubbo/container/page/PageServlet.java | 556 +++++++-------
.../dubbo/container/page/ResourceFilter.java | 300 ++++----
.../container/page/pages/HomePageHandler.java | 94 +--
.../dubbo/container/page/pages/LogPageHandler.java | 210 +++---
.../container/page/pages/StatusPageHandler.java | 166 ++---
.../container/page/pages/SystemPageHandler.java | 272 +++----
.../com.alibaba.dubbo.container.page.PageHandler | 6 +-
dubbo-container/dubbo-container-jetty/pom.xml | 76 +-
.../dubbo/container/jetty/JettyContainer.java | 176 ++---
.../dubbo/container/jetty/JettyContainerTest.java | 74 +-
dubbo-container/dubbo-container-log4j/pom.xml | 2 +-
dubbo-container/dubbo-container-logback/pom.xml | 2 +-
dubbo-container/dubbo-container-spring/pom.xml | 2 +-
dubbo-container/pom.xml | 2 +-
dubbo-demo/dubbo-demo-api/pom.xml | 2 +-
dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +-
dubbo-demo/dubbo-demo-provider/pom.xml | 2 +-
dubbo-demo/pom.xml | 2 +-
dubbo-filter/dubbo-filter-cache/pom.xml | 2 +-
dubbo-filter/dubbo-filter-validation/pom.xml | 2 +-
dubbo-filter/pom.xml | 2 +-
dubbo-maven/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-api/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +-
dubbo-monitor/pom.xml | 2 +-
dubbo-plugin/dubbo-qos/pom.xml | 2 +-
dubbo-plugin/pom.xml | 2 +-
dubbo-registry/dubbo-registry-api/pom.xml | 2 +-
.../registry/pages/RegisteredPageHandler.java | 156 ++--
.../registry/pages/RegistriesPageHandler.java | 140 ++--
.../registry/pages/SubscribedPageHandler.java | 156 ++--
.../com.alibaba.dubbo.container.page.PageHandler | 4 +-
dubbo-registry/dubbo-registry-default/pom.xml | 2 +-
dubbo-registry/dubbo-registry-multicast/pom.xml | 2 +-
dubbo-registry/dubbo-registry-redis/pom.xml | 2 +-
dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +-
dubbo-registry/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 2 +-
dubbo-remoting/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-default/pom.xml | 2 +-
.../dubbo/rpc/protocol/dubbo/DubboExporter.java | 90 +--
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 292 ++++----
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 162 ++---
.../dubbo/ReferenceCountExchangeClient.java | 344 ++++-----
.../rpc/protocol/dubbo/filter/FutureFilter.java | 410 +++++------
.../rpc/protocol/dubbo/filter/TraceFilter.java | 252 +++----
.../protocol/dubbo/page/ClientsPageHandler.java | 152 ++--
.../protocol/dubbo/page/ServersPageHandler.java | 108 +--
.../protocol/dubbo/status/ServerStatusChecker.java | 114 +--
.../dubbo/status/ThreadPoolStatusChecker.java | 138 ++--
.../protocol/dubbo/telnet/ChangeTelnetHandler.java | 126 ++--
.../protocol/dubbo/telnet/CountTelnetHandler.java | 328 ++++-----
.../dubbo/telnet/CurrentTelnetHandler.java | 88 +--
.../protocol/dubbo/telnet/InvokeTelnetHandler.java | 316 ++++----
.../protocol/dubbo/telnet/ListTelnetHandler.java | 196 ++---
.../protocol/dubbo/telnet/PortTelnetHandler.java | 184 ++---
.../protocol/dubbo/telnet/TraceTelnetHandler.java | 180 ++---
.../com.alibaba.dubbo.common.status.StatusChecker | 2 +-
.../com.alibaba.dubbo.container.page.PageHandler | 2 +-
...com.alibaba.dubbo.remoting.telnet.TelnetHandler | 12 +-
.../dubbo/internal/com.alibaba.dubbo.rpc.Filter | 2 +-
.../dubbo/rpc/protocol/dubbo/FutureFilterTest.java | 160 ++---
.../rpc/protocol/dubbo/support/NonSerialized.java | 48 +-
.../dubbo/rpc/protocol/dubbo/support/Person.java | 88 +--
.../rpc/protocol/dubbo/support/ProtocolUtils.java | 128 ++--
.../rpc/protocol/dubbo/support/RemoteService.java | 50 +-
.../dubbo/rpc/protocol/dubbo/support/Type.java | 40 +-
.../dubbo/telnet/ChangeTelnetHandlerTest.java | 238 +++---
.../dubbo/telnet/CurrentTelnetHandlerTest.java | 134 ++--
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 214 +++---
.../dubbo/telnet/ListTelnetHandlerTest.java | 336 ++++-----
.../dubbo/telnet/LogTelnetHandlerTest.java | 110 +--
.../dubbo/telnet/PortTelnetHandlerTest.java | 208 +++---
.../dubbo-rpc-default/src/test/resources/log4j.xml | 90 +--
dubbo-rpc/dubbo-rpc-hessian/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-rmi/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
dubbo-rpc/pom.xml | 2 +-
dubbo-simple/dubbo-monitor-simple/pom.xml | 360 +++++-----
.../src/main/assembly/assembly.xml | 78 +-
.../src/main/assembly/conf/dubbo.properties | 56 +-
.../alibaba/dubbo/monitor/simple/CountUtils.java | 184 ++---
.../dubbo/monitor/simple/RegistryContainer.java | 584 +++++++--------
.../dubbo/monitor/simple/SimpleMonitorService.java | 796 ++++++++++-----------
.../simple/pages/ApplicationsPageHandler.java | 162 ++---
.../monitor/simple/pages/ChartsPageHandler.java | 188 ++---
.../monitor/simple/pages/ConsumersPageHandler.java | 174 ++---
.../simple/pages/DependenciesPageHandler.java | 174 ++---
.../monitor/simple/pages/HostsPageHandler.java | 148 ++--
.../monitor/simple/pages/ProvidersPageHandler.java | 174 ++---
.../monitor/simple/pages/ServicesPageHandler.java | 142 ++--
.../simple/pages/StatisticsPageHandler.java | 332 ++++-----
.../simple/pages/UnregisterPageHandler.java | 98 +--
.../simple/pages/UnsubscribePageHandler.java | 128 ++--
.../com.alibaba.dubbo.container.page.PageHandler | 18 +-
.../META-INF/spring/dubbo-monitor-simple.xml | 80 +--
.../dubbo/monitor/simple/SimpleMonitor.java | 48 +-
.../monitor/simple/SimpleMonitorServiceTest.java | 66 +-
.../src/test/resources/dubbo.properties | 56 +-
.../src/test/resources/log4j.xml | 56 +-
dubbo-simple/dubbo-registry-simple/pom.xml | 168 ++---
.../src/main/assembly/assembly.xml | 78 +-
.../src/main/assembly/conf/dubbo.properties | 40 +-
.../registry/simple/SimpleRegistryService.java | 416 +++++------
.../META-INF/spring/dubbo-registry-simple.xml | 88 +--
.../dubbo/registry/simple/SimpleRegistry.java | 48 +-
.../registry/simple/SimpleRegistryServiceTest.java | 60 +-
.../src/test/resources/dubbo.properties | 40 +-
.../src/test/resources/log4j.xml | 56 +-
dubbo-simple/pom.xml | 72 +-
dubbo-test/dubbo-test-benchmark/pom.xml | 2 +-
.../src/test/backup/Dubbo.java | 128 ++--
.../client/DemoBenchmarkClientRunnable.java | 88 +--
.../dubbo-test-spring3/pom.xml | 2 +-
dubbo-test/dubbo-test-compatibility/pom.xml | 2 +-
dubbo-test/dubbo-test-examples/pom.xml | 2 +-
dubbo-test/dubbo-test-integration/pom.xml | 2 +-
dubbo-test/pom.xml | 2 +-
dubbo/pom.xml | 2 +-
hessian-lite/pom.xml | 2 +-
pom.xml | 3 +-
185 files changed, 9124 insertions(+), 8206 deletions(-)
delete mode 100755 .mvn/wrapper/maven-wrapper.jar
delete mode 100755 .mvn/wrapper/maven-wrapper.properties
create mode 100644
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java
create mode 100644
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/AbstractDubboConfigBinder.java
create mode 100644
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinder.java
create mode 100644
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DubboConfigBinder.java
copy
dubbo-admin/src/main/java/com/alibaba/dubbo/governance/web/util/ContextUtil.java
=>
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverter.java
(58%)
copy
dubbo-registry/dubbo-registry-redis/src/main/java/com/alibaba/dubbo/registry/redis/RedisRegistryFactory.java
=>
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverter.java
(59%)
create mode 100644
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/AnnotationUtils.java
copy
dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java
=>
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/ObjectUtils.java
(75%)
create mode 100644
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
create mode 100644
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java
create mode 100644
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
copy
dubbo-admin/src/test/java/com/alibaba/dubbo/registry/common/domain/PageListTest.java
=>
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java
(54%)
copy
dubbo-admin/src/test/java/com/alibaba/dubbo/registry/common/domain/PageListTest.java
=>
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java
(61%)
--
To stop receiving notification emails like this one, please contact
mercybl...@apache.org.
