You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/10/09 15:32:44 UTC
[skywalking] branch master updated: Check package name
org.apache.skywalking (#3581)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 80f779c Check package name org.apache.skywalking (#3581)
80f779c is described below
commit 80f779c75c6d081435dd6d434a3e280aa686fd10
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Oct 9 23:32:37 2019 +0800
Check package name org.apache.skywalking (#3581)
* Check package name org.apache.skywalking
* Only check REAL sources
---
apm-checkstyle/checkStyle.xml | 4 +++-
pom.xml | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml
index 254ca38..00b501b 100755
--- a/apm-checkstyle/checkStyle.xml
+++ b/apm-checkstyle/checkStyle.xml
@@ -82,7 +82,9 @@
<module name="MethodTypeParameterName">
<property name="format" value="(^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$)"/>
</module>
- <module name="PackageName"/>
+ <module name="PackageName">
+ <property name="format" value="^org\.apache\.skywalking(\.[a-zA-Z][a-zA-Z0-9]*)+$"/>
+ </module>
<module name="ParameterName"/>
<module name="StaticVariableName">
<property name="format" value="(^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$)"/>
diff --git a/pom.xml b/pom.xml
index 57cb2ae..07bab62 100755
--- a/pom.xml
+++ b/pom.xml
@@ -492,7 +492,10 @@
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failsOnError>true</failsOnError>
- <includes>org/apache/skywalking/**/*.java</includes>
+ <sourceDirectories>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
+ </sourceDirectories>
<resourceIncludes>
**/*.properties,
**/*.sh,