This is an automated email from the ASF dual-hosted git repository. wujimin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 1b17b1172ac78bca3f19c489cb92d000c9621e7a Author: Yang Bo <[email protected]> AuthorDate: Sat Nov 24 11:13:32 2018 +0800 [SCB-1035] Fix compile warnings --- .../it-producer-deploy-springboot2-servlet/pom.xml | 40 ++++++++++++++++------ .../pom.xml | 40 ++++++++++++++++------ .../starter/servlet/RestServletInitializer.java | 1 + pom.xml | 1 - 4 files changed, 61 insertions(+), 21 deletions(-) diff --git a/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml b/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml index b3f98b7..b8bf93e 100644 --- a/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml +++ b/integration-tests/it-producer-deploy-springboot2-servlet/pom.xml @@ -20,12 +20,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>integration-tests</artifactId> - <groupId>org.apache.servicecomb.tests</groupId> - <version>1.1.0-SNAPSHOT</version> - </parent> - <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-producer-deploy-springboot2-servlet</artifactId> <version>1.1.0-SNAPSHOT</version> @@ -57,10 +51,6 @@ <artifactId>foundation-test-scaffolding</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> </dependencies> <build> @@ -77,6 +67,36 @@ <target>1.8</target> </configuration> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>DISCLAIMER</exclude> + <exclude>.travis.yml</exclude> + <exclude>**/*.md</exclude> + <excldue>**/*.MD</excldue> + <exclude>**/target/*</exclude> + <!-- Skip the code style configuration file --> + <exclude>**/etc/eclipse-java-google-style.xml</exclude> + <exclude>**/etc/intellij-java-google-style.xml</exclude> + <!-- Skip the ssl configuration files --> + <exculde>**/resources/ssl/**</exculde> + <!-- SKip the licenses files --> + <exclude>**/src/release/licenses/**</exclude> + <!-- Skip the demo log files --> + <exclude>**/logs/**.log</exclude> + <exclude>**/**.log</exclude> + <!-- Skip the target files --> + <exclude>**/target/**</exclude> + <!-- Skip the source files which are forked from vertx --> + <exclude>**/io/vertx/ext/web/impl/MimeTypesUtils.java</exclude> + <exclude>**/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java</exclude> + <!--Skip protobuf generated file--> + <exclude>**/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </pluginManagement> </build> diff --git a/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml b/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml index c64adee..e05b10c 100644 --- a/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml +++ b/integration-tests/it-producer-deploy-springboot2-standalone/pom.xml @@ -20,12 +20,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>integration-tests</artifactId> - <groupId>org.apache.servicecomb.tests</groupId> - <version>1.1.0-SNAPSHOT</version> - </parent> - <version>1.1.0-SNAPSHOT</version> <groupId>org.apache.servicecomb.tests</groupId> <artifactId>it-producer-deploy-springboot2-standalone</artifactId> @@ -57,10 +51,6 @@ <artifactId>foundation-test-scaffolding</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> </dependencies> <build> @@ -77,6 +67,36 @@ <target>1.8</target> </configuration> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>DISCLAIMER</exclude> + <exclude>.travis.yml</exclude> + <exclude>**/*.md</exclude> + <excldue>**/*.MD</excldue> + <exclude>**/target/*</exclude> + <!-- Skip the code style configuration file --> + <exclude>**/etc/eclipse-java-google-style.xml</exclude> + <exclude>**/etc/intellij-java-google-style.xml</exclude> + <!-- Skip the ssl configuration files --> + <exculde>**/resources/ssl/**</exculde> + <!-- SKip the licenses files --> + <exclude>**/src/release/licenses/**</exclude> + <!-- Skip the demo log files --> + <exclude>**/logs/**.log</exclude> + <exclude>**/**.log</exclude> + <!-- Skip the target files --> + <exclude>**/target/**</exclude> + <!-- Skip the source files which are forked from vertx --> + <exclude>**/io/vertx/ext/web/impl/MimeTypesUtils.java</exclude> + <exclude>**/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java</exclude> + <!--Skip protobuf generated file--> + <exclude>**/java/org/apache/servicecomb/foundation/protobuf/internal/model/ProtobufRoot.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </pluginManagement> </build> diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java index 0852816..8d518ef 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java @@ -49,6 +49,7 @@ public class RestServletInitializer } @Override + @SuppressWarnings("try") public void onStartup(ServletContext servletContext) throws ServletException { if (factory.getPort() == 0) { LOGGER.warn( diff --git a/pom.xml b/pom.xml index df9d6e4..a59272d 100644 --- a/pom.xml +++ b/pom.xml @@ -369,7 +369,6 @@ <arg>-Xlint:all</arg> <!--not care for jdk8/jdk7 compatible problem--> <arg>-Xlint:-classfile</arg> - <arg>-Xlint:-processing</arg> </compilerArgs> </configuration> </plugin>
