This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit e629c3aa1f9f329c3183d3111939e27a3cf486be Author: yaohaishi <[email protected]> AuthorDate: Tue Sep 25 12:46:57 2018 +0800 [SCB-926] reduce CI log --- demo/demo-schema/src/main/resources/config/log4j.properties | 2 ++ .../src/test/resources/logback-test.xml | 2 ++ .../src/main/resources/logback-test.xml | 2 ++ .../src/test/resources/logback-test.xml | 2 ++ .../src/main/resources/config/log4j.properties | 7 ++----- .../src/main/resources/config/log4j.properties | 7 ++----- .../src/main/resources/config/log4j.properties | 7 ++----- .../src/main/resources/config/log4j.properties | 7 ++----- .../src/main/resources/config/log4j.properties | 7 ++----- .../src/main/resources/config/log4j.properties | 7 ++----- .../springmvc-client}/src/main/resources/config/log4j.properties | 7 ++----- .../springmvc-server}/src/main/resources/config/log4j.properties | 7 ++----- .../org/apache/servicecomb/it/schema/ApiParamSpringmvcSchema.java | 2 +- .../main/java/org/apache/servicecomb/it/testcase/TestApiParam.java | 2 +- .../spring-zuul-tracing-tests/src/test/resources/log4j.properties | 2 ++ .../tracing-tests/src/test/resources}/log4j.properties | 7 ++----- 16 files changed, 30 insertions(+), 47 deletions(-) diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-schema/src/main/resources/config/log4j.properties index cad696a..9401094 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-schema/src/main/resources/config/log4j.properties @@ -19,3 +19,5 @@ paas.logs.dir=../target/logs/ paas.logs.file=cse.log log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/logback-test.xml b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/logback-test.xml index 3f39406..52d2925 100644 --- a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/logback-test.xml +++ b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/logback-test.xml @@ -18,4 +18,6 @@ <configuration> <include resource="org/springframework/boot/logging/logback/base.xml"/> <logger name="org.springframework" level="ERROR"/> + <logger name="org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory" level="OFF"/> + <logger name="org.apache.servicecomb.core.definition.schema.StaticSchemaFactory" level="OFF"/> </configuration> \ No newline at end of file diff --git a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/logback-test.xml b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/logback-test.xml index 3f39406..52d2925 100644 --- a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/logback-test.xml +++ b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/logback-test.xml @@ -18,4 +18,6 @@ <configuration> <include resource="org/springframework/boot/logging/logback/base.xml"/> <logger name="org.springframework" level="ERROR"/> + <logger name="org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory" level="OFF"/> + <logger name="org.apache.servicecomb.core.definition.schema.StaticSchemaFactory" level="OFF"/> </configuration> \ No newline at end of file diff --git a/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/logback-test.xml b/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/logback-test.xml index 3f39406..52d2925 100644 --- a/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/logback-test.xml +++ b/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/logback-test.xml @@ -18,4 +18,6 @@ <configuration> <include resource="org/springframework/boot/logging/logback/base.xml"/> <logger name="org.springframework" level="ERROR"/> + <logger name="org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory" level="OFF"/> + <logger name="org.apache.servicecomb.core.definition.schema.StaticSchemaFactory" level="OFF"/> </configuration> \ No newline at end of file diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-client/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-spring-boot-provider/demo-spring-boot-springmvc-client/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-client/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-server/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-spring-boot-provider/demo-spring-boot-springmvc-server/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-server/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-springmvc/springmvc-client/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-springmvc/springmvc-client/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-springmvc/springmvc-client/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/demo/demo-springmvc/springmvc-server/src/main/resources/config/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to demo/demo-springmvc/springmvc-server/src/main/resources/config/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/demo/demo-springmvc/springmvc-server/src/main/resources/config/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/schema/ApiParamSpringmvcSchema.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/schema/ApiParamSpringmvcSchema.java index b291692..8cd6e54 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/schema/ApiParamSpringmvcSchema.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/schema/ApiParamSpringmvcSchema.java @@ -47,7 +47,7 @@ public class ApiParamSpringmvcSchema { readOnly = true, allowEmptyValue = true, name = "inputEx", - example = "example", + example = "10", collectionFormat = "fmt") int input) { } diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestApiParam.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestApiParam.java index 3178742..f3e120c 100644 --- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestApiParam.java +++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/testcase/TestApiParam.java @@ -97,7 +97,7 @@ public class TestApiParam { Assert.assertTrue(parameter.isReadOnly()); Assert.assertTrue(parameter.getAllowEmptyValue()); Assert.assertEquals("inputEx", parameter.getName()); - Assert.assertEquals("example", ((QueryParameter) parameter).getExample()); + Assert.assertEquals(10L, ((QueryParameter) parameter).getExample()); Assert.assertEquals("fmt", ((QueryParameter) parameter).getCollectionFormat()); } diff --git a/integration-tests/spring-zuul-tracing-tests/src/test/resources/log4j.properties b/integration-tests/spring-zuul-tracing-tests/src/test/resources/log4j.properties index e5addd9..a25e46f 100644 --- a/integration-tests/spring-zuul-tracing-tests/src/test/resources/log4j.properties +++ b/integration-tests/spring-zuul-tracing-tests/src/test/resources/log4j.properties @@ -21,3 +21,5 @@ log4j.rootLogger=WARN, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF diff --git a/demo/demo-schema/src/main/resources/config/log4j.properties b/integration-tests/tracing-tests/src/test/resources/log4j.properties similarity index 82% copy from demo/demo-schema/src/main/resources/config/log4j.properties copy to integration-tests/tracing-tests/src/test/resources/log4j.properties index cad696a..ff989fe 100644 --- a/demo/demo-schema/src/main/resources/config/log4j.properties +++ b/integration-tests/tracing-tests/src/test/resources/log4j.properties @@ -14,8 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -paas.logs.dir=../target/logs/ -paas.logs.file=cse.log - -log4j.rootLogger=INFO,paas,stdout +log4j.logger.org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory=OFF +log4j.logger.org.apache.servicecomb.core.definition.schema.StaticSchemaFactory=OFF
