From ca80e457cc9c9962f338fe60597067a38cabbb28 Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Tue, 20 Aug 2019 09:56:41 +0800
Subject: [PATCH] Add bootstrap-plugin/toolkit-activation to import check list
 (#3290)

---
 apm-checkstyle/checkStyle.xml    | 7 ++++++-
 apm-checkstyle/importControl.xml | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 apm-checkstyle/importControl.xml

diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml
index bc6d3bf20..254ca3818 100755
--- a/apm-checkstyle/checkStyle.xml
+++ b/apm-checkstyle/checkStyle.xml
@@ -107,7 +107,12 @@
 
         <module name="ImportControl">
             <property name="file" value="apm-checkstyle/importControl.xml" />
-            <property name="path" value="apm-sniffer/(apm-sdk-plugin|optional-plugins)/.+/src/main/.+Instrumentation.java$" />
+            <property name="path" value="apm-sniffer/(apm-sdk-plugin|bootstrap-plugins|optional-plugins)/.+/src/main/.+Instrumentation.java$" />
+        </module>
+
+        <module name="ImportControl">
+            <property name="file" value="apm-checkstyle/importControl.xml" />
+            <property name="path" value="apm-sniffer/apm-toolkit-activation/.+/src/main/.+Activation.java$" />
         </module>
     </module>
 
diff --git a/apm-checkstyle/importControl.xml b/apm-checkstyle/importControl.xml
old mode 100644
new mode 100755
index 940ea1e56..ed6c0a468
--- a/apm-checkstyle/importControl.xml
+++ b/apm-checkstyle/importControl.xml
@@ -21,7 +21,7 @@
         "-//Puppy Crawl//DTD Import Control 1.4//EN"
         "https://checkstyle.org/dtds/import_control_1_4.dtd">
 
-<import-control pkg="org.apache.skywalking.apm.plugin">
+<import-control pkg="org.apache.skywalking.apm.(toolkit|plugin)" regex="true">
     <allow pkg="java"/>
     <allow pkg="org.apache.skywalking"/>
     <allow pkg="net.bytebuddy"/>