This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 5cc52891e372865192b1cb4e9e96c58abb831ae0 Author: asifdxtreme <[email protected]> AuthorDate: Fri Mar 2 15:32:06 2018 +0530 Fix Java Doc Issues --- .travis.yml | 5 ----- .../java/org/apache/servicecomb/core/Transport.java | 6 +++--- .../core/definition/loader/DynamicSchemaLoader.java | 2 +- .../core/definition/loader/SchemaLoader.java | 2 +- .../core/endpoint/AbstractEndpointsCache.java | 2 +- .../core/invocation/InvocationFactory.java | 6 +++--- .../core/transport/AbstractTransport.java | 4 ++-- gpg-sec.tar.enc | Bin 10256 -> 10256 bytes scripts/travis.sh | 2 +- 9 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6865418..bcad90f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,3 @@ jobs: - stage: Deploy on script: if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then bash scripts/travis.sh deploy; fi -env: - global: - - secure: FGssl6U+/y+8wf901cNNaokvdBxRHmfLPjuOkcmlgTth2jBcfC84b5Ny8F1bCHZAVaBdxFDeP6BDu073G6D21lUMJW2QPWr+gHjy6BFyYMR6fWiUK55Y/vhz0+vdwFZDDixG2Bp3R5mkQW44JkbjBaT6ZwVfJ7YAGimJFYyrPLkeBPrctETYBJorxohW9GxNI4kI1Q+RodQixUFbEHHRJ1GZ2UXLDP+Z01S2W+dAE6LtT2NOZ5u41iJLYEnwqTyvQZCPopiE+gVDJnuOr+qAMuYp8tL25vtSjCPR34qACf7/VU5Q2HFCQJz/0u511Yx49R3gQfGHw7nWjPKXbxWZJRRihJmzmaWlKvRUhgOEseRKZn50XObiu80P8c3Noi+RFYvFRJD6KoMM5SAeHd9ogFXoEyhOxJ4d1mPZG+Yk3ieVou2+cRVGy36ntIsLEXlSySoByFHM8BryINV+pPEyQoQ/9RaUUvTo [...] - - secure: iI3t+xAcV64LjdEKpqprieanLKXe7rGNsLT1haebS9TWNyBwJTeIjjwBNVqCrwLKDPvBifpLv03MtxqW9+oP1H+hJs598OnWDy3dmHGF09f38EXO4k27vMUQTVuWF+FajJucC95sZCB9WC2EUJB95P8z5sbFVVfzVjySSD3S32fr5cxqzhhANK2SfB/WVbAsoSJcXsCZ2o/iScjDVxBpFdd2UcxwAiym7UJMrVAYbYYVEb6/UxjZKiBUf7CKSGctGqCDjwMJvEwJJWrQcegMnJskBp7CGhrfXnhoTdLMfV+xDXxKB++qe9L1L65kleBurztKAXArgmCjlBs4BdAoSX2yFAxalz2OroEzFfuwOX34Sgk+0oeBKbsPz5MYWpaAiuKqjzaNRK8VyrvpgvmVGKXRJJbqJehBAXUzuBLcAiiyNtObWlicP0uHU/R1sMEbY4rmHsp1lnF0KZbg3e7tyrzAOyDo0pCg [...] - - secure: J4hqOOaV2rSGPE7GMU69O+o7Wbjz1L4w6rkaSgqJO1YFCubsUY2/lcYoNNrrNRvqywiRr5p6by2bOmosbi1AgHoFpWxVjDeXTVyDOjO0shc/FrS1lYVSUicFlHILNiRNLoOENB0NGmlLLzBNaicpwiBx1MGn1kIS3sMx+KJzcafFQdHTjO2wxetIKAgRR4vsA5wX3cie9HIzg2t5sjsxt0ndJp11f0WqHYbXckyp9ijRokAzRhO44c8POfoWy9vz047U95Ut+pmtZeR5tPDiEGPlwzeAXrXkZZeu7hRrtk/ix+YkGCReLMwqwpmgU8rkk5OK4I3J27EnPbk6nQSVuTpJPE2yOGYGNfjTvM+SUfGxCS5rlZm5cysy+FvbzNKumMXZKF8N16gjw3I03sl4eN6AVfQKF1lw6S4HPuRvM33fh4+lrp6JtMqDjOKsI66F43tnCZGHgTlv0t1u2E9Fth1QVhhTyIo/ [...] diff --git a/core/src/main/java/org/apache/servicecomb/core/Transport.java b/core/src/main/java/org/apache/servicecomb/core/Transport.java index 895cce8..ed9ade4 100644 --- a/core/src/main/java/org/apache/servicecomb/core/Transport.java +++ b/core/src/main/java/org/apache/servicecomb/core/Transport.java @@ -33,17 +33,17 @@ public interface Transport { boolean init() throws Exception; - /** + /* * endpoint的格式为 URI，比如rest://192.168.1.1:8080 */ Object parseAddress(String endpoint); - /** + /* * 本transport的监听地址 */ Endpoint getEndpoint(); - /** + /* * 用于上报到服务中心，要求是其他节点可访问的地址 */ Endpoint getPublishEndpoint() throws Exception; diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/loader/DynamicSchemaLoader.java b/core/src/main/java/org/apache/servicecomb/core/definition/loader/DynamicSchemaLoader.java index 9bf1e12..2e782ed 100644 --- a/core/src/main/java/org/apache/servicecomb/core/definition/loader/DynamicSchemaLoader.java +++ b/core/src/main/java/org/apache/servicecomb/core/definition/loader/DynamicSchemaLoader.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; -/** +/* * 场景： * 1.consumer * 网管调用产品 diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/loader/SchemaLoader.java b/core/src/main/java/org/apache/servicecomb/core/definition/loader/SchemaLoader.java index 8e5f0a4..29b03da 100644 --- a/core/src/main/java/org/apache/servicecomb/core/definition/loader/SchemaLoader.java +++ b/core/src/main/java/org/apache/servicecomb/core/definition/loader/SchemaLoader.java @@ -53,7 +53,7 @@ public class SchemaLoader { this.microserviceMetaManager = microserviceMetaManager; } - /** + /* * resource的路径格式，至少是以这个形式结尾：schemaId.yaml */ public SchemaMeta registerSchema(String microserviceName, Resource resource) { diff --git a/core/src/main/java/org/apache/servicecomb/core/endpoint/AbstractEndpointsCache.java b/core/src/main/java/org/apache/servicecomb/core/endpoint/AbstractEndpointsCache.java index 9402d33..8501013 100644 --- a/core/src/main/java/org/apache/servicecomb/core/endpoint/AbstractEndpointsCache.java +++ b/core/src/main/java/org/apache/servicecomb/core/endpoint/AbstractEndpointsCache.java @@ -50,7 +50,7 @@ public abstract class AbstractEndpointsCache<ENDPOINT> { AbstractEndpointsCache.transportManager = transportManager; } - /** + /* * transportName 可能为""，表示走任意健康的地址即可 */ public AbstractEndpointsCache(String appId, String microserviceName, String microserviceVersionRule, diff --git a/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationFactory.java b/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationFactory.java index 302c6d9..8410d93 100644 --- a/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationFactory.java +++ b/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationFactory.java @@ -43,7 +43,7 @@ public final class InvocationFactory { return invocation; } - /** + /* * consumer端使用，schemaMeta级别的缓存，每次调用根据operationName来执行 */ public static Invocation forConsumer(ReferenceConfig referenceConfig, SchemaMeta schemaMeta, String operationName, @@ -52,7 +52,7 @@ public final class InvocationFactory { return forConsumer(referenceConfig, operationMeta, swaggerArguments); } - /** + /* * 为tcc场景提供的快捷方式,consumer端使用 */ public static Invocation forConsumer(ReferenceConfig referenceConfig, String operationQualifiedName, @@ -62,7 +62,7 @@ public final class InvocationFactory { return forConsumer(referenceConfig, operationMeta, swaggerArguments); } - /** + /* * transport server收到请求时，创建invocation */ public static Invocation forProvider(Endpoint endpoint, diff --git a/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java index 3db4156..0ea9056 100644 --- a/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java +++ b/core/src/main/java/org/apache/servicecomb/core/transport/AbstractTransport.java @@ -46,7 +46,7 @@ import io.vertx.core.Vertx; public abstract class AbstractTransport implements Transport { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractTransport.class); - /** + /* * 用于参数传递：比如向RestServerVerticle传递endpoint地址。 */ public static final String ENDPOINT_KEY = "cse.endpoint"; @@ -86,7 +86,7 @@ public abstract class AbstractTransport implements Transport { setListenAddressWithoutSchema(addressWithoutSchema, null); } - /** + /* * 将配置的URI转换为endpoint * addressWithoutSchema 配置的URI，没有schema部分 */ diff --git a/gpg-sec.tar.enc b/gpg-sec.tar.enc index 2938087..2d4f786 100644 Binary files a/gpg-sec.tar.enc and b/gpg-sec.tar.enc differ diff --git a/scripts/travis.sh b/scripts/travis.sh index 3ec2022..77112a8 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -43,7 +43,7 @@ if [ "$1" == "install" ]; then else if [ "$TAGGEDCOMMIT" == "true" ]; then echo "Decrypting the key" - openssl aes-256-cbc -K $encrypted_c02fb37685d7_key -iv $encrypted_c02fb37685d7_iv -in gpg-sec.tar.enc -out gpg-sec.tar -d + openssl aes-256-cbc -K $encrypted_6d31958a1ad0_key -iv $encrypted_6d31958a1ad0_iv -in gpg-sec.tar.enc -out gpg-sec.tar -d tar xvf gpg-sec.tar echo "Deploying Staging Release" mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase --settings .travis.settings.xml -- To stop receiving notification emails like this one, please contact [email protected].
