This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 5f8adf0 Enable checkstyle and rat plugin for travis CI (#2393)
5f8adf0 is described below
commit 5f8adf0f20c2e1823be64eb0bbe42d4ca38401d7
Author: Jerrick Zhu <diecui1...@gmail.com>
AuthorDate: Tue Aug 28 15:38:00 2018 +0800
Enable checkstyle and rat plugin for travis CI (#2393)
---
.travis.yml | 2 +-
.../java/org/apache/dubbo/rpc/cluster/RouterFactory.java | 3 +--
.../main/java/org/apache/dubbo/remoting/Transporter.java | 6 ++----
.../main/java/org/apache/dubbo/rpc/InvokerListener.java | 3 +--
.../rpc/protocol/hessian/HttpClientConnectionFactory.java | 3 ---
pom.xml | 15 +++------------
6 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fe60e30..26e0783 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ cache:
install: true
script:
- - travis_wait 30 ./mvnw clean package -DskipTests=false
-Dcheckstyle.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true
+ - travis_wait 30 ./mvnw clean install -DskipTests=false
-Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
after_success:
- bash <(curl -s https://codecov.io/bash)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java
index 679b9fe..c81ba54 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java
@@ -19,7 +19,6 @@ package org.apache.dubbo.rpc.cluster;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.Adaptive;
import org.apache.dubbo.common.extension.SPI;
-import org.apache.dubbo.rpc.Invocation;
/**
* RouterFactory. (SPI, Singleton, ThreadSafe)
@@ -27,7 +26,7 @@ import org.apache.dubbo.rpc.Invocation;
* <a href="http://en.wikipedia.org/wiki/Routing";>Routing</a>
*
* @see org.apache.dubbo.rpc.cluster.Cluster#join(Directory)
- * @see org.apache.dubbo.rpc.cluster.Directory#list(Invocation)
+ * @see
org.apache.dubbo.rpc.cluster.Directory#list(org.apache.dubbo.rpc.Invocation)
*/
@SPI
public interface RouterFactory {
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporter.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporter.java
index b53c75f..33ac2be 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporter.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporter.java
@@ -21,8 +21,6 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.Adaptive;
import org.apache.dubbo.common.extension.SPI;
-import javax.sound.midi.Receiver;
-
/**
* Transporter. (SPI, Singleton, ThreadSafe)
* <p>
@@ -41,7 +39,7 @@ public interface Transporter {
* @param handler
* @return server
* @throws RemotingException
- * @see org.apache.dubbo.remoting.Transporters#bind(URL, Receiver,
ChannelHandler)
+ * @see org.apache.dubbo.remoting.Transporters#bind(URL, ChannelHandler...)
*/
@Adaptive({Constants.SERVER_KEY, Constants.TRANSPORTER_KEY})
Server bind(URL url, ChannelHandler handler) throws RemotingException;
@@ -53,7 +51,7 @@ public interface Transporter {
* @param handler
* @return client
* @throws RemotingException
- * @see org.apache.dubbo.remoting.Transporters#connect(URL, Receiver,
ChannelListener)
+ * @see org.apache.dubbo.remoting.Transporters#connect(URL,
ChannelHandler...)
*/
@Adaptive({Constants.CLIENT_KEY, Constants.TRANSPORTER_KEY})
Client connect(URL url, ChannelHandler handler) throws RemotingException;
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/InvokerListener.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/InvokerListener.java
index 6842dd8..5516b07 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/InvokerListener.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/InvokerListener.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.rpc;
-import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.SPI;
/**
@@ -30,7 +29,7 @@ public interface InvokerListener {
*
* @param invoker
* @throws RpcException
- * @see org.apache.dubbo.rpc.Protocol#refer(Class, URL)
+ * @see org.apache.dubbo.rpc.Protocol#refer(Class,
org.apache.dubbo.common.URL)
*/
void referred(Invoker<?> invoker) throws RpcException;
diff --git
a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java
b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java
index 36b1e2b..2c6f6db 100644
---
a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java
+++
b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java
@@ -24,11 +24,8 @@ import com.caucho.hessian.client.HessianConnectionFactory;
import com.caucho.hessian.client.HessianProxyFactory;
import org.apache.http.client.HttpClient;
import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.params.HttpConnectionParams;
-import java.io.IOException;
import java.net.URL;
/**
diff --git a/pom.xml b/pom.xml
index 16713a8..5bd895d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,10 +261,10 @@
<configuration>
<configLocation>codestyle/checkstyle.xml</configLocation>
<suppressionsLocation>codestyle/checkstyle-suppressions.xml</suppressionsLocation>
-
<headerLocation>codestyle/checkstyle-header.txt</headerLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
+ <excludes>**/JSONWriter.java</excludes>
</configuration>
<goals>
<goal>check</goal>
@@ -324,20 +324,11 @@
<!-- Used for packaging NOTICE & LICENSE to each sub-module jar-->
<resources>
<resource>
- <directory>src/main/resources/</directory>
+ <directory>src/main/resources</directory>
<filtering>false</filtering>
</resource>
<resource>
- <directory>../</directory>
- <targetPath>META-INF/</targetPath>
- <filtering>false</filtering>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- </includes>
- </resource>
- <resource>
- <directory>../../</directory>
+ <directory>${maven.multiModuleProjectDirectory}</directory>
<targetPath>META-INF/</targetPath>
<filtering>false</filtering>
<includes>
