You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ta...@apache.org on 2021/10/21 07:54:59 UTC
[hadoop] branch trunk updated: HADOOP-17967. Keep
restrict-imports-enforcer-rule for Guava VisibleForTesting in hadoop-main
pom (#3555)
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 516f36c HADOOP-17967. Keep restrict-imports-enforcer-rule for Guava VisibleForTesting in hadoop-main pom (#3555)
516f36c is described below
commit 516f36c6f14c917d85df681b86349d7416693000
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Thu Oct 21 13:24:25 2021 +0530
HADOOP-17967. Keep restrict-imports-enforcer-rule for Guava VisibleForTesting in hadoop-main pom (#3555)
---
hadoop-cloud-storage-project/hadoop-cos/pom.xml | 32 ----------------------
.../hadoop-huaweicloud/pom.xml | 32 ----------------------
hadoop-common-project/hadoop-auth/pom.xml | 2 --
hadoop-common-project/hadoop-common/pom.xml | 2 --
.../main/java/org/apache/hadoop/ipc/Server.java | 6 ++--
hadoop-common-project/hadoop-kms/pom.xml | 2 --
hadoop-common-project/hadoop-nfs/pom.xml | 2 --
hadoop-common-project/hadoop-registry/pom.xml | 2 --
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 32 ----------------------
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 32 ----------------------
.../hadoop-hdfs-native-client/pom.xml | 32 ----------------------
hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 32 ----------------------
hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 32 ----------------------
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 32 ----------------------
.../hadoop-mapreduce-client/pom.xml | 32 ----------------------
.../hadoop-mapreduce-examples/pom.xml | 32 ----------------------
hadoop-tools/hadoop-archive-logs/pom.xml | 32 ----------------------
hadoop-tools/hadoop-aws/pom.xml | 32 ----------------------
hadoop-tools/hadoop-azure-datalake/pom.xml | 32 ----------------------
hadoop-tools/hadoop-azure/pom.xml | 32 ----------------------
hadoop-tools/hadoop-distcp/pom.xml | 32 ----------------------
.../hadoop-dynamometer-infra/pom.xml | 32 ----------------------
hadoop-tools/hadoop-federation-balance/pom.xml | 32 ----------------------
hadoop-tools/hadoop-fs2img/pom.xml | 32 ----------------------
hadoop-tools/hadoop-gridmix/pom.xml | 32 ----------------------
hadoop-tools/hadoop-sls/pom.xml | 32 ----------------------
hadoop-yarn-project/hadoop-yarn/pom.xml | 32 ----------------------
pom.xml | 8 ++++++
28 files changed, 11 insertions(+), 685 deletions(-)
diff --git a/hadoop-cloud-storage-project/hadoop-cos/pom.xml b/hadoop-cloud-storage-project/hadoop-cos/pom.xml
index 0e801c4..fa47e35 100644
--- a/hadoop-cloud-storage-project/hadoop-cos/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-cos/pom.xml
@@ -96,38 +96,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml
index 7a9ee61..43360c1 100755
--- a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml
@@ -92,38 +92,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<dependencies>
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
index d21d627..f7f0902 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -271,8 +271,6 @@
<includeTestCode>true</includeTestCode>
<reason>Use hadoop-common provided implementations rather than the one provided by Guava</reason>
<bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Preconditions</bannedImport>
<bannedImport>com.google.common.base.Preconditions</bannedImport>
</bannedImports>
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 6db6c2f..c0235b4 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -674,8 +674,6 @@
<includeTestCode>true</includeTestCode>
<reason>Use hadoop-common provided implementations rather than the one provided by Guava</reason>
<bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Preconditions</bannedImport>
<bannedImport>com.google.common.base.Preconditions</bannedImport>
</bannedImports>
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index 230cad5..74e4506 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@ -652,17 +652,17 @@ public abstract class Server {
}
}
- @org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting
+ @VisibleForTesting
int getPriorityLevel(Schedulable e) {
return callQueue.getPriorityLevel(e);
}
- @org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting
+ @VisibleForTesting
int getPriorityLevel(UserGroupInformation ugi) {
return callQueue.getPriorityLevel(ugi);
}
- @org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting
+ @VisibleForTesting
void setPriorityLevel(UserGroupInformation ugi, int priority) {
callQueue.setPriorityLevel(ugi, priority);
}
diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
index fedb037..d15ac0c 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -267,8 +267,6 @@
<includeTestCode>true</includeTestCode>
<reason>Use hadoop-common provided implementations rather than the one provided by Guava</reason>
<bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Preconditions</bannedImport>
<bannedImport>com.google.common.base.Preconditions</bannedImport>
</bannedImports>
diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml
index 600b2ae..757a06b 100644
--- a/hadoop-common-project/hadoop-nfs/pom.xml
+++ b/hadoop-common-project/hadoop-nfs/pom.xml
@@ -137,8 +137,6 @@
<includeTestCode>true</includeTestCode>
<reason>Use hadoop-common provided implementations rather than the one provided by Guava</reason>
<bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Preconditions</bannedImport>
<bannedImport>com.google.common.base.Preconditions</bannedImport>
</bannedImports>
diff --git a/hadoop-common-project/hadoop-registry/pom.xml b/hadoop-common-project/hadoop-registry/pom.xml
index 753b2b2..7623bfd 100644
--- a/hadoop-common-project/hadoop-registry/pom.xml
+++ b/hadoop-common-project/hadoop-registry/pom.xml
@@ -294,8 +294,6 @@
<includeTestCode>true</includeTestCode>
<reason>Use hadoop-common provided implementations rather than the one provided by Guava</reason>
<bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
<bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Preconditions</bannedImport>
<bannedImport>com.google.common.base.Preconditions</bannedImport>
</bannedImports>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
index f521480..d65e603 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
@@ -178,38 +178,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 57005e9..1916ef0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -343,38 +343,6 @@
<excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
index 279b0e6..82db2d1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml
@@ -95,38 +95,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
index a6cc3f1..24599a2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
@@ -219,38 +219,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
index 2959fc5..e17602d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
@@ -305,38 +305,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</filesets>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index ff4a8dc..10d66d0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -447,38 +447,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</filesets>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
index 86994df..55940ae 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -177,38 +177,6 @@
</properties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
index c4a804f..48cf27e 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml
@@ -155,38 +155,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-tools/hadoop-archive-logs/pom.xml b/hadoop-tools/hadoop-archive-logs/pom.xml
index aa98c1b..3caa26c 100644
--- a/hadoop-tools/hadoop-archive-logs/pom.xml
+++ b/hadoop-tools/hadoop-archive-logs/pom.xml
@@ -204,38 +204,6 @@
<effort>Max</effort>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml
index dddbe6f..0cab5ad 100644
--- a/hadoop-tools/hadoop-aws/pom.xml
+++ b/hadoop-tools/hadoop-aws/pom.xml
@@ -467,38 +467,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-tools/hadoop-azure-datalake/pom.xml b/hadoop-tools/hadoop-azure-datalake/pom.xml
index 6d73cfc..446e295 100644
--- a/hadoop-tools/hadoop-azure-datalake/pom.xml
+++ b/hadoop-tools/hadoop-azure-datalake/pom.xml
@@ -65,38 +65,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml
index df852d5..1896e15 100644
--- a/hadoop-tools/hadoop-azure/pom.xml
+++ b/hadoop-tools/hadoop-azure/pom.xml
@@ -100,38 +100,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml
index 20109b0..7e5aaeb 100644
--- a/hadoop-tools/hadoop-distcp/pom.xml
+++ b/hadoop-tools/hadoop-distcp/pom.xml
@@ -223,38 +223,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml
index 3a1c3e9..7bd4318 100644
--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml
+++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml
@@ -137,38 +137,6 @@
</environmentVariables>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-tools/hadoop-federation-balance/pom.xml b/hadoop-tools/hadoop-federation-balance/pom.xml
index f048e2a..588bb98 100644
--- a/hadoop-tools/hadoop-federation-balance/pom.xml
+++ b/hadoop-tools/hadoop-federation-balance/pom.xml
@@ -233,38 +233,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-tools/hadoop-fs2img/pom.xml b/hadoop-tools/hadoop-fs2img/pom.xml
index 66f971c..9a27362 100644
--- a/hadoop-tools/hadoop-fs2img/pom.xml
+++ b/hadoop-tools/hadoop-fs2img/pom.xml
@@ -107,38 +107,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml
index b903bb6..f383eca 100644
--- a/hadoop-tools/hadoop-gridmix/pom.xml
+++ b/hadoop-tools/hadoop-gridmix/pom.xml
@@ -188,38 +188,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml
index 329cc79..208cbdf 100644
--- a/hadoop-tools/hadoop-sls/pom.xml
+++ b/hadoop-tools/hadoop-sls/pom.xml
@@ -147,38 +147,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
index e9c3bcc..e97e356 100644
--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
@@ -78,38 +78,6 @@
<excludePackageNames>org.apache.hadoop.yarn.proto:org.apache.hadoop.yarn.federation.proto:org.apache.hadoop.yarn.service</excludePackageNames>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>de.skuzzle.enforcer</groupId>
- <artifactId>restrict-imports-enforcer-rule</artifactId>
- <version>${restrict-imports.enforcer.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <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>
- <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
- <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 7ec3ade..659d241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,6 +200,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
<bannedImport>com.google.common.collect.Lists</bannedImport>
</bannedImports>
</restrictImports>
+ <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
+ <includeTestCode>true</includeTestCode>
+ <reason>Use hadoop-common provided VisibleForTesting rather than the one provided by Guava</reason>
+ <bannedImports>
+ <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport>
+ <bannedImport>com.google.common.annotations.VisibleForTesting</bannedImport>
+ </bannedImports>
+ </restrictImports>
</rules>
</configuration>
</execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org