diff --git a/hadoop-cloud-storage-project/hadoop-cos/pom.xml b/hadoop-cloud-storage-project/hadoop-cos/pom.xml index 0e801c4e43..fa47e354c7 100644 --- a/hadoop-cloud-storage-project/hadoop-cos/pom.xml +++ b/hadoop-cloud-storage-project/hadoop-cos/pom.xml @@ -96,38 +96,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml index 7a9ee61836..43360c11cd 100755 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml @@ -92,38 +92,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index d21d6273ff..f7f09025b6 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -271,8 +271,6 @@ true Use hadoop-common provided implementations rather than the one provided by Guava - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting org.apache.hadoop.thirdparty.com.google.common.base.Preconditions com.google.common.base.Preconditions diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 6db6c2f548..c0235b4db9 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -674,8 +674,6 @@ true Use hadoop-common provided implementations rather than the one provided by Guava - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting org.apache.hadoop.thirdparty.com.google.common.base.Preconditions com.google.common.base.Preconditions 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 230cad5d3a..74e4506607 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 static void bind(ServerSocket socket, InetSocketAddress address, } } - @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 fedb0375ef..d15ac0c97c 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -267,8 +267,6 @@ true Use hadoop-common provided implementations rather than the one provided by Guava - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting org.apache.hadoop.thirdparty.com.google.common.base.Preconditions com.google.common.base.Preconditions diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml index 600b2ae1a4..757a06b00f 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -137,8 +137,6 @@ true Use hadoop-common provided implementations rather than the one provided by Guava - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting org.apache.hadoop.thirdparty.com.google.common.base.Preconditions com.google.common.base.Preconditions diff --git a/hadoop-common-project/hadoop-registry/pom.xml b/hadoop-common-project/hadoop-registry/pom.xml index 753b2b28fb..7623bfd6d3 100644 --- a/hadoop-common-project/hadoop-registry/pom.xml +++ b/hadoop-common-project/hadoop-registry/pom.xml @@ -294,8 +294,6 @@ true Use hadoop-common provided implementations rather than the one provided by Guava - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting org.apache.hadoop.thirdparty.com.google.common.base.Preconditions com.google.common.base.Preconditions diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index f521480281..d65e603036 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"> org.apache.hadoop.hdfs.protocol.proto - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 57005e9d80..1916ef0e3b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -343,38 +343,6 @@ ${basedir}/dev-support/findbugsExcludeFile.xml - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml index 279b0e6dc1..82db2d14fa 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"> - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index a6cc3f1ed3..24599a2b24 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"> - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml index 2959fc54b7..e17602d1f6 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"> - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index ff4a8dc228..10d66d055b 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"> - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index 86994dffc5..55940ae4ff 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -177,38 +177,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index c4a804fabe..48cf27efe4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -155,38 +155,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-archive-logs/pom.xml b/hadoop-tools/hadoop-archive-logs/pom.xml index aa98c1bf35..3caa26c52f 100644 --- a/hadoop-tools/hadoop-archive-logs/pom.xml +++ b/hadoop-tools/hadoop-archive-logs/pom.xml @@ -204,38 +204,6 @@ Max - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index dddbe6fb34..0cab5ada21 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -467,38 +467,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-azure-datalake/pom.xml b/hadoop-tools/hadoop-azure-datalake/pom.xml index 6d73cfc09a..446e2957b6 100644 --- a/hadoop-tools/hadoop-azure-datalake/pom.xml +++ b/hadoop-tools/hadoop-azure-datalake/pom.xml @@ -65,38 +65,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml index df852d5b42..1896e15d27 100644 --- a/hadoop-tools/hadoop-azure/pom.xml +++ b/hadoop-tools/hadoop-azure/pom.xml @@ -100,38 +100,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml index 20109b0cf6..7e5aaebc08 100644 --- a/hadoop-tools/hadoop-distcp/pom.xml +++ b/hadoop-tools/hadoop-distcp/pom.xml @@ -223,38 +223,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml index 3a1c3e9506..7bd4318cf7 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 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-federation-balance/pom.xml b/hadoop-tools/hadoop-federation-balance/pom.xml index f048e2a11f..588bb98f3e 100644 --- a/hadoop-tools/hadoop-federation-balance/pom.xml +++ b/hadoop-tools/hadoop-federation-balance/pom.xml @@ -233,38 +233,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-fs2img/pom.xml b/hadoop-tools/hadoop-fs2img/pom.xml index 66f971c9e1..9a273621cf 100644 --- a/hadoop-tools/hadoop-fs2img/pom.xml +++ b/hadoop-tools/hadoop-fs2img/pom.xml @@ -107,38 +107,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml index b903bb6f09..f383ecad64 100644 --- a/hadoop-tools/hadoop-gridmix/pom.xml +++ b/hadoop-tools/hadoop-gridmix/pom.xml @@ -188,38 +188,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml index 329cc790fb..208cbdf6c1 100644 --- a/hadoop-tools/hadoop-sls/pom.xml +++ b/hadoop-tools/hadoop-sls/pom.xml @@ -147,38 +147,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml index e9c3bccc61..e97e356085 100644 --- a/hadoop-yarn-project/hadoop-yarn/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/pom.xml @@ -78,38 +78,6 @@ org.apache.hadoop.yarn.proto:org.apache.hadoop.yarn.federation.proto:org.apache.hadoop.yarn.service - - org.apache.maven.plugins - maven-enforcer-plugin - - - de.skuzzle.enforcer - restrict-imports-enforcer-rule - ${restrict-imports.enforcer.version} - - - - - banned-illegal-imports - process-sources - - enforce - - - - - true - Use hadoop-common provided VisibleForTesting rather than the one provided by Guava - - org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting - com.google.common.annotations.VisibleForTesting - - - - - - - diff --git a/pom.xml b/pom.xml index 7ec3ade62a..659d2413f9 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 com.google.common.collect.Lists + + true + Use hadoop-common provided VisibleForTesting rather than the one provided by Guava + + org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting + com.google.common.annotations.VisibleForTesting + +