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/05/26 08:15:08 UTC
[hadoop] branch trunk updated: HADOOP-17732. Keep
restrict-imports-enforcer-rule for Guava Sets in hadoop-main pom (#3049)
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 986d0a4 HADOOP-17732. Keep restrict-imports-enforcer-rule for Guava Sets in hadoop-main pom (#3049)
986d0a4 is described below
commit 986d0a4f1d5543fa0b4f5916729728f78b4acec9
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Wed May 26 13:44:31 2021 +0530
HADOOP-17732. Keep restrict-imports-enforcer-rule for Guava Sets in hadoop-main pom (#3049)
Signed-off-by: Takanobu Asanuma <ta...@apache.org>
---
hadoop-common-project/hadoop-common/pom.xml | 32 ----------------------
hadoop-common-project/hadoop-kms/pom.xml | 32 ----------------------
hadoop-hdfs-project/hadoop-hdfs-httpfs/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-tools/hadoop-aws/pom.xml | 32 ----------------------
hadoop-tools/hadoop-distcp/pom.xml | 32 ----------------------
hadoop-tools/hadoop-dynamometer/pom.xml | 32 ----------------------
hadoop-yarn-project/hadoop-yarn/pom.xml | 32 ----------------------
pom.xml | 8 ++++++
11 files changed, 8 insertions(+), 320 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 057b9e1..f49a183 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -647,38 +647,6 @@
</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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
index c932bae..9de8b9c 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -244,38 +244,6 @@
</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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 704bc12..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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
index f3a303d..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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</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 97cfdc6..95ac71b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -437,38 +437,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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</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 5cf59df..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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml
index 1d82e44..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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml
index da598fc..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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-tools/hadoop-dynamometer/pom.xml b/hadoop-tools/hadoop-dynamometer/pom.xml
index 4811e69..30e28b6 100644
--- a/hadoop-tools/hadoop-dynamometer/pom.xml
+++ b/hadoop-tools/hadoop-dynamometer/pom.xml
@@ -50,38 +50,6 @@
<configuration>
</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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
index 5cfc074..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 Sets rather than Guava provided Sets</reason>
- <bannedImports>
- <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
- <bannedImport>com.google.common.collect.Sets</bannedImport>
- </bannedImports>
- </restrictImports>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 5056869..439ae42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
<bannedImport>org.apache.curator.shaded.**</bannedImport>
</bannedImports>
</restrictImports>
+ <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports">
+ <includeTestCode>true</includeTestCode>
+ <reason>Use hadoop-common provided Sets rather than Guava provided Sets</reason>
+ <bannedImports>
+ <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport>
+ <bannedImport>com.google.common.collect.Sets</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