This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-toolkit.git
commit 3f107a7690c63d8e6e0dd7dde7a17edac9f26de5 Author: Daniel Qian <chanjars...@gmail.com> AuthorDate: Mon Nov 4 16:22:00 2019 +0800 SCB-1553 Integrate oas-validator compliance check to cli Fix too many logs cause travis ci broken issue. --- .../oas-validator-compatibility-spring/pom.xml | 2 -- oas-validator/oas-validator-compatibility/pom.xml | 3 --- .../src/test/resources/logback-test.xml | 22 ++++++++++++++++++++++ .../oas-validator-compliance-spring/pom.xml | 2 -- oas-validator/oas-validator-compliance/pom.xml | 9 +-------- .../src/test/resources/logback-test.xml | 22 ++++++++++++++++++++++ oas-validator/oas-validator-core-spring/pom.xml | 1 - oas-validator/oas-validator-test/pom.xml | 1 - oas-validator/oas-validator-web/pom.xml | 5 ----- 9 files changed, 45 insertions(+), 22 deletions(-) diff --git a/oas-validator/oas-validator-compatibility-spring/pom.xml b/oas-validator/oas-validator-compatibility-spring/pom.xml index 8a262a4..7a4c85b 100644 --- a/oas-validator/oas-validator-compatibility-spring/pom.xml +++ b/oas-validator/oas-validator-compatibility-spring/pom.xml @@ -35,13 +35,11 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-compatibility</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core-spring</artifactId> - <version>${project.version}</version> </dependency> <dependency> diff --git a/oas-validator/oas-validator-compatibility/pom.xml b/oas-validator/oas-validator-compatibility/pom.xml index 926f9c0..2e95188 100644 --- a/oas-validator/oas-validator-compatibility/pom.xml +++ b/oas-validator/oas-validator-compatibility/pom.xml @@ -35,21 +35,18 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core</artifactId> - <version>${project.version}</version> </dependency> <!-- test deps --> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-test</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core-spring</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> diff --git a/oas-validator/oas-validator-compatibility/src/test/resources/logback-test.xml b/oas-validator/oas-validator-compatibility/src/test/resources/logback-test.xml new file mode 100644 index 0000000..a1ba69a --- /dev/null +++ b/oas-validator/oas-validator-compatibility/src/test/resources/logback-test.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<configuration> + <include resource="org/springframework/boot/logging/logback/base.xml" /> + <logger name="org.springframework" level="OFF"/> +</configuration> diff --git a/oas-validator/oas-validator-compliance-spring/pom.xml b/oas-validator/oas-validator-compliance-spring/pom.xml index 91ffb81..5e4b0f9 100644 --- a/oas-validator/oas-validator-compliance-spring/pom.xml +++ b/oas-validator/oas-validator-compliance-spring/pom.xml @@ -35,13 +35,11 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-compliance</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core-spring</artifactId> - <version>${project.version}</version> </dependency> <dependency> diff --git a/oas-validator/oas-validator-compliance/pom.xml b/oas-validator/oas-validator-compliance/pom.xml index 0e40c26..33b4f42 100644 --- a/oas-validator/oas-validator-compliance/pom.xml +++ b/oas-validator/oas-validator-compliance/pom.xml @@ -39,7 +39,6 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> @@ -52,13 +51,7 @@ <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <scope>provided</scope> - </dependency> - + <!-- test deps --> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> diff --git a/oas-validator/oas-validator-compliance/src/test/resources/logback-test.xml b/oas-validator/oas-validator-compliance/src/test/resources/logback-test.xml new file mode 100644 index 0000000..a1ba69a --- /dev/null +++ b/oas-validator/oas-validator-compliance/src/test/resources/logback-test.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<configuration> + <include resource="org/springframework/boot/logging/logback/base.xml" /> + <logger name="org.springframework" level="OFF"/> +</configuration> diff --git a/oas-validator/oas-validator-core-spring/pom.xml b/oas-validator/oas-validator-core-spring/pom.xml index 166649c..a03cfca 100644 --- a/oas-validator/oas-validator-core-spring/pom.xml +++ b/oas-validator/oas-validator-core-spring/pom.xml @@ -35,7 +35,6 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> diff --git a/oas-validator/oas-validator-test/pom.xml b/oas-validator/oas-validator-test/pom.xml index e5b9c90..0260b32 100644 --- a/oas-validator/oas-validator-test/pom.xml +++ b/oas-validator/oas-validator-test/pom.xml @@ -35,7 +35,6 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> diff --git a/oas-validator/oas-validator-web/pom.xml b/oas-validator/oas-validator-web/pom.xml index 5deaf60..f65b1c6 100644 --- a/oas-validator/oas-validator-web/pom.xml +++ b/oas-validator/oas-validator-web/pom.xml @@ -47,23 +47,18 @@ <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-core-spring</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-compatibility-spring</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb.toolkit</groupId> <artifactId>oas-validator-compliance-spring</artifactId> - <version>${project.version}</version> </dependency> - - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId>