Repository: hbase Updated Branches: refs/heads/branch-2.0 e8bceb025 -> 8bdfab781
HBASE-21635 Use maven enforcer to ban imports from illegal packages Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8bdfab78 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8bdfab78 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8bdfab78 Branch: refs/heads/branch-2.0 Commit: 8bdfab781f7508972ae1318051f5b6b90fec4936 Parents: e8bceb0 Author: Duo Zhang <[email protected]> Authored: Mon Dec 24 11:30:13 2018 +0800 Committer: Duo Zhang <[email protected]> Committed: Mon Dec 24 11:37:32 2018 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/master/DeadServer.java | 17 ++-- .../hadoop/hbase/regionserver/CellChunkMap.java | 1 - pom.xml | 83 +++++++++++++++++++- 3 files changed, 89 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8bdfab78/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DeadServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DeadServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DeadServer.java index 4183201..0584792 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DeadServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DeadServer.java @@ -18,15 +18,6 @@ */ package org.apache.hadoop.hbase.master; -import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; -import org.apache.hadoop.hbase.util.Pair; - -import com.google.common.base.Preconditions; - import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -37,6 +28,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; +import org.apache.hadoop.hbase.util.Pair; +import org.apache.yetus.audience.InterfaceAudience; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; /** http://git-wip-us.apache.org/repos/asf/hbase/blob/8bdfab78/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkMap.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkMap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkMap.java index 0ef54a1..a2c1820 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkMap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellChunkMap.java @@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.regionserver; import java.nio.ByteBuffer; -import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.hbase.Cell; import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; http://git-wip-us.apache.org/repos/asf/hbase/blob/8bdfab78/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3b0d111..b468b80 100755 --- a/pom.xml +++ b/pom.xml @@ -967,6 +967,11 @@ <artifactId>extra-enforcer-rules</artifactId> <version>${extra.enforcer.version}</version> </dependency> + <dependency> + <groupId>de.skuzzle.enforcer</groupId> + <artifactId>restrict-imports-enforcer-rule</artifactId> + <version>${restrict-imports.enforcer.version}</version> + </dependency> </dependencies> <!-- version set by parent --> <executions> @@ -1062,6 +1067,79 @@ <skip>${skip.license.check}</skip> </configuration> </execution> + <execution> + <id>banned-illegal-imports</id> + <phase>process-sources</phase> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <commentLineBufferSize>512</commentLineBufferSize> + <reason>Use SLF4j for logging</reason> + <bannedImports> + <bannedImport>org.apache.commons.logging.Log</bannedImport> + <bannedImport>org.apache.commons.logging.LogFactory</bannedImport> + </bannedImports> + </restrictImports> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <commentLineBufferSize>512</commentLineBufferSize> + <reason>Use shaded version in hbase-thirdparty</reason> + <bannedImports> + <bannedImport>com.google.common.**</bannedImport> + <bannedImport>io.netty.**</bannedImport> + <bannedImport>org.apache.commons.cli.**</bannedImport> + <bannedImport>org.apache.commons.collections.**</bannedImport> + <bannedImport>org.apache.commons.collections4.**</bannedImport> + </bannedImports> + </restrictImports> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <commentLineBufferSize>512</commentLineBufferSize> + <reason>Do not use shaded classes from other dependencies</reason> + <bannedImports> + <bannedImport>org.apache.curator.shaded.**</bannedImport> + <bannedImport>org.apache.htrace.shaded.**</bannedImport> + </bannedImports> + </restrictImports> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <commentLineBufferSize>512</commentLineBufferSize> + <reason>Use shaded gson in hbase-thirdparty</reason> + <bannedImports> + <bannedImport>org.codehaus.jackson.**</bannedImport> + </bannedImports> + </restrictImports> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <commentLineBufferSize>512</commentLineBufferSize> + <reason>Use commons lang 3</reason> + <bannedImports> + <bannedImport>org.apache.commons.lang.**</bannedImport> + </bannedImports> + </restrictImports> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <commentLineBufferSize>512</commentLineBufferSize> + <reason>Use yetus IA and IS annotations</reason> + <bannedImports> + <bannedImport>org.apache.hadoop.classificatio.**</bannedImport> + </bannedImports> + </restrictImports> + <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <includeTestCode>true</includeTestCode> + <commentLineBufferSize>512</commentLineBufferSize> + <reason>Do not use htrace v3</reason> + <bannedImports> + <bannedImport>org.htrace.**</bannedImport> + </bannedImports> + </restrictImports> + </rules> + </configuration> + </execution> </executions> </plugin> <!-- parent-module only plugins --> @@ -1461,8 +1539,9 @@ <!-- Surefire argLine defaults to Linux, cygwin argLine is used in the os.windows profile --> <argLine>${hbase-surefire.argLine}</argLine> <jacoco.version>0.7.5.201505241946</jacoco.version> - <extra.enforcer.version>1.0-beta-6</extra.enforcer.version> - <enforcer.version>3.0.0-M1</enforcer.version> + <extra.enforcer.version>1.0-beta-9</extra.enforcer.version> + <enforcer.version>3.0.0-M2</enforcer.version> + <restrict-imports.enforcer.version>0.14.0</restrict-imports.enforcer.version> <!-- Location of test resources --> <test.build.classes>${project.build.directory}/test-classes</test.build.classes> <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
