Skip to content

Commit

Permalink
Merge pull request #56 from alipay/release/1.5.0
Browse files Browse the repository at this point in the history 
Release/1.5.0
  • Loading branch information
@dbl-x
dbl-x authored Aug 17, 2018
2 parents a508561 + 16d762b commit d7a5bee
Show file tree
Hide file tree
Showing 108 changed files with 3,805 additions and 941 deletions.
138 changes: 138 additions & 0 deletions .middleware-common/.travis.settings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- https://github.com/travis-ci/travis-cookbooks/blob/master/cookbooks/travis_build_environment/files/default/ci_user/maven_user_settings.xml -->
<profiles>
<profile>
<id>standard-with-extra-repos</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>

<repositories>
<repository>
<id>central</id>
<name>Central Repository</name>
<url>http://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>

<repository>
<id>central2</id>
<name>Central Repository 2</name>
<url>http://repo1.maven.apache.org/maven2</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>

<repository>
<id>sonatype</id>
<name>OSS Sonatype repo (releases)</name>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/releases/</url>
</repository>

<repository>
<id>sonatype-snapshots</id>
<name>OSS Sonatype repo (snapshots)</name>
<releases>
<enabled>false</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>

<repository>
<id>sonatype-apache</id>
<name>Apache repo (releases)</name>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>https://repository.apache.org/releases/</url>
</repository>

<repository>
<id>apache-snapshots</id>
<name>ASF repo (snapshots)</name>
<releases>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<url>https://repository.apache.org/snapshots/</url>
</repository>

</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<!-- specify repo1 which support http -->
<url>http://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>

<pluginRepository>
<id>central2</id>
<!-- specify repo1 which support http -->
<url>http://repo1.maven.apache.org/maven2</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>
40 changes: 40 additions & 0 deletions .middleware-common/pmd_rule_set.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0"?>

<ruleset name="PMD-Rules">
<description>
customize rule set priority
</description>
<rule ref="rulesets/java/empty.xml/EmptyCatchBlock">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/empty.xml/EmptyIfStmt">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/clone.xml/CloneMethodMustImplementCloneable">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/imports.xml/DuplicateImports">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/imports.xml/UnusedImports">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/strings.xml/StringToString">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/unusedcode.xml/UnusedLocalVariable">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/unusedcode.xml/UnusedPrivateField">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/unusedcode.xml/UnusedPrivateMethod">
<priority>1</priority>
</rule>
<rule ref="rulesets/java/unusedcode.xml/UnusedFormalParameter">
<priority>1</priority>
</rule>
</ruleset>
3 changes: 2 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ jdk:
before_install:
- echo "Downloading Maven 3.2.5"
&& wget https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip
&& unzip -qq apache-maven-3.2.5-bin.zip
&& unzip -q apache-maven-3.2.5-bin.zip
&& export M2_HOME=$PWD/apache-maven-3.2.5
&& export PATH=$M2_HOME/bin:$PATH
&& cp ./.middleware-common/.travis.settings.xml $HOME/.m2/settings.xml
&& mvn -version

install:
Expand Down
60 changes: 58 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alipay.sofa</groupId>
<artifactId>bolt</artifactId>
<version>1.4.2</version>
<version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -66,7 +66,7 @@
<properties>
<cobertura.maven.plugin>2.6</cobertura.maven.plugin>
<coveralls.maven.plugin>3.2.1</coveralls.maven.plugin>
<hessian.version>3.3.0</hessian.version>
<hessian.version>3.3.2</hessian.version>
<java.version>1.6</java.version>
<license.maven.plugin>3.0</license.maven.plugin>
<maven.assembly.plugin>3.0.0</maven.assembly.plugin>
Expand All @@ -79,6 +79,7 @@
<maven.staging.plugin>1.6.7</maven.staging.plugin>
<maven.surefire.plugin>2.18.1</maven.surefire.plugin>
<netty.version>4.1.25.Final</netty.version>

<project.encoding>UTF-8</project.encoding>
<slf4j.version>1.7.21</slf4j.version>
<sofa.common.tools>1.0.12</sofa.common.tools>
Expand Down Expand Up @@ -389,5 +390,60 @@
<additionalparam>-Xdoclint:none</additionalparam>
</properties>
</profile>
<profile>
<id>jdk7+</id>
<activation>
<jdk>[1.7,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.8</version>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.alibaba.p3c</groupId>
<artifactId>p3c-pmd</artifactId>
<version>1.3.0</version>
</dependency>
</dependencies>
<configuration>
<failOnViolation>true</failOnViolation>
<!-- only fail on block issues -->
<failurePriority>1</failurePriority>
<excludes>
<exclude>src/test/java/**</exclude>
</excludes>
<rulesets>
<ruleset>rulesets/java/ali-comment.xml</ruleset>
<ruleset>rulesets/java/ali-concurrent.xml</ruleset>
<ruleset>rulesets/java/ali-constant.xml</ruleset>
<ruleset>rulesets/java/ali-exception.xml</ruleset>
<ruleset>rulesets/java/ali-flowcontrol.xml</ruleset>
<ruleset>rulesets/java/ali-naming.xml</ruleset>
<ruleset>rulesets/java/ali-oop.xml</ruleset>
<ruleset>rulesets/java/ali-orm.xml</ruleset>
<ruleset>rulesets/java/ali-other.xml</ruleset>
<ruleset>rulesets/java/ali-set.xml</ruleset>
<ruleset>rulesets/java/basic.xml</ruleset>
<ruleset>rulesets/java/empty.xml</ruleset>
<ruleset>rulesets/java/imports.xml</ruleset>
<ruleset>rulesets/java/unusedcode.xml</ruleset>
<ruleset>${project.basedir}/.middleware-common/pmd_rule_set.xml</ruleset>
</rulesets>
<printFailingErrors>true</printFailingErrors>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 2 additions & 0 deletions src/main/java/com/alipay/remoting/AbstractRemotingProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public void process(RemotingContext ctx, T msg, ExecutorService defaultExecutor)
*
* @return property value of executor
*/
@Override
public ExecutorService getExecutor() {
return executor;
}
Expand All @@ -109,6 +110,7 @@ public ExecutorService getExecutor() {
*
* @param executor value to be assigned to property executor
*/
@Override
public void setExecutor(ExecutorService executor) {
this.executor = executor;
}
Expand Down
Loading

0 comments on commit d7a5bee

Please sign in to comment.