Merge pull request #201 from SeanCai/master

some bug fix

eclipse-plugin/com.alibaba.smartfox.eclipse.plugin/src/main/resources/rulesets/java/ali-ruleOnEclipse.xml

@@ -37,6 +37,6 @@
     <rule name="MapOrSetKeyShouldOverrideHashCodeEqualsRule" message="rule.standalone.MapOrSetKeyShouldOverrideHashCodeEqualsRule.msg"
           class="com.alibaba.smartfox.eclipse.pmd.rule.MapOrSetKeyShouldOverrideHashCodeEqualsRule">
         <description>rule.standalone.MapOrSetKeyShouldOverrideHashCodeEqualsRule.desc</description>
-        <priority>1</priority>
+        <priority>2</priority>
     </rule>
 </ruleset>

eclipse-plugin/pom.xml

@@ -40,18 +40,24 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <!--<repositories>
+    <repositories>
         <repository>
-            <id>neon</id>
-            <url>${eclipse-repo.url}</url>
+            <id>juno</id>
             <layout>p2</layout>
+            <url>http://mirrors.ustc.edu.cn/eclipse/releases/juno/</url>
         </repository>
         <repository>
-            <id>ajdt</id>
-            <url>${ajdt-eclipse-repo.url}</url>
-            <layout>p2</layout>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
-    </repositories>-->
+    </repositories>
     <build>
         <plugins>
             <plugin>
@@ -189,150 +195,4 @@
             </plugins>
         </pluginManagement>
     </build>
-    <profiles>
-
-        <profile>
-            <id>macosx-jvm-flags</id>
-            <activation>
-                <os>
-                    <family>mac</family>
-                </os>
-            </activation>
-            <properties>
-                <!-- tycho-surefire-plugin needs -XstartOnFirstThread on mac os -->
-                <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-            </properties>
-        </profile>
-
-       <!-- <profile>
-            <id>eclipse-indigo</id>
-            <activation>
-                <property>
-                    <name>!eclipse-release</name>
-                </property>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>indigo</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/releases/indigo/</url>
-                </repository>
-                <repository>
-                    <id>swtbot</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/technology/swtbot/releases/2.2.1/</url>
-                </repository>
-            </repositories>
-        </profile>
--->
-        <profile>
-            <id>eclipse-juno</id>
-            <activation>
-                <property>
-                    <name>!eclipse-release</name>
-                </property>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>juno</id>
-                    <layout>p2</layout>
-                    <url>http://mirrors.ustc.edu.cn/eclipse/releases/juno/</url>
-                </repository>
-                <repository>
-                    <id>swtbot</id>
-                    <layout>p2</layout>
-                    <url>http://mirrors.ustc.edu.cn/eclipse/technology/swtbot/releases/2.5.0/</url>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <id>eclipse-kepler</id>
-            <activation>
-                <property>
-                    <name>eclipse-release</name>
-                    <value>kepler</value>
-                </property>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>kepler</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/releases/kepler/</url>
-                </repository>
-                <repository>
-                    <id>swtbot</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/technology/swtbot/releases/2.3.0/</url>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <id>eclipse-luna</id>
-            <activation>
-                <property>
-                    <name>eclipse-release</name>
-                    <value>luna</value>
-                </property>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>luna</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/releases/luna/</url>
-                </repository>
-                <repository>
-                    <id>swtbot</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/technology/swtbot/releases/2.3.0/</url>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <id>eclipse-mars</id>
-            <activation>
-                <property>
-                    <name>eclipse-release</name>
-                    <value>mars</value>
-                </property>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>mars</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/releases/mars/</url>
-                </repository>
-                <repository>
-                    <id>swtbot</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/technology/swtbot/releases/2.3.0/</url>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <id>eclipse-neon</id>
-            <activation>
-                <property>
-                    <name>eclipse-release</name>
-                    <value>neon</value>
-                </property>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>neon</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/releases/neon/</url>
-                </repository>
-                <repository>
-                    <id>swtbot</id>
-                    <layout>p2</layout>
-                    <url>http://download.eclipse.org/technology/swtbot/releases/2.3.0/</url>
-                </repository>
-            </repositories>
-        </profile>
-
-    </profiles>
 </project>

p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/util/namelist/NameListServiceImpl.java

@@ -21,7 +21,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 

p3c-pmd/src/main/resources/rulesets/java/ali-concurrent.xml

@@ -76,7 +76,7 @@ Positive example 3：
     <rule name="AvoidManuallyCreateThreadRule"
           language="java"
           since="1.6"
-          message="java.concurrent.AvoidConcurrentCompetitionRandomRule.rule.msg"
+          message="java.concurrent.AvoidManuallyCreateThreadRule.rule.msg"
           dfa="true"
           class="com.alibaba.p3c.pmd.lang.java.rule.concurrent.AvoidManuallyCreateThreadRule">
         <description>java.concurrent.AvoidManuallyCreateThreadRule.rule.desc</description>